fix: improve quartzOrganizations reducer compatibility with quartz (#5108)

Author: wdoconnell

src/identity/quartzOrganizations/actions/creators/index.ts

@@ -24,12 +24,8 @@ export const setQuartzOrganizationsStatus = (status: RemoteDataState) =>
     status: status,
   } as const)
 
-export const setQuartzDefaultOrg = (
-  oldDefaultOrgId: string,
-  newDefaultOrgId: string
-) =>
+export const setQuartzDefaultOrg = (newDefaultOrgId: string) =>
   ({
     type: SET_QUARTZ_DEFAULT_ORG,
-    oldDefaultOrgId: oldDefaultOrgId,
     newDefaultOrgId: newDefaultOrgId,
   } as const)

src/identity/quartzOrganizations/actions/thunks/index.ts

@@ -19,6 +19,13 @@ import {OrganizationSummaries} from 'src/client/unityRoutes'
 type Actions = QuartzOrganizationActions | PublishNotificationAction
 type DefaultOrg = OrganizationSummaries[number]
 
+class OrgNotFoundError extends Error {
+  constructor(message) {
+    super(message)
+    this.name = 'DefaultOrgNotFoundError'
+  }
+}
+
 // Error Reporting
 import {reportErrorThroughHoneyBadger} from 'src/shared/utils/errors'
 
@@ -31,7 +38,6 @@ export const getQuartzOrganizationsThunk = () => async (
     const quartzOrganizations = await fetchQuartzOrgs()
 
     dispatch(setQuartzOrganizations(quartzOrganizations))
-    dispatch(setQuartzOrganizationsStatus(RemoteDataState.Done))
   } catch (err) {
     dispatch(setQuartzOrganizationsStatus(RemoteDataState.Error))
 
@@ -42,18 +48,32 @@ export const getQuartzOrganizationsThunk = () => async (
   }
 }
 
-export const updateDefaultOrgThunk = (
-  oldDefaultOrg: DefaultOrg,
-  newDefaultOrg: DefaultOrg
-) => async (dispatch: Dispatch<Actions>, getState: GetState) => {
+export const updateDefaultOrgThunk = (newDefaultOrg: DefaultOrg) => async (
+  dispatch: Dispatch<Actions>,
+  getState: GetState
+) => {
   try {
     dispatch(setQuartzOrganizationsStatus(RemoteDataState.Loading))
 
     await updateDefaultQuartzOrg(newDefaultOrg.id)
 
-    dispatch(setQuartzDefaultOrg(oldDefaultOrg.id, newDefaultOrg.id))
+    dispatch(setQuartzDefaultOrg(newDefaultOrg.id))
+
+    const state = getState()
+    const orgStatus = state.identity.currentIdentity.status
+
+    if (orgStatus === RemoteDataState.Error) {
+      const defaultOrgErrMsg =
+        'quartzOrganizations state does not contain requested default organization'
 
-    dispatch(setQuartzOrganizationsStatus(RemoteDataState.Done))
+      reportErrorThroughHoneyBadger(new OrgNotFoundError(defaultOrgErrMsg), {
+        name: defaultOrgErrMsg,
+        context: {
+          org: newDefaultOrg,
+          state: getState(),
+        },
+      })
+    }
   } catch (err) {
     dispatch(setQuartzOrganizationsStatus(RemoteDataState.Error))
 

src/identity/quartzOrganizations/reducers/index.ts

@@ -8,9 +8,11 @@ import {
 import {emptyOrg} from 'src/identity/components/GlobalHeader/DefaultEntities'
 import produce from 'immer'
 
-import {OrganizationSummaries} from 'src/client/unityRoutes'
+// Types
 
-const initialState = {
+import {OrganizationSummaries} from 'src/client/unityRoutes'
+import {RemoteDataState} from 'src/types'
+export const initialState = {
   orgs: [emptyOrg] as OrganizationSummaries,
 } as QuartzOrganizations
 
@@ -19,27 +21,46 @@ export default (state = initialState, action: Actions): QuartzOrganizations =>
     switch (action.type) {
       case SET_QUARTZ_ORGANIZATIONS: {
         draftState.orgs = action.quartzOrganizations
+        draftState.status = RemoteDataState.Done
+
         return
       }
+
       case SET_QUARTZ_ORGANIZATIONS_STATUS: {
         draftState.status = action.status
         return
       }
 
       case SET_QUARTZ_DEFAULT_ORG: {
-        const {oldDefaultOrgId, newDefaultOrgId} = action
-
-        if (oldDefaultOrgId !== newDefaultOrgId) {
-          draftState.orgs.forEach(org => {
-            if (org.id === oldDefaultOrgId) {
-              org.isDefault = false
-            }
-
-            if (org.id === newDefaultOrgId) {
-              org.isDefault = true
-            }
-          })
+        // No existing default org is acceptable; oldDefaultOrg may be undefined.
+        const oldDefaultOrg = draftState.orgs.find(
+          org => org.isDefault === true
+        )
+        const oldDefaultOrgId = oldDefaultOrg?.id
+        const {newDefaultOrgId} = action
+
+        if (oldDefaultOrgId === newDefaultOrgId) {
+          return
         }
+
+        let newIdCount = 0
+
+        draftState.orgs.forEach(org => {
+          if (org.id === oldDefaultOrgId) {
+            org.isDefault = false
+          }
+          if (org.id === newDefaultOrgId) {
+            org.isDefault = true
+            newIdCount++
+          }
+        })
+
+        if (newIdCount !== 1) {
+          draftState.status = RemoteDataState.Error
+          return
+        }
+
+        draftState.status = RemoteDataState.Done
         return
       }
     }