chore(SILVA-403): code refactor (#444)

bcgov · Nov 7, 2024 · e833322 · e833322
1 parent 3f0b8ca
commit e833322
Show file tree

Hide file tree

Showing 50 changed files with 699 additions and 1,150 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -72,7 +72,7 @@ jobs:
             -Dsonar.javascript.lcov.reportPaths=coverage/lcov.info
             -Dsonar.typescript.tsconfigPaths=tsconfig.json
             -Dsonar.sources=src/
-            -Dsonar.exclusions=src/__test__/**
+            -Dsonar.exclusions=src/__test__/**,src/amplifyconfiguration.*,src/**/*.scss,src/**/*.css,src/**/*.d.*,src/setupTests.*
             -Dsonar.tests=src/__test__/
             -Dsonar.project.monorepo.enabled=true
           sonar_token: ${{ secrets.SONAR_TOKEN_FRONTEND }}

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,11 +9,10 @@
     "@carbon/icons-react": "^11.50.1",
     "@carbon/pictograms-react": "^11.49.0",
     "@carbon/react": "^1.27.0",
-    "@redux-devtools/extension": "^3.3.0",
     "@tanstack/react-query": "^5.50.1",
     "@types/node": "^22.0.0",
     "@vitejs/plugin-react": "^4.0.4",
-    "@vitejs/plugin-react-swc": "^3.3.2",    
+    "@vitejs/plugin-react-swc": "^3.3.2",
     "aws-amplify": "^6.7.0",
     "axios": "^1.6.8",
     "jspdf": "^2.5.2",
@@ -26,10 +25,7 @@
     "react-esri-leaflet": "^2.0.1",
     "react-hash-string": "^1.0.0",
     "react-leaflet": "^4.2.1",
-    "react-redux": "^9.0.0",
     "react-router-dom": "^6.10.0",
-    "redux": "^5.0.0",
-    "redux-thunk": "^3.0.0",
     "vite": "^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
     "vite-tsconfig-paths": "^5.0.0",

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,7 +1,6 @@
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 import './custom.scss';
 import Landing from "./screens/Landing";
-import Help from "./screens/Help";
 import SideLayout from './layouts/SideLayout';
 import ProtectedRoute from './routes/ProtectedRoute';
 import Opening from './screens/Opening';
@@ -33,10 +32,6 @@ const router = createBrowserRouter([
       {
         path: "/silviculture-search",
         element: <SideLayout pageContent={<SilvicultureSearch />} />
-      },
-      {
-        path: "/help",
-        element: <SideLayout pageContent={<Help />} />
       }
     ]
   },

diff --git a/frontend/src/__test__/actions/userAction.test.ts b/frontend/src/__test__/actions/userAction.test.ts
diff --git a/frontend/src/__test__/components/BCHeaderwSide.test.tsx b/frontend/src/__test__/components/BCHeaderwSide.test.tsx
@@ -5,9 +5,6 @@ import { BrowserRouter } from 'react-router-dom';
 import BCHeaderwSide from '../../components/BCHeaderwSide';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import {leftMenu } from '../../components/BCHeaderwSide/constants';
-import * as redux from 'react-redux';
-import { Provider } from 'react-redux';
-import store from '../../store';
 import { UserClientRolesType } from '../../types/UserRoleType';
 import '@testing-library/jest-dom';
 import { AuthProvider } from '../../contexts/AuthProvider';
@@ -31,12 +28,10 @@ const renderComponent = () => {
 
   render(
     <AuthProvider>
-      <QueryClientProvider client={qc}>
-        <Provider store={store}>
-          <BrowserRouter>
-            <BCHeaderwSide />
-          </BrowserRouter>
-        </Provider>
+      <QueryClientProvider client={qc}>        
+        <BrowserRouter>
+          <BCHeaderwSide />
+        </BrowserRouter>
       </QueryClientProvider>
     </AuthProvider>
   );
@@ -65,9 +60,6 @@ const state = {
   },
 };
 
-vi.spyOn(redux, 'useSelector')
-  .mockImplementation((callback) => callback(state));
-
 describe('BCHeaderwSide', () => {
   it('should renders the component', () => {
     renderComponent();
@@ -88,12 +80,6 @@ describe('BCHeaderwSide', () => {
     // expect(screen.queryByText('My Profile')).not.toBeVisible();
   });
 
-  // it('renders the correct number of top-level menu items', () => {
-  //   renderComponent();
-  //   const menuItems = screen.getAllByRole('button', { name: /.*Category.*/ });
-  //   expect(menuItems).toHaveLength(leftMenu.length);
-  // });
-
   it('renders the correct menu item names', () => {
     renderComponent();
     leftMenu.forEach(item => {