add zod schemas to validate migration data parsing logic

.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.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/src/components/ExpandedViewMode/EVMiddleColumn/TabContent/EvDetails/EvDetails.component.tsx

@@ -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/Footer/Footer.scss

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

web/src/components/MapViewingOptions/MapViewingOptions.tsx

@@ -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',
             },
           ]}

web/src/components/MigrationProgress/MigrationProgress.scss

@@ -6,7 +6,7 @@
   position: fixed;
   top: 0;
   background: var(--bg-color-canvas);
-  z-index: 10000;
+  z-index: 2;
 }
 
 .run-update-screen {

web/src/components/PeoplePicker/PeoplePicker.tsx

@@ -15,6 +15,7 @@ export type PeoplePickerProps = {
     isOutcomeMember: boolean
     outcomeMemberActionHash: ActionHashB64
   })[]
+  profilesPresent: AgentPubKeyB64[]
   outcomeActionHash: ActionHashB64
   createOutcomeMember: (
     outcomeActionHash: ActionHashB64,
@@ -27,6 +28,7 @@ export type PeoplePickerProps = {
 const PeoplePicker: React.FC<PeoplePickerProps> = ({
   activeAgentPubKey,
   people,
+  profilesPresent,
   outcomeActionHash,
   createOutcomeMember,
   deleteOutcomeMember,
@@ -97,6 +99,12 @@ const PeoplePicker: React.FC<PeoplePickerProps> = ({
                   activeAgentPubKey
                 )
             }
+            // check if the profile is in the
+            // list of present profiles
+            // (presence being "has the project open presently")
+            const isProfilePresent = !!profilesPresent.find(
+              (presentprofile) => person.agentPubKey === presentprofile
+            )
             return (
               <li
                 key={index}
@@ -109,8 +117,9 @@ const PeoplePicker: React.FC<PeoplePickerProps> = ({
                   avatarUrl={person.avatarUrl}
                   imported={person.isImported}
                   size="medium"
-                  withStatus
                   selfAssignedStatus={person.status}
+                  disconnected={!isProfilePresent}
+                  withStatus={isProfilePresent}
                 />
                 <div className="person-name-handle-wrapper">
                   <span className="person-name">

web/src/components/ProjectSettingsModal/ProjectSettingsModal.component.tsx

@@ -117,7 +117,7 @@ function EditProjectForm({
 export default function ProjectSettingsModal({
   showModal,
   onClose,
-  project = {} as WithActionHash<ProjectMeta>,
+  project,
   updateProjectMeta,
   openInviteMembersModal,
   cellIdString,

web/src/components/UpdateModal/UpdateModal.tsx

@@ -32,6 +32,7 @@ const UpdateModal: React.FC<UpdateModalProps> = ({
 }) => {
   const history = useHistory()
   const runUpdate = () => {
+    onClose()
     history.push('/run-update')
   }
 

web/src/drawing/layoutFormula.ts

@@ -97,9 +97,9 @@ function layoutForGraph(
       // TODO: add back in when we figure out how to not have it crash
       // case LayeringAlgorithm.Simplex:
       // return simplex
-      case LayeringAlgorithm.LongestPath:
+      case "LongestPath":
         return longestPath
-      case LayeringAlgorithm.CoffmanGraham:
+      case "CoffmanGraham":
         return coffmanGraham
       default:
         return coffmanGraham

web/src/hooks/useFinishMigrationChecker.ts

@@ -26,6 +26,7 @@ export default function useFinishMigrationChecker(): {
       }
       setHasChecked(true)
     } else {
+      // mock here if we want to test
       setHasChecked(true)
     }
   }

web/src/hooks/useVersionChecker.ts

@@ -98,13 +98,15 @@ export default function useVersionChecker(
   isTest?: boolean
 ): {
   currentVersion: string
+  integrityVersion: number
   platform: string
   arch: string
   newReleaseVersion: string
   releaseNotes: string
   sizeForPlatform: string
 } {
   const [currentVersion, setCurrentVersion] = useState('')
+  const [integrityVersion, setIntegrityVersion] = useState<number>(null)
   const [platform, setPlatform] = useState('')
   const [arch, setArch] = useState('')
   const [newReleaseVersion, setNewReleaseVersion] = useState('')
@@ -119,10 +121,12 @@ export default function useVersionChecker(
         .then(
           (currentVersionInfo: {
             version: string
+            integrityVersion: number
             platform: string
             arch: string
           }) => {
             setCurrentVersion(currentVersionInfo.version)
+            setIntegrityVersion(currentVersionInfo.integrityVersion)
             setPlatform(currentVersionInfo.platform)
             setArch(currentVersionInfo.arch)
           }
@@ -134,7 +138,7 @@ export default function useVersionChecker(
   // to see if there is any new update available for the app
   useEffect(() => {
     if (isTest) {
-      setNewReleaseVersion('v1.0.0')
+      setNewReleaseVersion('v12.0.0')
       setReleaseNotes('release notes')
       setSizeForPlatform('1mb')
       return
@@ -160,6 +164,7 @@ export default function useVersionChecker(
   return newReleaseVersion
     ? {
         currentVersion,
+        integrityVersion,
         platform,
         arch,
         newReleaseVersion,