Merge pull request #314 from lightningrodlabs/add-zod

add zod schemas to validate migration data parsing logic

Author: Connoropolous

.github/workflows/unit-tests.yml

@@ -17,6 +17,8 @@ jobs:
       - name: Install nodejs dependencies
         run: |
           npm run web-install
+          npm run zod-models-install
+          npm run zod-models-build
         shell: bash
       - name: run unit tests
         run: |

.gitignore

@@ -5,6 +5,8 @@ user2-data
 user-data
 electron/web
 
+zod-models/dist
+
 web/dist/fonts
 web/dist/images
 web/dist/*.js

electron/src/index.ts

@@ -218,6 +218,7 @@ ipcMain.handle('getVersion', () => {
     version: `v${app.getVersion()}`,
     platform: process.platform,
     arch: process.arch,
+    integrityVersion: INTEGRITY_VERSION_NUMBER,
   }
 })
 

electron/src/paths.ts

@@ -31,6 +31,7 @@ const PREV_VER_USER_DATA_MIGRATION_FILE_PATHS = [
   // Acorn 6
   path.join(USER_DATA_PATH, `${MIGRATION_FILE_NAME_PREFIX}9`),
   // uncomment the below line for development testing
+  // of migration-feature
   // path.join(USER_DATA_PATH, `${MIGRATION_FILE_NAME_PREFIX}${INTEGRITY_VERSION_NUMBER}`),
 ]
 

package.json

@@ -7,10 +7,12 @@
     "url": "git+https://github.com/h-be/acorn.git"
   },
   "scripts": {
-    "install-deps": "npm install && npm run web-install && npm run electron-install && npm run electron-tsc",
+    "install-deps": "npm install && npm run web-install && npm run zod-models-install && npm run electron-install && npm run electron-tsc",
     "dev": "pm2-dev pm2.config.js",
     "user-data-reset": "rm -rf user-data && mkdir user-data",
     "web-install": "cd web && npm install",
+    "zod-models-install": "cd zod-models && npm install",
+    "zod-models-build": "cd zod-models && npm run build",
     "web": "cd web && WEB_PORT=8081 ADMIN_WS_PORT=1101 APP_WS_PORT=8101 npx webpack-dev-server --config webpack.dev.js",
     "web2": "cd web && WEB_PORT=8082 ADMIN_WS_PORT=1102 APP_WS_PORT=8102 npx webpack-dev-server --config webpack.dev.js",
     "web3": "cd web && WEB_PORT=8083 ADMIN_WS_PORT=1103 APP_WS_PORT=8103 npx webpack-dev-server --config webpack.dev.js",

web/package-lock.json

@@ -79,7 +79,9 @@
     "reselect": "^4.1.5",
     "resolve-url-loader": "^5.0.0",
     "type-fest": "^0.17.0",
-    "use-onclickoutside": "^0.3.1"
+    "use-onclickoutside": "^0.3.1",
+    "zod": "^3.21.4",
+    "zod-models": "file:../zod-models"
   },
   "scripts": {
     "storybook": "storybook dev -p 6006",

web/package.json

@@ -364,6 +364,7 @@ const EvDetails: React.FC<EvDetailsProps> = ({
                       projectId={projectId}
                       onClose={() => setEditAssignees(false)}
                       activeAgentPubKey={activeAgentPubKey}
+                      profilesPresent={presentMembers}
                       people={people}
                       outcomeActionHash={outcomeActionHash}
                       createOutcomeMember={createOutcomeMember}

web/src/components/ExpandedViewMode/EVMiddleColumn/TabContent/EvDetails/EvDetails.component.tsx

@@ -1,5 +1,6 @@
 .footer {
   max-height: 48px;
+  z-index: 3;
 }
 
 /* Buttom Left Panel */

web/src/components/Footer/Footer.scss

@@ -49,11 +49,11 @@ const MapViewingOptions: React.FC<MapViewingOptionsProps> = ({
           selectedOptionId={selectedLayeringAlgo}
           options={[
             {
-              id: LayeringAlgorithm.LongestPath,
+              id: "LongestPath",
               text: 'Minimum Height',
             },
             {
-              id: LayeringAlgorithm.CoffmanGraham,
+              id: "CoffmanGraham",
               text: 'Constrained Width',
             },
           ]}