feat: Migrate from redux to context & hooks (#463)

* chore: Remove redux and start migrating to context

* chore: Display notifications successfully

* chore: Fix a few tests

* chore: Move more files

* chore: Restore Settings on launch

* chore: Use hook - useInterval

* chore: Simpler logic for native notifiactions

* chore: Store correct settings when updating settings

* chore: Restore appearance on load

* chore: Move files to src/

* fix: Correct imports

* feat: Mark notification as read

* feat: Unsubscribe from notification

* feat: Mark repo notifications as read

* chore: Rename Constants file to constants

* feat: Implement Login with Enterprise & fix more tests

* fix: Fix more tests

* chore: Fix imports

* chore: Test useNotifications hook

* fix: Fix app context - callback dependencies

* chore: Update dependencies

* chore: Move auth hook to utils

* chore: Tests for App context

* chore: Clean Up

* chore: Rename Notification component to NotificationRow

Author: manosim

.github/workflows/run-tests.yml

@@ -1,6 +1,6 @@
 name: Run Tests
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   run-unit-tests:
@@ -26,7 +26,10 @@ jobs:
       - name: Run Prettier (Check)
         run: yarn prettier:check
 
+      - name: Run Typechecking
+        run: yarn tsc --noEmit
+
       - name: Run Jest
-        run: yarn test --coverage --runInBand
+        run: yarn test --coverage --runInBand --verbose
 
       - uses: codecov/codecov-action@v1

package.json

@@ -37,11 +37,11 @@
   "contributors": [
     {
       "name": "Emmanouil Konstantinidis",
-      "url": "https://githib.com/manosim"
+      "url": "https://github.com/manosim"
     },
     {
       "name": "Jake 'Sid' Smith",
-      "url": "https://githib.com/JakeSidSmith"
+      "url": "https://github.com/JakeSidSmith"
     }
   ],
   "license": "MIT",
@@ -52,7 +52,7 @@
   "jest": {
     "preset": "ts-jest/presets/js-with-ts",
     "setupFiles": [
-      "<rootDir>/src/js/__helpers__/setupEnvVars.js"
+      "<rootDir>/src/__helpers__/setupEnvVars.js"
     ],
     "testEnvironment": "jsdom",
     "coverageThreshold": {
@@ -106,12 +106,12 @@
     "afterSign": "scripts/notarize.js"
   },
   "dependencies": {
-    "@primer/octicons-react": "^11.1.0",
+    "@primer/octicons-react": "^11.2.0",
     "autoprefixer": "^10.1.0",
-    "axios": "=0.21.0",
+    "axios": "=0.21.1",
     "date-fns": "^2.16.1",
     "electron-updater": "^4.3.5",
-    "final-form": "^4.19.1",
+    "final-form": "^4.20.1",
     "lodash": "^4.17.20",
     "menubar": "^9.0.1",
     "nprogress": "=0.2.0",
@@ -120,43 +120,35 @@
     "react-dom": "=16.13.1",
     "react-emojione": "=5.0.1",
     "react-final-form": "^6.4.0",
-    "react-is": "^16.13.1",
-    "react-redux": "=7.2.0",
-    "react-router-dom": "^5.1.2",
-    "react-transition-group": "^4.3.0",
+    "react-router-dom": "^5.2.0",
+    "react-transition-group": "^4.4.1",
     "react-typist": "^2.0.5",
-    "redux": "=4.0.5",
-    "redux-storage": "=4.1.2",
-    "redux-storage-decorator-filter": "=1.1.8",
-    "redux-storage-engine-localstorage": "=1.1.4",
-    "redux-thunk": "=2.3.0",
     "tailwindcss": "^2.0.2",
-    "ts-loader": "^8.0.11",
-    "typescript": "^4.1.2"
+    "ts-loader": "^8.0.12",
+    "typescript": "^4.1.3"
   },
   "devDependencies": {
-    "@testing-library/react": "^10.0.2",
-    "@types/jest": "^26.0.15",
+    "@testing-library/react": "^11.2.2",
+    "@testing-library/react-hooks": "^3.7.0",
+    "@types/jest": "^26.0.19",
     "@types/lodash": "^4.14.165",
-    "@types/node": "^14.14.9",
+    "@types/node": "^14.14.14",
     "@types/react": "^16.9.32",
-    "@types/react-redux": "^7.1.7",
-    "@types/react-transition-group": "^4.2.4",
-    "@types/styled-components": "^5.0.1",
+    "@types/react-router-dom": "^5.1.6",
+    "@types/react-transition-group": "^4.4.0",
     "css-loader": "^5.0.1",
     "electron": "^11.1.0",
     "electron-builder": "^22.9.1",
     "electron-notarize": "^1.0.0",
     "jest": "^26.6.3",
-    "nock": "^12.0.3",
+    "nock": "^13.0.5",
     "postcss-loader": "^4.1.0",
-    "prettier": "=2.2.0",
+    "prettier": "=2.2.1",
     "react-test-renderer": "=16.13.1",
-    "redux-mock-store": "=1.5.4",
     "style-loader": "^2.0.0",
     "ts-jest": "^26.4.4",
-    "webpack": "^5.6.0",
+    "webpack": "^5.11.0",
     "webpack-cli": "^4.2.0",
-    "webpack-merge": "^5.4.0"
+    "webpack-merge": "^5.7.3"
   }
 }

src/js/__helpers__/setupEnvVars.js src/__helpers__/setupEnvVars.jssrc/js/__helpers__/setupEnvVars.js renamed to src/__helpers__/setupEnvVars.js

@@ -0,0 +1,20 @@
+import { Appearance, AuthState, SettingsState } from '../types';
+
+export const mockAccounts: AuthState = {
+  token: 'token-123-456',
+  enterpriseAccounts: [
+    {
+      token: 'token-gitify-123-456',
+      hostname: 'github.gitify.io',
+    },
+  ],
+};
+
+export const mockSettings: SettingsState = {
+  participating: false,
+  playSound: true,
+  showNotifications: true,
+  markOnClick: false,
+  openAtStartup: false,
+  appearance: Appearance.SYSTEM,
+};

src/js/__mocks__/electron.js src/__mocks__/electron.jssrc/js/__mocks__/electron.js renamed to src/__mocks__/electron.js

@@ -1,5 +1,5 @@
-import { Notification, Repository } from '../../types/github';
-import { EnterpriseAccount } from '../../types/reducers';
+import { AccountNotifications, EnterpriseAccount } from '../types';
+import { Notification, Repository } from '../typesGithub';
 
 export const mockedEnterpriseAccounts: EnterpriseAccount[] = [
   {
@@ -251,7 +251,7 @@ export const mockedEnterpriseNotifications = [
   } as Notification,
 ];
 
-export const mockedNotificationsReducerData = [
+export const mockedAccountNotifications: AccountNotifications[] = [
   {
     hostname: 'github.com',
     notifications: mockedGithubNotifications,
@@ -261,3 +261,10 @@ export const mockedNotificationsReducerData = [
     notifications: mockedEnterpriseNotifications,
   },
 ];
+
+export const mockedSingleAccountNotifications: AccountNotifications[] = [
+  {
+    hostname: 'github.com',
+    notifications: [mockedSingleNotification],
+  },
+];

src/__mocks__/mock-state.ts

@@ -1,35 +1,27 @@
-import * as React from 'react';
+import React, { useContext } from 'react';
 import {
   Redirect,
   HashRouter as Router,
   Route,
   Switch,
 } from 'react-router-dom';
-import { Provider } from 'react-redux';
 
-import configureStore from './store/configureStore';
-import Loading from './components/loading';
-import Sidebar from './components/sidebar';
-
-import EnterpriseLoginRoute from './routes/enterprise-login';
-import LoginRoute from './routes/login';
-import NotificationsRoute from './routes/notifications';
-import SettingsRoute from './routes/settings';
-
-// Store
-export const store = configureStore();
+import { AppContext, AppProvider } from './context/App';
+import { Loading } from './components/Loading';
+import { LoginEnterpriseRoute } from './routes/LoginEnterprise';
+import { LoginRoute } from './routes/Login';
+import { NotificationsRoute } from './routes/Notifications';
+import { SettingsRoute } from './routes/Settings';
+import { Sidebar } from './components/Sidebar';
 
 export const PrivateRoute = ({ component: Component, ...rest }) => {
-  // @ts-ignore
-  const authReducer = store.getState().auth;
-  const isAuthenticated =
-    authReducer.token !== null || authReducer.enterpriseAccounts.length > 0;
+  const { isLoggedIn } = useContext(AppContext);
 
   return (
     <Route
       {...rest}
       render={(props) =>
-        isAuthenticated ? (
+        isLoggedIn ? (
           <Component {...props} />
         ) : (
           <Redirect
@@ -43,7 +35,7 @@ export const PrivateRoute = ({ component: Component, ...rest }) => {
 
 export const App = () => {
   return (
-    <Provider store={store}>
+    <AppProvider>
       <Router>
         <div className="flex flex-col pl-14 h-full">
           <Loading />
@@ -53,10 +45,10 @@ export const App = () => {
             <PrivateRoute path="/" exact component={NotificationsRoute} />
             <PrivateRoute path="/settings" exact component={SettingsRoute} />
             <Route path="/login" component={LoginRoute} />
-            <Route path="/enterpriselogin" component={EnterpriseLoginRoute} />
+            <Route path="/enterpriselogin" component={LoginEnterpriseRoute} />
           </Switch>
         </div>
       </Router>
-    </Provider>
+    </AppProvider>
   );
 };

src/js/__mocks__/mockedData.ts src/__mocks__/mockedData.tssrc/js/__mocks__/mockedData.ts renamed to src/__mocks__/mockedData.ts

@@ -1,12 +1,14 @@
-import * as React from 'react';
-import * as TestRendener from 'react-test-renderer';
+import React from 'react';
+import TestRendener from 'react-test-renderer';
 
-import { AccountNotifications } from './account-notifications';
+import { AccountNotifications } from './AccountNotifications';
 import { mockedGithubNotifications } from '../__mocks__/mockedData';
 
-jest.mock('./repository');
+jest.mock('./Repository', () => ({
+  RepositoryNotifications: () => <div>Repository</div>,
+}));
 
-describe('components/account-notifications.tsx', () => {
+describe('components/AccountNotifications.tsx', () => {
   it('should render itself (github.com with notifications)', () => {
     const props = {
       hostname: 'github.com',

src/js/app.tsx src/app.tsxsrc/js/app.tsx renamed to src/app.tsx

@@ -1,9 +1,9 @@
-import * as React from 'react';
-import * as _ from 'lodash';
+import React from 'react';
+import _ from 'lodash';
 import { ChevronDownIcon, ChevronLeftIcon } from '@primer/octicons-react';
 
-import { Notification } from '../../types/github';
-import RepositoryNotifications from './repository';
+import { Notification } from '../typesGithub';
+import { RepositoryNotifications } from './Repository';
 
 interface IProps {
   hostname: string;

…omponents/account-notifications.test.tsx …components/AccountNotifications.test.tsxsrc/js/components/account-notifications.test.tsx renamed to src/components/AccountNotifications.test.tsx src/js/components/account-notifications.test.tsx renamed to src/components/AccountNotifications.test.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import * as TestRenderer from 'react-test-renderer';
+import { Constants } from '../utils/constants';
 
-import Constants from '../utils/constants';
-import { AllRead } from './all-read';
+import { AllRead } from './AllRead';
 
 jest.mock('react-typist');