Merge branch 'main' into PIMS-1818-PromptBeforeEmailNotificationsSent

bcgov · Jul 12, 2024 · 9e82f17 · 9e82f17
2 parents 5363e40 + 90f200b
commit 9e82f17
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/express-api/package.json b/express-api/package.json
@@ -21,7 +21,7 @@
   "license": "ISC",
   "dependencies": {
     "@bcgov/citz-imb-kc-css-api": "https://github.com/bcgov/citz-imb-kc-css-api/releases/download/v1.4.0/bcgov-citz-imb-kc-css-api-1.4.0.tgz",
-    "@bcgov/citz-imb-sso-express": "1.0.0-rc2",
+    "@bcgov/citz-imb-sso-express": "1.0.0",
     "axios": "1.7.1",
     "body-parser": "1.20.2",
     "compression": "1.7.4",
@@ -58,8 +58,8 @@
     "@types/nunjucks": "3.2.6",
     "@types/supertest": "6.0.2",
     "@types/swagger-ui-express": "4.1.6",
-    "@typescript-eslint/eslint-plugin": "7.13.1",
-    "@typescript-eslint/parser": "7.13.1",
+    "@typescript-eslint/eslint-plugin": "7.16.0",
+    "@typescript-eslint/parser": "7.16.0",
     "cross-env": "7.0.3",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
@@ -69,7 +69,7 @@
     "prettier": "3.3.0",
     "supertest": "7.0.0",
     "swagger-autogen": "2.23.7",
-    "ts-jest": "29.1.1",
+    "ts-jest": "29.2.0",
     "ts-node": "10.9.1",
     "tsc-alias": "1.8.8",
     "tsconfig-paths": "4.2.0",

diff --git a/react-app/package.json b/react-app/package.json
@@ -20,11 +20,11 @@
     "@emotion/styled": "11.11.0",
     "@mdi/js": "7.4.47",
     "@mdi/react": "1.6.1",
-    "@mui/icons-material": "5.15.6",
+    "@mui/icons-material": "5.16.0",
     "@mui/lab": "5.0.0-alpha.170",
-    "@mui/material": "5.15.15",
-    "@mui/x-data-grid": "7.7.0",
-    "@mui/x-date-pickers": "7.7.0",
+    "@mui/material": "5.16.0",
+    "@mui/x-data-grid": "7.9.0",
+    "@mui/x-date-pickers": "7.9.0",
     "@turf/turf": "7.0.0",
     "dayjs": "1.11.10",
     "node-xlsx": "0.24.0",
@@ -47,8 +47,8 @@
     "@types/leaflet": "1.9.9",
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.0",
-    "@typescript-eslint/eslint-plugin": "7.13.1",
-    "@typescript-eslint/parser": "7.13.1",
+    "@typescript-eslint/eslint-plugin": "7.16.0",
+    "@typescript-eslint/parser": "7.16.0",
     "@vitejs/plugin-react": "4.3.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
@@ -58,9 +58,9 @@
     "jest-environment-jsdom": "29.7.0",
     "prettier": "3.3.0",
     "react-test-renderer": "18.3.1",
-    "ts-jest": "29.1.1",
+    "ts-jest": "29.2.0",
     "ts-node": "10.9.2",
-    "typescript": "5.4.2",
+    "typescript": "5.5.3",
     "vite": "5.3.1",
     "vite-tsconfig-paths": "4.3.1"
   }

diff --git a/react-app/src/components/map/parcelPopup/LtsaDetails.tsx b/react-app/src/components/map/parcelPopup/LtsaDetails.tsx
@@ -22,7 +22,7 @@ const LtsaDetails = (props: LtsaDetailsProps) => {
   }
 
   return (
-    <Box minWidth={width} height={'300px'} overflow={'scroll'}>
+    <Box minWidth={width} height={'300px'}>
       <Grid container gap={1}>
         {ltsaData && ltsaData.order ? (
           <>

diff --git a/react-app/src/components/map/parcelPopup/ParcelPopup.tsx b/react-app/src/components/map/parcelPopup/ParcelPopup.tsx
@@ -108,7 +108,7 @@ export const ParcelPopup = (props: ParcelPopupProps) => {
   const tabPanelStyle: SxProps = {
     padding: '1em 0 0 0',
     height: '100%',
-    overflow: 'scroll',
+    overflowY: 'scroll',
   };
 
   if (size === 'large')

diff --git a/react-app/src/components/property/PropertyTable.tsx b/react-app/src/components/property/PropertyTable.tsx
@@ -290,7 +290,6 @@ const PropertyTable = (props: IPropertyTable) => {
   const handleDataChange = async (filter: CommonFiltering, signal: AbortSignal): Promise<any[]> => {
     try {
       const { properties, totalCount } = await api.properties.propertiesDataSource(filter, signal);
-      console.log('Total count', totalCount);
       setTotalCount(totalCount);
       snackbar.setMessageState({
         open: true,

diff --git a/react-app/src/components/table/DataTable.tsx b/react-app/src/components/table/DataTable.tsx
@@ -13,7 +13,6 @@ import { mdiDotsHorizontal } from '@mdi/js';
 import {
   Box,
   IconButton,
-  LinearProgress,
   ListItemIcon,
   ListSubheader,
   Menu,
@@ -131,7 +130,15 @@ export const DataGridFloatingMenu = (props: IDataGridFloatingMenuProps) => {
 
 export const CustomDataGrid = (props: DataGridProps) => {
   return (
-    <DataGrid {...props} slots={{ noRowsOverlay: NoRowsOverlay, loadingOverlay: LinearProgress }} />
+    <DataGrid
+      {...props}
+      slotProps={{
+        loadingOverlay: {
+          variant: 'linear-progress',
+          noRowsVariant: 'skeleton',
+        },
+      }}
+    />
   );
 };
 
@@ -691,7 +698,7 @@ export const FilterSearchDataGrid = (props: FilterSearchDataGridProps) => {
           },
         }}
         loading={dataSourceLoading}
-        slots={{ toolbar: KeywordSearch, noRowsOverlay: NoRowsOverlay }}
+        slots={{ noRowsOverlay: NoRowsOverlay }}
         {...props}
         rows={dataSourceRows && props.dataSource ? dataSourceRows : props.rows}
       />