bug fixes

Author: Connoropolous

web/src/drawing/drawOutcome/computeArguments/argsForDrawStatement.ts

@@ -37,11 +37,13 @@ export const argsForDrawStatement = ({
 
   const width = outcomeWidth - 2 * outcomePaddingHorizontal
 
+  const statement = outcome ? outcome.content : ''
+
   // if the card is rendering either assignees, tags, or progress bar:
   const isRenderingOtherMetadata =
-    outcome.members?.length > 0 ||
-    outcome.tags?.length > 0 ||
-    outcome.computedAchievementStatus?.simple ===
+    outcome?.members?.length > 0 ||
+    outcome?.tags?.length > 0 ||
+    outcome?.computedAchievementStatus?.simple ===
       ComputedSimpleAchievementStatus.PartiallyAchieved
 
   const args: Parameters<typeof drawStatement>[0] = {
@@ -52,7 +54,7 @@ export const argsForDrawStatement = ({
     yPosition,
     zoomLevel,
     width,
-    statement: outcome.content,
+    statement,
     color: STATEMENT_FONT_COLOR,
     ctx,
   }

web/src/redux/persistent/projects/realtime-info-signal/actions.ts

@@ -1,3 +1,5 @@
+import { CellIdString } from "../../../../types/shared"
+
 const SEND_REALTIME_INFO = 'SEND_REALTIME_INFO'
 const SEND_EXIT_PROJECT_SIGNAL = 'SEND_EXIT_PROJECT_SIGNAL'
 
@@ -8,10 +10,10 @@ function triggerRealtimeInfoSignal() {
   }
 }
 
-function sendExitProjectSignal() {
+function sendExitProjectSignal(projectId: CellIdString) {
   return {
     type: SEND_EXIT_PROJECT_SIGNAL,
-    payload: {},
+    payload: projectId,
   }
 }
 

web/src/redux/persistent/projects/realtime-info-signal/middleware.ts

@@ -16,6 +16,7 @@ import ProjectsZomeApi from '../../../../api/projectsApi'
 import { getAppWs } from '../../../../hcWebsockets'
 import { cellIdFromString } from '../../../../utils'
 import { RootState } from '../../../reducer'
+import { CellIdString } from '../../../../types/shared'
 
 const isOneOfRealtimeInfoAffectingActions = (action) => {
   const { type } = action
@@ -30,7 +31,7 @@ const isOneOfRealtimeInfoAffectingActions = (action) => {
   )
 }
 
-const isProjectExitAction = (action) => {
+const isProjectExitAction = (action: { type: string }) => {
   const { type } = action
   return type === SEND_EXIT_PROJECT_SIGNAL
 }
@@ -39,28 +40,30 @@ 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)
       let result = next(action)
       if (appWebsocket.client.socket.readyState === appWebsocket.client.socket.OPEN) {
         let state: RootState = store.getState()
         const payload = getRealtimeInfo(state)
-        const cellId = cellIdFromString(payload.projectId)
-        await projectsZomeApi.realtimeInfoSignal.send(cellId, payload)
+        // there is a chance that the project has been exited
+        // and thus this need not be fired
+        if (payload.projectId) {
+          const cellId = cellIdFromString(payload.projectId)
+          await projectsZomeApi.realtimeInfoSignal.send(cellId, payload)
+        }
       }
       return result
     } else if (isProjectExitAction(action)) {
       const appWebsocket = await getAppWs()
       const projectsZomeApi = new ProjectsZomeApi(appWebsocket)
-      let state: RootState = store.getState()
-      const cellIdString = state.ui.activeProject
       const payload = {
         projectId: '',
         outcomeBeingEdited: null,
         outcomeExpandedView: null,
       }
+      const cellIdString: CellIdString = action.payload
       const cellId = cellIdFromString(cellIdString)
       // TODO: catch and log error, but don't
       // await this call

web/src/routes/ProjectView/PriorityView/PriorityUniversal/PriorityUniversal.component.tsx

@@ -315,7 +315,7 @@ const PriorityUniversal: React.FC<PriorityUniversalProps> = ({
   // pending->true status
   const [pendingList, setPendingList] = useState([])
   // a little function to help us with reordering the result
-  const reorder = (list, startIndex, endIndex) => {
+  const reorder = (list: ActionHashB64[], startIndex: number, endIndex: number) => {
     const result = Array.from(list)
     const [removed] = result.splice(startIndex, 1)
     result.splice(endIndex, 0, removed)

web/src/routes/ProjectView/ProjectView.connector.tsx

@@ -62,7 +62,7 @@ function mapDispatchToProps(
       dispatch(setActiveEntryPoints(entryPointActionHashes)),
     resetProjectView: () => {
       // send this signal so peers know you left project
-      dispatch(sendExitProjectSignal())
+      dispatch(sendExitProjectSignal(cellIdString))
       dispatch(closeExpandedView())
       dispatch(closeOutcomeForm())
       dispatch(unselectAll())