Update deps & move bmp gen to legacy

DHI · Oct 17, 2023 · c7f9a51 · c7f9a51
1 parent 0072567
commit c7f9a51
Show file tree

Hide file tree

Showing 23 changed files with 346 additions and 2,488 deletions.
diff --git a/apps/react-app/package.json b/apps/react-app/package.json
@@ -23,8 +23,8 @@
     "@emotion/styled": "^11.3.0",
     "history": "^5.0.0",
     "mapbox-gl": "^2.9.2",
-    "mobx": "^6.6.1",
-    "mobx-react-lite": "^3.4.0",
+    "mobx": "^6.10.2",
+    "mobx-react-lite": "^4.0.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-map-gl": "6.1.12",
@@ -36,8 +36,8 @@
     "@types/geojson": "^7946.0.7",
     "@types/node": "^18.0.6",
     "@types/qs": "^6.9.7",
-    "@types/react": "^18.0.15",
-    "@types/react-dom": "^18.0.6",
+    "@types/react": "^18.2.28",
+    "@types/react-dom": "^18.2.13",
     "@vitejs/plugin-react": "^2.0.0",
     "eslint-config-nfour": "^3.5.0",
     "typescript": "^4.7.4",

diff --git a/apps/stories/package.json b/apps/stories/package.json
@@ -13,7 +13,6 @@
     "luxon": "^3.0.3",
     "@types/luxon": "^3.0.1",
     "@dhi/arsenal.date-slider": "workspace:*",
-    "@dhi/arsenal.bmpgenerator": "workspace:*",
     "@dhi/arsenal.jsonform": "workspace:*",
     "@dhi/arsenal.models": "workspace:*",
     "@dhi/arsenal.ui": "workspace:*",
@@ -34,8 +33,8 @@
   },
   "devDependencies": {
     "eslint-config-nfour": "^3.5.0",
-    "@types/react": "^18.0.15",
-    "@types/react-dom": "^18.0.6",
+    "@types/react": "^18.2.28",
+    "@types/react-dom": "^18.2.13",
     "@types/node": "^18.0.6",
     "vite": "^3.1.2",
     "@vitejs/plugin-react": "^2.1.0",

diff --git a/libs/bmpgenerator/.eslintrc.json → legacy/bmpgenerator/.eslintrc.json b/libs/bmpgenerator/.eslintrc.json → legacy/bmpgenerator/.eslintrc.json
diff --git a/libs/bmpgenerator/.npmignore → legacy/bmpgenerator/.npmignore b/libs/bmpgenerator/.npmignore → legacy/bmpgenerator/.npmignore
diff --git a/libs/bmpgenerator/.prettierrc.json → legacy/bmpgenerator/.prettierrc.json b/libs/bmpgenerator/.prettierrc.json → legacy/bmpgenerator/.prettierrc.json
diff --git a/libs/bmpgenerator/CHANGELOG.md → legacy/bmpgenerator/CHANGELOG.md b/libs/bmpgenerator/CHANGELOG.md → legacy/bmpgenerator/CHANGELOG.md
diff --git a/libs/bmpgenerator/package.json → legacy/bmpgenerator/package.json b/libs/bmpgenerator/package.json → legacy/bmpgenerator/package.json
@@ -61,7 +61,7 @@
     "@babel/plugin-syntax-typescript": "^7.12.13",
     "@emotion/babel-plugin": "^11.3.0",
     "@types/node": "^18.0.6",
-    "@types/react": "^18.0.15",
+    "@types/react": "^18.2.28",
     "@types/webpack": "^5.28.0",
     "babel-loader": "^8.2.2",
     "css-loader": "^5.2.2",
@@ -72,7 +72,7 @@
     "react-dom": "^17.0.2",
     "style-loader": "^2.0.0",
     "ts-node": "^10.2.1",
-    "typescript": "^4.7.4",
+    "typescript": "^5.2.2",
     "webpack": "^5.36",
     "webpack-cli": "^4.10.0"
   }

diff --git a/libs/bmpgenerator/pnpm-lock.yaml → legacy/bmpgenerator/pnpm-lock.yaml b/libs/bmpgenerator/pnpm-lock.yaml → legacy/bmpgenerator/pnpm-lock.yaml
diff --git a/libs/bmpgenerator/server/docker-compose.yml → ...cy/bmpgenerator/server/docker-compose.yml b/libs/bmpgenerator/server/docker-compose.yml → ...cy/bmpgenerator/server/docker-compose.yml
diff --git a/libs/bmpgenerator/src/BmpGenerator.tsx → legacy/bmpgenerator/src/BmpGenerator.tsx b/libs/bmpgenerator/src/BmpGenerator.tsx → legacy/bmpgenerator/src/BmpGenerator.tsx
diff --git a/libs/bmpgenerator/src/index.ts → legacy/bmpgenerator/src/index.ts b/libs/bmpgenerator/src/index.ts → legacy/bmpgenerator/src/index.ts
diff --git a/libs/bmpgenerator/src/styles.css → legacy/bmpgenerator/src/styles.css b/libs/bmpgenerator/src/styles.css → legacy/bmpgenerator/src/styles.css
diff --git a/libs/bmpgenerator/tsconfig.json → legacy/bmpgenerator/tsconfig.json b/libs/bmpgenerator/tsconfig.json → legacy/bmpgenerator/tsconfig.json
diff --git a/libs/bmpgenerator/webpack.config.base.mjs → legacy/bmpgenerator/webpack.config.base.mjs b/libs/bmpgenerator/webpack.config.base.mjs → legacy/bmpgenerator/webpack.config.base.mjs
diff --git a/libs/bmpgenerator/webpack.config.mjs → legacy/bmpgenerator/webpack.config.mjs b/libs/bmpgenerator/webpack.config.mjs → legacy/bmpgenerator/webpack.config.mjs
diff --git a/libs/date-slider/package.json b/libs/date-slider/package.json
@@ -29,8 +29,8 @@
     "@mui/material": "^5.4.3",
     "@types/node": "^18.0.6",
     "@types/luxon": "^3.0.1",
-    "@types/react": "^18.0.15",
-    "mobx": "^6.8.0",
+    "@types/react": "^18.2.28",
+    "mobx": "^6.10.2",
     "mobx-react-lite": "^3.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/libs/jsonform/package.json b/libs/jsonform/package.json
@@ -37,8 +37,8 @@
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
     "@types/node": "^18.0.6",
-    "@types/react": "^18.0.15",
-    "mobx": "^6.10.0",
+    "@types/react": "^18.2.28",
+    "mobx": "^6.10.2",
     "mobx-react-lite": "^4.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/libs/models/package.json b/libs/models/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.0.6",
-    "mobx": "^6.10.0",
+    "mobx": "^6.10.2",
     "typescript": "^5.1.6"
   },
   "repository": {

diff --git a/libs/scenarios/package.json b/libs/scenarios/package.json
@@ -47,7 +47,8 @@
     "@mui/material": "~5.14.4",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^18.0.6",
-    "@types/react": "^18.0.15",
+    "@types/react": "^18.2.28",
+    "@types/react-dom": "^18.2.13",
     "@types/uuid": "^8.3.4",
     "@vitejs/plugin-react": "^4.0.4",
     "eslint-config-nfour": "^3.5.0",

diff --git a/libs/scenarios/src/editor/ScenarioConfigEditor.tsx b/libs/scenarios/src/editor/ScenarioConfigEditor.tsx
@@ -13,7 +13,16 @@ import { useEffect } from 'react';
 export type ConfigEditorProps = Pick<
   Partial<PropsOf<typeof FormConfigEditor>>,
   'className' | 'operations' | 'onData' | 'onInit' | 'validation' | 'readOnly'
->;
+> & {
+  scenarioActions?: {
+    delete?: {
+      disabled?: boolean;
+    };
+    clone?: {
+      disabled?: boolean;
+    };
+  };
+};
 
 export const ScenarioConfigEditor = observer<{
   editor?: ConfigEditorProps;
@@ -46,7 +55,10 @@ export const ScenarioConfigEditor = observer<{
 
   if (!activeScenario) return <></>;
 
+  const actions = editor.scenarioActions;
   const showConfigActionBar = draftScenario.value?.id !== activeScenario?.id;
+  const isAllActionsDisabled =
+    actions?.delete?.disabled === true && actions?.clone?.disabled === true;
 
   return (
     <$Col grow>
@@ -84,7 +96,7 @@ export const ScenarioConfigEditor = observer<{
           ...(editor.operations ?? {}),
         }}
       />
-      {showConfigActionBar && (
+      {showConfigActionBar && !isAllActionsDisabled && (
         <ButtonGroup
           css={css`
             width: 100%;
@@ -93,32 +105,36 @@ export const ScenarioConfigEditor = observer<{
             position: relative;
           `}
         >
-          <ConfirmDropdown
-            css={css`
-              color: #ff1100ae;
-            `}
-            trigger={{
-              icon: <DeleteIcon />,
-              label: <>Delete</>,
-            }}
-            confirm={{
-              icon: <DeleteIcon />,
-              label: <>Delete Scenario</>,
-              onClick: () => deleteScenario?.(activeScenario.id),
-            }}
-          />
+          {!actions?.delete?.disabled && (
+            <ConfirmDropdown
+              css={css`
+                color: #ff1100ae;
+              `}
+              trigger={{
+                icon: <DeleteIcon />,
+                label: <>Delete</>,
+              }}
+              confirm={{
+                icon: <DeleteIcon />,
+                label: <>Delete Scenario</>,
+                onClick: () => deleteScenario?.(activeScenario.id),
+              }}
+            />
+          )}
 
-          <ConfirmDropdown
-            trigger={{
-              icon: <CloneIcon />,
-              label: <>Clone</>,
-            }}
-            confirm={{
-              icon: <CloneIcon />,
-              label: <>Clone Scenario</>,
-              onClick: () => cloneScenario?.(activeScenario),
-            }}
-          />
+          {!actions?.clone?.disabled && (
+            <ConfirmDropdown
+              trigger={{
+                icon: <CloneIcon />,
+                label: <>Clone</>,
+              }}
+              confirm={{
+                icon: <CloneIcon />,
+                label: <>Clone Scenario</>,
+                onClick: () => cloneScenario?.(activeScenario),
+              }}
+            />
+          )}
         </ButtonGroup>
       )}
     </$Col>

diff --git a/libs/ui/package.json b/libs/ui/package.json
@@ -25,8 +25,8 @@
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
-    "@types/react": "^18.0.15",
-    "mobx": "^6.8.0",
+    "@types/react": "^18.2.28",
+    "mobx": "^6.10.2",
     "mobx-react-lite": "^4.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",