fix importing

Author: Connoropolous

happ/workdir/dna/profiles/dna.yaml

@@ -3,7 +3,7 @@ manifest_version: "1"
 name: profiles-dna
 integrity:
   origin_time: 1654092432130000
-  uid: "0001"
+  uid: "0002"
   properties: ~
   zomes:
     - name: profiles_integrity

happ/workdir/profiles.dna

@@ -10,7 +10,7 @@ import ProfilesZomeApi from '../api/profilesApi'
 import { getAppWs } from '../hcWebsockets'
 import { cellIdFromString } from '../utils'
 import { createTag } from '../redux/persistent/projects/tags/actions'
-import { Outcome } from '../types'
+import { Outcome, Tag } from '../types'
 import { WireRecord } from '../api/hdkCrud'
 import { ActionHashB64 } from '../types/shared'
 
@@ -45,43 +45,89 @@ export default async function importAllProjectData(
       ...old,
       isImported: true,
     }
-    const importedProfile = await profilesZomeApi.profile.createImportedProfile(profilesCellId, clone)
-    await dispatch(
-      createImportedProfile(profilesCellIdString, importedProfile)
+    const importedProfile = await profilesZomeApi.profile.createImportedProfile(
+      profilesCellId,
+      clone
     )
+    await dispatch(createImportedProfile(profilesCellIdString, importedProfile))
+  }
+
+  // do things with no data references first
+
+  // TAGS
+  // do tags because outcomes reference them
+  const tagActionHashMap: {
+    [oldActionHash: ActionHashB64]: ActionHashB64
+  } = {}
+  // TAGS
+  // only v1.0.0-alpha and beyond have tags
+  for (let address of Object.keys(projectData.tags)) {
+    const old = projectData.tags[address]
+    const clone = {
+      ...old,
+    }
+    // an assigned field
+    // v1.0.4-alpha
+    delete clone.actionHash
+    // v1.0.0-alpha
+    delete clone.headerHash
+
+    let newTag: WireRecord<Tag>
+    try {
+      newTag = await projectsZomeApi.tag.create(projectsCellId, clone)
+      dispatch(createTag(projectsCellIdString, newTag))
+    } catch (e) {
+      console.log('createTag error', e)
+      throw e
+    }
+
+    // add this new tag address to the tagActionHashMap
+    // to keep of which new addresses map to which old addresses
+    let oldTagActionHash: ActionHashB64
+    // as of v1.0.4-alpha
+    if (old.actionHash) oldTagActionHash = old.actionHash
+    // pre 1.0.4-alpha (1.x series)
+    else if (old.headerHash) oldTagActionHash = old.headerHash
+
+    tagActionHashMap[oldTagActionHash] = newTag.actionHash
   }
 
   // OUTCOMES
-  const outcomeActionHashMap: { [oldActionHash: ActionHashB64]: ActionHashB64 } = {}
-  // do the outcomes second, since pretty much everything else
+  const outcomeActionHashMap: {
+    [oldActionHash: ActionHashB64]: ActionHashB64
+  } = {}
+  // do the outcomes third, since pretty much everything else
   // is sub-data to the outcomes
   for (let outcomeActionHash of Object.keys(projectData.outcomes)) {
     const oldOutcome = projectData.outcomes[outcomeActionHash]
     const clone = {
       ...oldOutcome,
+      // make sure tag references hold up through the migration
+      tags: oldOutcome.tags.map(
+        (oldTagHash: ActionHashB64) => tagActionHashMap[oldTagHash]
+      ),
       isImported: true,
     }
-    // v0.5.4-alpha
+    // as of v1.0.4-alpha
     delete clone.actionHash
-    // pre v0.5.3-alpha and prior
-    delete clone.address
+    // as of v0.5.4-alpha
+    delete clone.headerHash
 
     let newOutcome: WireRecord<Outcome>
     try {
       newOutcome = await projectsZomeApi.outcome.create(projectsCellId, clone)
-      dispatch(
-        createOutcome(projectsCellIdString, newOutcome)
-      )
+      dispatch(createOutcome(projectsCellIdString, newOutcome))
     } catch (e) {
       console.log('createOutcome error', e)
       throw e
     }
     // add this new outcome address to the outcomeActionHashMap
     // to keep of which new addresses map to which old addresses
     let oldOutcomeActionHash: ActionHashB64
-    // v0.5.4-alpha
+    // as of v1.0.4-alpha
     if (oldOutcome.actionHash) oldOutcomeActionHash = oldOutcome.actionHash
-    // pre v0.5.3-alpha and prior
+    // as of v0.5.4-alpha
+    if (oldOutcome.headerHash) oldOutcomeActionHash = oldOutcome.headerHash
     else if (oldOutcome.address) oldOutcomeActionHash = oldOutcome.address
 
     outcomeActionHashMap[oldOutcomeActionHash] = newOutcome.actionHash
@@ -90,30 +136,43 @@ export default async function importAllProjectData(
   // CONNECTIONS
   for (let address of Object.keys(projectData.connections)) {
     const old = projectData.connections[address]
-    console.log(old)
+    // v1.0.4-alpha: parentActionHash
+    // v1.0.3-alpha and prior: parentHeaderHash
+    const newParentOutcomeActionHash = old.parentHeaderHash
+      ? outcomeActionHashMap[old.parentHeaderHash]
+      : outcomeActionHashMap[old.parentActionHash]
+    // v1.0.4-alpha: childActionHash
+    // v1.0.3-alpha and prior: childHeaderHash
+    const newChildOutcomeActionHash = old.childHeaderHash
+      ? outcomeActionHashMap[old.childHeaderHash]
+      : outcomeActionHashMap[old.childActionHash]
     const clone = {
       ...old,
-      parentActionHash: outcomeActionHashMap[old.parentActionHash],
-      childActionHash: outcomeActionHashMap[old.childActionHash],
+      parentActionHash: newParentOutcomeActionHash,
+      childActionHash: newChildOutcomeActionHash,
       // randomizer used to be a float, but is now an int
       randomizer: Number(old.randomizer.toFixed()),
       isImported: true,
     }
+    // pre v1.0.4-alpha
+    delete clone.parentHeaderHash
+    delete clone.childHeaderHash
     // an assigned field
-    // v0.5.4-alpha
+    // as of v1.0.4-alpha
     delete clone.actionHash
-    // pre v0.5.3-alpha and prior
-    delete clone.address
+    // v0.5.4-alpha
+    delete clone.headerHash
 
     if (!clone.childActionHash || !clone.parentActionHash) {
       console.log('weird, invalid connection:', clone)
       continue
     }
     try {
-      const createdConnection = await projectsZomeApi.connection.create(projectsCellId, clone)
-      dispatch(
-        createConnection(projectsCellIdString, createdConnection)
+      const createdConnection = await projectsZomeApi.connection.create(
+        projectsCellId,
+        clone
       )
+      dispatch(createConnection(projectsCellIdString, createdConnection))
     } catch (e) {
       console.log('createConnection error', e)
       throw e
@@ -123,26 +182,34 @@ export default async function importAllProjectData(
   // OUTCOME MEMBERS
   for (let address of Object.keys(projectData.outcomeMembers)) {
     const old = projectData.outcomeMembers[address]
+    // v1.0.4-alpha: outcomeActionHash
+    // v1.0.3-alpha and prior: outcomeHeaderHash
+    const newOutcomeActionHash = old.outcomeHeaderHash
+      ? outcomeActionHashMap[old.outcomeHeaderHash]
+      : outcomeActionHashMap[old.outcomeActionHash]
     const clone = {
       ...old,
-      outcomeActionHash: outcomeActionHashMap[old.outcomeActionHash],
+      outcomeActionHash: newOutcomeActionHash,
       isImported: true,
     }
+    // pre v1.0.4-alpha
+    delete clone.outcomeHeaderHash
     // an assigned field
-    // v0.5.4-alpha
+    // v1.0.4-alpha
     delete clone.actionHash
-    // pre v0.5.3-alpha and prior
-    delete clone.address
+    // v0.5.4-alpha
+    delete clone.headerHash
 
     if (!clone.outcomeActionHash) {
       console.log('weird, invalid outcomeMember:', clone)
       continue
     }
     try {
-      const createdOutcomeMember = await projectsZomeApi.outcomeMember.create(projectsCellId, clone)
-      dispatch(
-        createOutcomeMember(projectsCellIdString, createdOutcomeMember)
+      const createdOutcomeMember = await projectsZomeApi.outcomeMember.create(
+        projectsCellId,
+        clone
       )
+      dispatch(createOutcomeMember(projectsCellIdString, createdOutcomeMember))
     } catch (e) {
       console.log('createOutcomeMember error', e)
       throw e
@@ -152,23 +219,33 @@ export default async function importAllProjectData(
   // OUTCOME COMMENTS
   for (let address of Object.keys(projectData.outcomeComments)) {
     const old = projectData.outcomeComments[address]
+    // v1.0.4-alpha: outcomeActionHash
+    // v1.0.3-alpha and prior: outcomeHeaderHash
+    const newOutcomeActionHash = old.outcomeHeaderHash
+      ? outcomeActionHashMap[old.outcomeHeaderHash]
+      : outcomeActionHashMap[old.outcomeActionHash]
     const clone = {
       ...old,
-      outcomeActionHash: outcomeActionHashMap[old.outcomeActionHash],
+      outcomeActionHash: newOutcomeActionHash,
       isImported: true,
     }
+    // pre v1.0.4-alpha
+    delete clone.outcomeHeaderHash
     // an assigned field
-    // v0.5.4-alpha
+    // v1.0.4-alpha
     delete clone.actionHash
-    // pre v0.5.3-alpha and prior
-    delete clone.address
+    // v0.5.4-alpha
+    delete clone.headerHash
 
-    if (!clone.outcomeActionHash) {
+    if (!clone.outcomeActionHash && !clone.outcomeHeaderHash) {
       console.log('weird, invalid outcomeComment:', clone)
       continue
     }
     try {
-      const createdOutcomeComment = await projectsZomeApi.outcomeComment.create(projectsCellId, clone)
+      const createdOutcomeComment = await projectsZomeApi.outcomeComment.create(
+        projectsCellId,
+        clone
+      )
       dispatch(
         createOutcomeComment(projectsCellIdString, createdOutcomeComment)
       )
@@ -181,26 +258,34 @@ export default async function importAllProjectData(
   // OUTCOME VOTES
   for (let address of Object.keys(projectData.outcomeVotes)) {
     const old = projectData.outcomeVotes[address]
+    // v1.0.4-alpha: outcomeActionHash
+    // v1.0.3-alpha and prior: outcomeHeaderHash
+    const newOutcomeActionHash = old.outcomeHeaderHash
+      ? outcomeActionHashMap[old.outcomeHeaderHash]
+      : outcomeActionHashMap[old.outcomeActionHash]
     const clone = {
       ...old,
-      outcomeActionHash: outcomeActionHashMap[old.outcomeActionHash],
+      outcomeActionHash: newOutcomeActionHash,
       isImported: true,
     }
+    // pre v1.0.4-alpha
+    delete clone.outcomeHeaderHash
     // an assigned field
-    // v0.5.4-alpha
+    // v1.0.4-alpha
     delete clone.actionHash
-    // pre v0.5.3-alpha and prior
-    delete clone.address
+    // v0.5.4-alpha
+    delete clone.headerHash
 
-    if (!clone.outcomeActionHash) {
+    if (!clone.outcomeActionHash && !clone.outcomeHeaderHash) {
       console.log('weird, invalid outcomeVote:', clone)
       continue
     }
     try {
-      const createdOutcomeVote = await projectsZomeApi.outcomeVote.create(projectsCellId, clone)
-      dispatch(
-        createOutcomeVote(projectsCellIdString, createdOutcomeVote)
+      const createdOutcomeVote = await projectsZomeApi.outcomeVote.create(
+        projectsCellId,
+        clone
       )
+      dispatch(createOutcomeVote(projectsCellIdString, createdOutcomeVote))
     } catch (e) {
       console.log('createOutcomeVote error', e)
       throw e
@@ -210,56 +295,40 @@ export default async function importAllProjectData(
   // ENTRY POINTS
   for (let address of Object.keys(projectData.entryPoints)) {
     const old = projectData.entryPoints[address]
+    // v1.0.4-alpha: outcomeActionHash
+    // v1.0.3-alpha and prior: outcomeHeaderHash
+    const newOutcomeActionHash = old.outcomeHeaderHash
+      ? outcomeActionHashMap[old.outcomeHeaderHash]
+      : outcomeActionHashMap[old.outcomeActionHash]
     const clone = {
       ...old,
-      outcomeActionHash: outcomeActionHashMap[old.outcomeActionHash],
+      outcomeActionHash: newOutcomeActionHash,
       isImported: true,
     }
+    // pre v1.0.4-alpha
+    delete clone.outcomeHeaderHash
     // an assigned field
-    // v0.5.4-alpha
+    // v1.0.4-alpha
     delete clone.actionHash
-    // pre v0.5.3-alpha and prior
-    delete clone.address
+    // v0.5.4-alpha
+    delete clone.headerHash
 
-    if (!clone.outcomeActionHash) {
+    if (!clone.outcomeActionHash && !clone.outcomeHeaderHash) {
       console.log('weird, invalid entryPoint:', clone)
       continue
     }
     try {
-      const createdEntryPoint = await projectsZomeApi.entryPoint.create(projectsCellId, clone)
-      dispatch(
-        createEntryPoint(projectsCellIdString, createdEntryPoint)
+      const createdEntryPoint = await projectsZomeApi.entryPoint.create(
+        projectsCellId,
+        clone
       )
+      dispatch(createEntryPoint(projectsCellIdString, createdEntryPoint))
     } catch (e) {
       console.log('createEntryPoint error', e)
       throw e
     }
   }
 
-  // TAGS
-  // only v1.0.0-alpha and beyond have tags
-  if (projectData.tags) {
-    for (let address of Object.keys(projectData.tags)) {
-      const old = projectData.tags[address]
-      const clone = {
-        ...old,
-      }
-      // an assigned field
-      // v1.0.0-alpha
-      delete clone.actionHash
-
-      try {
-        const createdTag = await projectsZomeApi.tag.create(projectsCellId, clone)
-        dispatch(
-          createTag(projectsCellIdString, createdTag)
-        )
-      } catch (e) {
-        console.log('createTag error', e)
-        throw e
-      }
-    }
-  }
-
   // return the list of old addresses mapped to new addresses
   return outcomeActionHashMap
 }

happ/workdir/profiles.happ

@@ -39,6 +39,7 @@ const isProjectExitAction = (action) => {
 const realtimeInfoWatcher = (store) => {
   // return the action handler middleware
   return (next) => async (action) => {
+    // console.log(store.getState())
     if (isOneOfRealtimeInfoAffectingActions(action)) {
       const appWebsocket = await getAppWs()
       const projectsZomeApi = new ProjectsZomeApi(appWebsocket)