Merge remote-tracking branch 'origin/main' into refactor/mainjs

.github/workflows/release.yml

@@ -30,7 +30,6 @@ jobs:
           APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }}
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
-          GH_TOKEN: ${{ secrets.gh_token }}
           NOTARIZE: true
       - uses: actions/upload-artifact@v4
         with:
@@ -55,8 +54,6 @@ jobs:
           OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
           OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
       - run: pnpm make:win --publish onTagOrDraft
-        env:
-          GH_TOKEN: ${{ secrets.gh_token }}
       - uses: actions/upload-artifact@v4
         with:
           name: Gitify-release-win
@@ -80,8 +77,6 @@ jobs:
           OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
           OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
       - run: pnpm make:linux --publish onTagOrDraft
-        env:
-          GH_TOKEN: ${{ secrets.gh_token }}
       - uses: actions/upload-artifact@v4
         with:
           name: Gitify-release-linux

README.md

@@ -1,4 +1,4 @@
-# Gitify [![Build Workflow][build-workflow-badge]][github-actions] [![Release Workflow][release-workflow-badge]][github-actions] [![Coveralls][coveralls-badge]][coveralls] [![Renovate enabled][renovate-badge]][renovate] [![Contributors][contributors-badge]][github] [![Downloads - Total][downloads-total-badge]][website] [![Downloads - Latest Release][downloads-latest-badge]][website] [![OSS License][license-badge]][license] [![Latest Release][github-release-badge]][github-releases] [![Homebrew Cask][homebrew-cask-badge]][homebrew-cask]
+# Gitify [![Build Workflow][build-workflow-badge]][github-actions] [![Release Workflow][release-workflow-badge]][github-actions] [![Coveralls][coveralls-badge]][coveralls] [![Renovate enabled][renovate-badge]][renovate] [![Libraries.io dependency status][librariesio-badge]][librariesio] [![Contributors][contributors-badge]][github] [![Downloads - Total][downloads-total-badge]][website] [![Downloads - Latest Release][downloads-latest-badge]][website] [![OSS License][license-badge]][license] [![Latest Release][github-release-badge]][github-releases] [![Homebrew Cask][homebrew-cask-badge]][homebrew-cask]
 
 > GitHub Notifications on your menu bar. Available on macOS, Windows and Linux.
 
@@ -46,7 +46,9 @@ The release process is automated. Follow the steps below.
 
 ### Tests
 
-There are 2 checks - one for biome (linter & formatter) and one for the unit tests with `jest`.
+There are 2 checks:
+1. linter & formatter with [biome][biome-website]
+2. unit tests with [jest][jest-website]
 
 ```shell
 # Run biome to check linting and formatting
@@ -75,7 +77,8 @@ Please visit our [Gitify FAQs][faqs] for all commonly asked questions.
 
 ### License
 
-Gitify is licensed under the MIT Open Source license. For more information, see [LICENSE](LICENSE).
+Gitify is licensed under the MIT Open Source license. 
+For more information, see [LICENSE](LICENSE).
 
 
 <!-- LINK LABELS -->
@@ -89,16 +92,20 @@ Gitify is licensed under the MIT Open Source license. For more information, see
 [github-website-pulls]: https://github.com/gitify-app/website/pulls
 [brew]: http://brew.sh/
 [homebrew-cask]: https://formulae.brew.sh/cask/gitify
+[biome-website]: biomejs.dev/
 [coveralls]: https://coveralls.io/github/gitify-app/gitify
 [coveralls-badge]: https://img.shields.io/coverallsCoverage/github/gitify-app/gitify
 [build-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/build-app.yml/badge.svg
 [release-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/release.yml/badge.svg
 [downloads-total-badge]: https://img.shields.io/github/downloads/gitify-app/gitify/total?label=downloads@all
 [downloads-latest-badge]: https://img.shields.io/github/downloads/gitify-app/gitify/latest/total
 [contributors-badge]: https://img.shields.io/github/contributors/gitify-app/gitify
+[librariesio]: https://libraries.io/
+[librariesio-badge]: https://img.shields.io/librariesio/github/gitify-app/gitify
 [license]: LICENSE
 [license-badge]: https://img.shields.io/github/license/gitify-app/gitify
 [github-release-badge]: https://img.shields.io/github/v/release/gitify-app/gitify
 [homebrew-cask-badge]: https://img.shields.io/homebrew/cask/v/gitify
+[jest-website]: https://jestjs.io/
 [renovate]: https://renovatebot.com/
 [renovate-badge]: https://img.shields.io/badge/renovate-enabled-brightgreen.svg

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.8.0/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
   "organizeImports": {
     "enabled": true
   },

main.js

@@ -1,4 +1,4 @@
-const { ipcMain: ipc, app, nativeTheme } = require('electron/main');
+const { ipcMain: ipc, app, nativeTheme, Menu } = require('electron/main');
 const { menubar } = require('menubar');
 const { autoUpdater } = require('electron-updater');
 const { onFirstRunMaybe } = require('./first-run');
@@ -27,6 +27,15 @@ const browserWindowOpts = {
   },
 };
 
+const contextMenu = Menu.buildFromTemplate([
+  {
+    label: 'Quit',
+    click: () => {
+      app.quit();
+    },
+  },
+]);
+
 app.whenReady().then(async () => {
   await onFirstRunMaybe();
 
@@ -46,6 +55,10 @@ app.whenReady().then(async () => {
 
     mb.hideWindow();
 
+    mb.tray.on('right-click', (_event, bounds) => {
+      mb.tray.popUpContextMenu(contextMenu, { x: bounds.x, y: bounds.y });
+    });
+
     // Force the window to retrieve its previous zoom factor
     mb.window.webContents.setZoomFactor(mb.window.webContents.getZoomFactor());
 

package.json

@@ -124,7 +124,7 @@
     "typescript": "5.4.5"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.8.0",
+    "@biomejs/biome": "1.8.1",
     "@electron/notarize": "2.3.2",
     "@testing-library/react": "16.0.0",
     "@types/jest": "29.5.12",
@@ -153,7 +153,7 @@
     "webpack-cli": "5.1.4",
     "webpack-merge": "5.10.0"
   },
-  "packageManager": "pnpm@9.2.0",
+  "packageManager": "pnpm@9.3.0",
   "lint-staged": {
     "*.{html,js,json,ts,tsx}": "biome format --fix"
   }

src/components/NotificationRow.test.tsx

@@ -1,15 +1,15 @@
 import { fireEvent, render, screen } from '@testing-library/react';
-import { shell } from 'electron';
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
 import type { Milestone, UserType } from '../typesGitHub';
 import { mockSingleNotification } from '../utils/api/__mocks__/response-mocks';
-import * as helpers from '../utils/helpers';
+import * as comms from '../utils/comms';
+import * as links from '../utils/links';
 import { NotificationRow } from './NotificationRow';
 
 describe('components/NotificationRow.tsx', () => {
   beforeEach(() => {
-    jest.spyOn(helpers, 'openInBrowser');
+    jest.spyOn(links, 'openNotification');
   });
 
   afterEach(() => {
@@ -341,7 +341,7 @@ describe('components/NotificationRow.tsx', () => {
       );
 
       fireEvent.click(screen.getByRole('main'));
-      expect(helpers.openInBrowser).toHaveBeenCalledTimes(1);
+      expect(links.openNotification).toHaveBeenCalledTimes(1);
       expect(removeNotificationFromState).toHaveBeenCalledTimes(1);
     });
 
@@ -366,7 +366,7 @@ describe('components/NotificationRow.tsx', () => {
       );
 
       fireEvent.keyDown(screen.getByRole('main'));
-      expect(helpers.openInBrowser).toHaveBeenCalledTimes(1);
+      expect(links.openNotification).toHaveBeenCalledTimes(1);
       expect(removeNotificationFromState).toHaveBeenCalledTimes(1);
     });
 
@@ -391,7 +391,7 @@ describe('components/NotificationRow.tsx', () => {
       );
 
       fireEvent.click(screen.getByRole('main'));
-      expect(helpers.openInBrowser).toHaveBeenCalledTimes(1);
+      expect(links.openNotification).toHaveBeenCalledTimes(1);
       expect(markNotificationDone).toHaveBeenCalledTimes(1);
     });
 
@@ -460,6 +460,8 @@ describe('components/NotificationRow.tsx', () => {
     });
 
     it('should open notification user profile', () => {
+      const openExternalLinkMock = jest.spyOn(comms, 'openExternalLink');
+
       const props = {
         notification: {
           ...mockSingleNotification,
@@ -490,8 +492,8 @@ describe('components/NotificationRow.tsx', () => {
       );
 
       fireEvent.click(screen.getByTitle('View User Profile'));
-      expect(shell.openExternal).toHaveBeenCalledTimes(1);
-      expect(shell.openExternal).toHaveBeenCalledWith(
+      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
+      expect(openExternalLinkMock).toHaveBeenCalledWith(
         props.notification.subject.user.html_url,
       );
     });