réactive le tsc dans le front

betagouv · Dec 26, 2024 · 5fac685 · 5fac685
1 parent 3abdb92
commit 5fac685
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 13 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -2,14 +2,15 @@
   "name": "Maestro frontend",
   "version": "0.0.1",
   "private": false,
+  "type": "module",
   "scriptsComments": {
     "postinstall": "Permet à l'API d'utiliser le DSFR pour générer des PDF."
   },
   "scripts": {
     "dev": "vite",
     "start": "vite",
     "postinstall": "copy-dsfr-to-public",
-    "build": "vite build",
+    "build": "tsc && vite build",
     "preview": "vite preview",
     "test": "vitest",
     "lint": "node_modules/.bin/eslint . --ext .ts,.tsx",
@@ -54,7 +55,7 @@
     "dompurify": "^3.1.3",
     "fetch-intercept": "^2.4.0",
     "i18next": "^23.10.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "maplibre-gl": "^4.1.2",
     "openapi-explorer": "^2.2.732",
     "react": "^18.2.0",
@@ -75,6 +76,7 @@
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@types/dompurify": "^3.0.0",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.0",
     "@typescript-eslint/parser": "^8.14.0",
     "@vitejs/plugin-react": "^4.3.4",

diff --git a/frontend/src/components/Header/Header.test.tsx b/frontend/src/components/Header/Header.test.tsx
@@ -8,7 +8,7 @@ import { applicationMiddleware, applicationReducer } from 'src/store/store';
 import { mockRequests } from '../../../test/requestTestUtils';
 import Header from './Header';
 
-import {describe, test, expect} from 'vitest';
+import { describe, test, expect, beforeEach } from 'vitest';
 const validatedProgrammingPlan = {
   ...genProgrammingPlan(),
   status: 'Validated',

diff --git a/frontend/src/components/MatrixSelectModal/MatrixSelectModal.tsx b/frontend/src/components/MatrixSelectModal/MatrixSelectModal.tsx
@@ -11,6 +11,7 @@ import {
   MatrixKindLabels,
   MatrixKindList
 } from 'shared/referential/MatrixKind';
+import { isNil } from 'lodash-es';
 interface AddMatrixProps {
   excludedMatrixList: Matrix[];
   onSelect: (matrix: Matrix) => Promise<void>;
@@ -37,13 +38,15 @@ const MatrixSelectModal = ({
   const [selectedOption, setSelectedOption] = useState<{
     label: string;
     value: Matrix;
-  }>(null);
+  } | null>(null);
 
   const submit = async (e: React.MouseEvent<HTMLElement>) => {
     e.preventDefault();
 
-    await onSelect(selectedOption.value as Matrix);
-    matrixSelectModal.close();
+    if( !isNil(selectedOption)) {
+      await onSelect(selectedOption.value);
+      matrixSelectModal.close();
+    }
   };
 
   return (

diff --git a/frontend/src/views/DocumentListView/test/DocumentListView.test.tsx b/frontend/src/views/DocumentListView/test/DocumentListView.test.tsx
@@ -17,7 +17,7 @@ vi.mock(import('react-router-dom'), async (importOriginal) => {
   };
 });
 
-import { describe, test, expect, vi } from 'vitest';
+import { describe, test, expect, vi, beforeEach } from 'vitest';
 let store: Store;
 const authUser = genAuthUser();
 const nationalCoordinator = genUser({

diff --git a/frontend/src/views/SampleView/DraftSample/ContextStep/test/ContextStep.test.tsx b/frontend/src/views/SampleView/DraftSample/ContextStep/test/ContextStep.test.tsx
@@ -6,7 +6,7 @@ import { BrowserRouter } from 'react-router-dom';
 import { store } from 'src/store/store';
 import ContextStep from 'src/views/SampleView/DraftSample/ContextStep/ContextStep';
 
-import {describe, test, expect} from 'vitest';
+import { describe, test, expect, beforeEach } from 'vitest';
 // const companySearchResult = genCompanySearchResult();
 // const companySearchRequest = {
 //   pathname: `/api/companies/search?q=Company`,

diff --git a/frontend/src/views/SampleView/DraftSample/MatrixStep/test/MatrixStep.test.tsx b/frontend/src/views/SampleView/DraftSample/MatrixStep/test/MatrixStep.test.tsx
@@ -20,7 +20,7 @@ import {
   mockRequests,
 } from '../../../../../../test/requestTestUtils';
 
-import {describe, test, expect} from 'vitest';
+import { describe, test, expect, beforeEach } from 'vitest';
 let store: Store;
 const authUser = genAuthUser();
 const sampler = genUser({

diff --git a/frontend/src/views/SampleView/test/SampleView.test.tsx b/frontend/src/views/SampleView/test/SampleView.test.tsx
@@ -17,7 +17,7 @@ import {
   mockRequests,
 } from '../../../../test/requestTestUtils';
 
-import { describe, test, expect, vi } from 'vitest';
+import { describe, test, expect, vi, beforeEach } from 'vitest';
 
 
 vi.mock(import('react-router-dom'), async (importOriginal) => {

diff --git a/shared/schema/User/User.ts b/shared/schema/User/User.ts
@@ -1,8 +1,8 @@
-import _ from 'lodash';
 import { z } from 'zod';
 import { Region, RegionList, Regions } from '../../referential/Region';
 import { UserPermission } from './UserPermission';
 import { UserRole, UserRolePermissions } from './UserRole';
+import { intersection } from 'lodash-es';
 
 export const User = z.object({
   id: z.string().uuid(),
@@ -45,5 +45,5 @@ export const hasPermission = (
     .map((role) => UserRolePermissions[role])
     .flat();
 
-  return _.intersection(permissions, userPermissions).length > 0;
+  return intersection(permissions, userPermissions).length > 0;
 };