Merge pull request #319 from lightningrodlabs/bug-fixes-aug-7

Connoropolous · web-flow · commit 80e0dff8654d · 2023-08-07T16:26:18.000-07:00
bug fixes
diff --git a/electron/src/paths.ts b/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}`),
 ]
 
diff --git a/web/src/components/ExpandedViewMode/EVMiddleColumn/TabContent/EvDetails/EvDetails.component.tsx b/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}
diff --git a/web/src/components/Footer/Footer.scss b/web/src/components/Footer/Footer.scss
@@ -1,5 +1,6 @@
 .footer {
   max-height: 48px;
+  z-index: 3;
 }
 
 /* Buttom Left Panel */
diff --git a/web/src/components/MigrationProgress/MigrationProgress.scss b/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 {
diff --git a/web/src/components/PeoplePicker/PeoplePicker.tsx b/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">
diff --git a/web/src/components/ProjectSettingsModal/ProjectSettingsModal.component.tsx b/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,
diff --git a/web/src/components/UpdateModal/UpdateModal.tsx b/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')
   }
 
diff --git a/web/src/components/UpdatePromptModal/UpdatePromptModal.js b/web/src/components/UpdatePromptModal/UpdatePromptModal.js
diff --git a/web/src/components/UpdatePromptModal/UpdatePromptModal.scss b/web/src/components/UpdatePromptModal/UpdatePromptModal.scss
diff --git a/web/src/hooks/useFinishMigrationChecker.ts b/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)
     }
   }
diff --git a/web/src/hooks/useVersionChecker.ts b/web/src/hooks/useVersionChecker.ts
@@ -134,7 +134,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
diff --git a/web/src/migrating/export.ts b/web/src/migrating/export.ts
@@ -58,15 +58,30 @@ export async function internalExportProjectsData(
       store.dispatch,
       projectCellId
     )
-    await Promise.all([
-      projectDataFetchers.fetchProjectMeta(),
-      projectDataFetchers.fetchEntryPoints(),
-      projectDataFetchers.fetchOutcomeComments(),
-      projectDataFetchers.fetchOutcomeMembers(),
-      projectDataFetchers.fetchTags(),
-      projectDataFetchers.fetchOutcomes(),
-      projectDataFetchers.fetchConnections(),
-    ])
+    try {
+
+      await Promise.all([
+        projectDataFetchers.fetchProjectMeta(),
+        projectDataFetchers.fetchEntryPoints(),
+        projectDataFetchers.fetchOutcomeComments(),
+        projectDataFetchers.fetchOutcomeMembers(),
+        projectDataFetchers.fetchTags(),
+        projectDataFetchers.fetchOutcomes(),
+        projectDataFetchers.fetchConnections(),
+      ])
+    } catch (e) {
+      // fetch project meta will fail if the there IS no project meta
+      // and in that case we can just skip this project
+      // this solves for unsynced and uncanceled projects
+      if (e?.data?.data?.includes('no project meta exists')) {
+        // throw e
+        completedTracker++
+        onStep(completedTracker, projectCellIds.length)
+        continue
+      } else {
+        throw e
+      }
+    }
     // step 2: collect the data to be exported for each project
     const allDataFetchedState: RootState = store.getState()
     const exportProjectData = collectExportProjectDataFunction(
diff --git a/web/src/routes/App.component.tsx b/web/src/routes/App.component.tsx
@@ -121,7 +121,8 @@ const App: React.FC<AppProps> = ({
   )
   // custom hooks
   const updateVersionInfo = useVersionChecker()
-  // set true to test
+  // to do development testing of migration-feature
+  // uncomment the following line (and comment the one above)
   // const updateVersionInfo = useVersionChecker(true)
   const finishMigrationChecker = useFinishMigrationChecker()
   const { fileDownloaded, setFileDownloaded } = useFileDownloaded()
diff --git a/web/src/routes/VersionUpdateLeaving/VersionUpdateLeaving.tsx b/web/src/routes/VersionUpdateLeaving/VersionUpdateLeaving.tsx
@@ -2,11 +2,10 @@ import React, { useEffect, useState } from 'react'
 
 import './VersionUpdateLeaving.scss'
 
-import exportProjectsData, {
-  AllProjectsDataExport,
-} from '../../migrating/export'
+import exportProjectsData from '../../migrating/export'
 import { useStore } from 'react-redux'
 import MigrationProgress from '../../components/MigrationProgress/MigrationProgress'
+import { AllProjectsDataExport } from 'zod-models'
 
 const checkIfExportNeeded = (currentVersion: string, toVersion: string) => {
   // compare
@@ -137,7 +136,13 @@ const VersionUpdateLeaving: React.FC<VersionUpdateLeavingProps> = ({
           updateVersionInfo.newReleaseVersion
         )
       ) {
-        runExport().then(controlDownloadNextVersion)
+        runExport().then(controlDownloadNextVersion).catch((e) => {
+          console.error('error running export', e)
+          setTitle('An unexpected error occurred.')
+          const message = 'You may be able to recover by quitting and restarting Acorn. Please report this issue and provide the following error to support: ' + JSON.stringify(e)
+          // throw new Error(message)
+          setStatus(message)
+        })
       } else {
         controlDownloadNextVersion()
       }
diff --git a/web/src/utils.ts b/web/src/utils.ts
@@ -1,6 +1,6 @@
 import { HoloHash, CellId } from '@holochain/client'
-// import BufferAll from 'buffer/'
-// const Buffer = BufferAll.Buffer
+import BufferAll from 'buffer/'
+const Buffer = BufferAll.Buffer
 
 export function hashToString(hash: HoloHash) {
   // nodejs

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ const PREV_VER_USER_DATA_MIGRATION_FILE_PATHS = [`
`31`	`31`	`// Acorn 6`
`32`	`32`	path.join(USER_DATA_PATH, `${MIGRATION_FILE_NAME_PREFIX}9`),
`33`	`33`	`// uncomment the below line for development testing`
	`34`	`+ // of migration-feature`
`34`	`35`	// path.join(USER_DATA_PATH, `${MIGRATION_FILE_NAME_PREFIX}${INTEGRITY_VERSION_NUMBER}`),
`35`	`36`	`]`
`36`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`.footer {`
`2`	`2`	`max-height: 48px;`
	`3`	`+ z-index: 3;`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`/* Buttom Left Panel */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`position: fixed;`
`7`	`7`	`top: 0;`
`8`	`8`	`background: var(--bg-color-canvas);`
`9`		`- z-index: 10000;`
	`9`	`+ z-index: 2;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`.run-update-screen {`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ const UpdateModal: React.FC<UpdateModalProps> = ({`
`32`	`32`	`}) => {`
`33`	`33`	`const history = useHistory()`
`34`	`34`	`const runUpdate = () => {`
	`35`	`+ onClose()`
`35`	`36`	`history.push('/run-update')`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ export default function useFinishMigrationChecker(): {`
`26`	`26`	`}`
`27`	`27`	`setHasChecked(true)`
`28`	`28`	`} else {`
	`29`	`+ // mock here if we want to test`
`29`	`30`	`setHasChecked(true)`
`30`	`31`	`}`
`31`	`32`	`}`