fix: fixes password out of date error messaging (#669)

* fix: fixes password out of date error messaging * fix: prod error fixes * fix: test fix
housingbayarea · Feb 28, 2024 · 61a6b7f · 61a6b7f
1 parent 652f5a1
commit 61a6b7f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/api/src/services/listing.service.ts b/api/src/services/listing.service.ts
@@ -81,7 +81,6 @@ views.base = {
     include: {
       unitTypes: true,
       unitAmiChartOverrides: true,
-      amiChart: true,
     },
   },
 };
@@ -132,6 +131,13 @@ views.details = {
 views.csv = {
   ...views.base,
   ...views.full,
+  units: {
+    include: {
+      unitTypes: true,
+      unitAmiChartOverrides: true,
+      amiChart: true,
+    },
+  },
   userAccounts: true,
 };
 

diff --git a/api/src/utilities/unit-utilities.ts b/api/src/utilities/unit-utilities.ts
@@ -136,7 +136,7 @@ export const generateHmiData = (
     ? [
         ...new Set(
           units
-            .filter((unit) => amiChartMap[unit.amiChart.id])
+            .filter((unit) => unit.amiChart && amiChartMap[unit.amiChart.id])
             .map((unit) => {
               let amiChart = amiChartMap[unit.amiChart.id];
               if (unit.unitAmiChartOverrides) {

diff --git a/api/test/unit/services/listing.service.spec.ts b/api/test/unit/services/listing.service.spec.ts
@@ -589,7 +589,6 @@ describe('Testing listing service', () => {
           include: {
             unitTypes: true,
             unitAmiChartOverrides: true,
-            amiChart: true,
           },
         },
       },
@@ -679,7 +678,6 @@ describe('Testing listing service', () => {
           include: {
             unitTypes: true,
             unitAmiChartOverrides: true,
-            amiChart: true,
           },
         },
       },
@@ -824,7 +822,6 @@ describe('Testing listing service', () => {
           include: {
             unitTypes: true,
             unitAmiChartOverrides: true,
-            amiChart: true,
           },
         },
       },
@@ -1122,7 +1119,6 @@ describe('Testing listing service', () => {
           include: {
             unitTypes: true,
             unitAmiChartOverrides: true,
-            amiChart: true,
           },
         },
       },
@@ -1516,7 +1512,6 @@ describe('Testing listing service', () => {
           include: {
             unitTypes: true,
             unitAmiChartOverrides: true,
-            amiChart: true,
           },
         },
       },

diff --git a/shared-helpers/src/auth/catchNetworkError.ts b/shared-helpers/src/auth/catchNetworkError.ts
@@ -27,7 +27,7 @@ export type NetworkErrorDetermineError = (
 export type NetworkErrorReset = () => void
 
 export enum NetworkErrorMessage {
-  PasswordOutdated = "passwordOutdated",
+  PasswordOutdated = "but password is no longer valid",
   MfaUnauthorized = "mfaUnauthorized",
 }
 
@@ -38,7 +38,7 @@ export const useCatchNetworkError = () => {
   const [networkError, setNetworkError] = useState<NetworkStatusContent>(null)
 
   const check401Error = (message: string, error: AxiosError) => {
-    if (message === NetworkErrorMessage.PasswordOutdated) {
+    if (message.includes(NetworkErrorMessage.PasswordOutdated)) {
       setNetworkError({
         title: t("authentication.signIn.passwordOutdated"),
         description: `${t(