Merge branch 'main' into task/WG-238-panel-assets-listing

react/.gitignore

@@ -23,6 +23,10 @@ dist-ssr
 *.sln
 *.sw?
 
+# Building artifacts from core-components
+# (to be removed in https://tacc-main.atlassian.net/browse/WI-208)
+.nx
+
 # Environment
 .env
 secret_local.ts

react/jest.config.cjs

@@ -25,8 +25,25 @@ module.exports = {
   collectCoverage: true,
 
   // An array of glob patterns indicating a set of files for which coverage information should be collected
-  // collectCoverageFrom: undefined,
-
+  collectCoverageFrom: [
+    'src/**/*.{js,jsx,ts,tsx}',
+    // Exclude test files
+    '!src/**/*.test.{js,jsx,ts,tsx}',
+    '!src/**/*.spec.{js,jsx,ts,tsx}',
+    // Exclude test utilities
+    '!src/test/**/*',
+    '!src/testUtil.ts',
+    '!src/__fixtures__/**/*',
+    // Exclude secrets and other files
+    '!src/secret_local*ts',
+    '!src/types/react*.ts',
+    // Exclude build/dist directories
+    '!dist/**/*',
+    '!build/**/*',
+    '!src/vite-env*',
+    // Exclude node_modules
+    '!**/node_modules/**',
+  ],
   // The directory where Jest should output its coverage files
   coverageDirectory: 'coverage',
 

react/src/pages/MainMenu/MainMenu.tsx

@@ -9,7 +9,7 @@ import useAuthenticatedUser from '@hazmapper/hooks/user/useAuthenticatedUser';
 import { SystemSelect } from '@hazmapper/components/Systems';
 import { ProjectListing } from '@hazmapper/components/Projects/ProjectListing';
 
-function MainMenu() {
+const MainMenu = () => {
   const {
     data: userData,
     isLoading: isUserLoading,
@@ -50,6 +50,6 @@ function MainMenu() {
       <SystemSelect onSystemSelect={handleSelectChange}></SystemSelect>
     </>
   );
-}
+};
 
 export default MainMenu;

react/src/vite-env.d.ts

@@ -1,26 +1 @@
 /// <reference types="vite/client" />
-
-interface Env {
-  designSafeUrl: string;
-  backend: string;
-  geoapiUrl: string;
-  designsafePortalUrl: string;
-  clientId: string;
-  host: string;
-  baseHref: string;
-  jwt: string;
-  mapillaryAuthUrl: string;
-  mapillaryTokenUrl: string;
-  mapillaryApiUrl: string;
-  mapillaryTileUrl: string;
-  mapillaryScope: string;
-  mapillaryClientSecret: string;
-  mapillaryClientId: string;
-  mapillaryClientToken: string;
-}
-
-interface ProcessEnv {
-  env: Env;
-}
-
-declare const process: ProcessEnv;

react/vite.config.ts

@@ -20,12 +20,6 @@ export default defineConfig(({ command, mode }) => {
       port: 4200,
       host: 'localhost',
     },
-    resolve: {
-      alias: {
-        '@hazmapper': path.resolve(__dirname, './src'),
-        '@core-components': path.resolve(__dirname, './src/core-components'),
-      },
-    },
     resolve: {
       alias: {
         '@hazmapper': path.resolve(__dirname, './src'),