enable backwards compatibility and separation between the export schema and the import one

Author: Connoropolous

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,
   }
 })
 

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/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/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)
           }
@@ -160,6 +164,7 @@ export default function useVersionChecker(
   return newReleaseVersion
     ? {
         currentVersion,
+        integrityVersion,
         platform,
         arch,
         newReleaseVersion,

web/src/migrating/export.ts

@@ -1,12 +1,11 @@
+import { AllProjectsDataExport, ProjectExportDataV1 } from 'zod-models'
 import constructProjectDataFetchers from '../api/projectDataFetchers'
 import ProjectsZomeApi from '../api/projectsApi'
 import { getAppWs } from '../hcWebsockets'
 import { RootState } from '../redux/reducer'
 import { ProjectMeta } from '../types'
 import { ActionHashB64, CellIdString } from '../types/shared'
 import { cellIdFromString } from '../utils'
-import { AllProjectsDataExport } from './model/allProjectsDataExport'
-import { ProjectExportDataV1 } from './model/projectExportData'
 
 export type ExportType = 'csv' | 'json'
 
@@ -31,7 +30,7 @@ export async function internalExportProjectsData(
   store: any,
   toVersion: string,
   onStep: (completed: number, toComplete: number) => void,
-  integrityVersion: string
+  integrityVersion: number
 ): Promise<AllProjectsDataExport | null> {
   const initialState: RootState = store.getState()
 
@@ -105,6 +104,7 @@ export async function internalExportProjectsData(
 export default async function exportProjectsData(
   store: any,
   toVersion: string,
+  fromIntegrityVersion: number,
   onStep: (completed: number, toComplete: number) => void
 ) {
   return internalExportProjectsData(
@@ -114,8 +114,7 @@ export default async function exportProjectsData(
     store,
     toVersion,
     onStep,
-    '8' // TODO: replace with INTEGRITY_VERSION_NUMBER
-    // INTEGRITY_VERSION_NUMBER
+    fromIntegrityVersion
   )
 }
 

web/src/migrating/import/cloneFunctions.ts

@@ -108,7 +108,7 @@ export const cloneProjectMeta = (
     // add a fallback layering algorithm in case the project has none
     layeringAlgorithm: old['layeringAlgorithm']
       ? old['layeringAlgorithm']
-      : LayeringAlgorithm.LongestPath,
+      : "LongestPath",
     createdAt: Date.now(),
     creatorAgentPubKey: agentAddress,
     passphrase: passphrase,

web/src/redux/ephemeral/animations/layout.ts

@@ -71,7 +71,7 @@ export default function performLayoutAnimation(
 
   const projectMeta = nextState.projects.projectMeta
   const layeringAlgorithm =
-    projectMeta[projectId]?.layeringAlgorithm || LayeringAlgorithm.LongestPath
+    projectMeta[projectId]?.layeringAlgorithm || "LongestPath"
   // this is our final destination layout
   // that we'll be animating to
   const newLayout = layoutFormula(

web/src/redux/ephemeral/map-view-settings/reducer.ts

@@ -16,7 +16,7 @@ export interface CollapsedOutcomesState {
 const defaultState: CollapsedOutcomesState = {
   hiddenAchievedOutcomes: [],
   hiddenSmallOutcomes: [],
-  selectedLayeringAlgo: LayeringAlgorithm.LongestPath,
+  selectedLayeringAlgo: "LongestPath",
 }
 
 export default function (

web/src/routes/App.connector.ts

@@ -74,7 +74,7 @@ function mapStateToProps(state: RootState): AppStateProps {
 
   const selectedLayeringAlgo = activeProjectMeta
     ? activeProjectMeta.layeringAlgorithm
-    : LayeringAlgorithm.LongestPath
+    : "LongestPath"
 
   return {
     profilesCellIdString,

web/src/routes/Dashboard/Dashboard.connector.ts

@@ -118,7 +118,7 @@ function mapDispatchToProps(dispatch): DashboardDispatchProps {
         creatorAgentPubKey: agentAddress,
         createdAt: Date.now(),
         isImported: false,
-        layeringAlgorithm: LayeringAlgorithm.CoffmanGraham,
+        layeringAlgorithm: "CoffmanGraham",
         topPriorityOutcomes: [],
         isMigrated: null,
       }