Merge pull request #1731 from deepfence/ui-errr-msg-retrieval

Error message retrieve from api response
deepfence · Nov 13, 2023 · 17a1ad9 · 17a1ad9
2 parents e6d5a5f + 77db7fa
commit 17a1ad9
Show file tree

Hide file tree

Showing 30 changed files with 155 additions and 86 deletions.
diff --git a/...ontend/apps/dashboard/src/components/scan-configure-forms/ComplianceScanConfigureForm.tsx b/...ontend/apps/dashboard/src/components/scan-configure-forms/ComplianceScanConfigureForm.tsx
@@ -24,7 +24,7 @@ import { TruncatedText } from '@/components/TruncatedText';
 import { ActionEnumType } from '@/features/postures/data-component/toggleControlApiAction';
 import { invalidateAllQueries, queries } from '@/queries';
 import { ComplianceScanNodeTypeEnum, isCloudNode, isCloudOrgNode } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 
 export const complianceType: {
@@ -138,9 +138,10 @@ export const scanPostureApiAction = async ({
         startComplianceScanResponse.error.response.status === 400 ||
         startComplianceScanResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(startComplianceScanResponse.error);
         return {
           success: false,
-          message: startComplianceScanResponse.error.message ?? '',
+          message,
         };
       } else if (startComplianceScanResponse.error.response.status === 403) {
         const message = await get403Message(startComplianceScanResponse.error);
@@ -181,9 +182,10 @@ export const scanPostureApiAction = async ({
         scheduleResponse.error.response.status === 400 ||
         scheduleResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(scheduleResponse.error);
         return {
           success: false,
-          message: scheduleResponse.error.message ?? '',
+          message,
         };
       } else if (scheduleResponse.error.response.status === 403) {
         const message = await get403Message(scheduleResponse.error);

diff --git a/..._frontend/apps/dashboard/src/components/scan-configure-forms/MalwareScanConfigureForm.tsx b/..._frontend/apps/dashboard/src/components/scan-configure-forms/MalwareScanConfigureForm.tsx
@@ -13,7 +13,7 @@ import {
 import { ScheduleScanForm } from '@/components/scan-configure-forms/ScheduleScanForm';
 import { invalidateAllQueries } from '@/queries';
 import { MalwareScanNodeTypeEnum } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { isNodeTypeARegistryTagType, isNodeTypeARegistryType } from '@/utils/registry';
 
@@ -157,9 +157,10 @@ export const scanMalwareApiAction = async ({
         startMalwareScanResponse.error.response.status === 400 ||
         startMalwareScanResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(startMalwareScanResponse.error);
         return {
           success: false,
-          message: startMalwareScanResponse.error.message ?? '',
+          message,
         };
       } else if (startMalwareScanResponse.error.response.status === 403) {
         const message = await get403Message(startMalwareScanResponse.error);
@@ -199,9 +200,10 @@ export const scanMalwareApiAction = async ({
         scheduleResponse.error.response.status === 400 ||
         scheduleResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(scheduleResponse.error);
         return {
           success: false,
-          message: scheduleResponse.error.message ?? '',
+          message,
         };
       } else if (scheduleResponse.error.response.status === 403) {
         const message = await get403Message(scheduleResponse.error);

diff --git a/...e_frontend/apps/dashboard/src/components/scan-configure-forms/SecretScanConfigureForm.tsx b/...e_frontend/apps/dashboard/src/components/scan-configure-forms/SecretScanConfigureForm.tsx
@@ -13,7 +13,7 @@ import {
 import { ScheduleScanForm } from '@/components/scan-configure-forms/ScheduleScanForm';
 import { invalidateAllQueries } from '@/queries';
 import { SecretScanNodeTypeEnum } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { isNodeTypeARegistryTagType, isNodeTypeARegistryType } from '@/utils/registry';
 
@@ -156,9 +156,10 @@ export const scanSecretApiAction = async ({
         startSecretScanResponse.error.response.status === 400 ||
         startSecretScanResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(startSecretScanResponse.error);
         return {
           success: false,
-          message: startSecretScanResponse.error.message ?? '',
+          message,
         };
       } else if (startSecretScanResponse.error.response.status === 403) {
         const message = await get403Message(startSecretScanResponse.error);
@@ -196,9 +197,10 @@ export const scanSecretApiAction = async ({
         scheduleResponse.error.response.status === 400 ||
         scheduleResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(scheduleResponse.error);
         return {
           success: false,
-          message: scheduleResponse.error.message ?? '',
+          message,
         };
       } else if (scheduleResponse.error.response.status === 403) {
         const message = await get403Message(scheduleResponse.error);

diff --git a/deepfence_frontend/apps/dashboard/src/components/scan-configure-forms/StopScanForm.tsx b/deepfence_frontend/apps/dashboard/src/components/scan-configure-forms/StopScanForm.tsx
@@ -8,12 +8,11 @@ import {
   getSecretApiClient,
   getVulnerabilityApiClient,
 } from '@/api/api';
-import { ModelNodeIdentifierNodeTypeEnum } from '@/api/generated';
 import { ErrorStandardLineIcon } from '@/components/icons/common/ErrorStandardLine';
 import { SuccessModalContent } from '@/features/settings/components/SuccessModalContent';
 import { invalidateAllQueries } from '@/queries';
-import { ScanTypeEnum, VulnerabilityScanNodeTypeEnum } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { ScanTypeEnum } from '@/types/common';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 
 export enum ActionEnumType {
@@ -57,9 +56,10 @@ export const actionStopScan = async ({
   });
   if (!result.ok) {
     if (result.error.response.status === 400 || result.error.response.status === 409) {
+      const { message } = await getResponseErrors(result.error);
       return {
         success: false,
-        message: result.error.message ?? '',
+        message,
       };
     } else if (result.error.response.status === 403) {
       const message = await get403Message(result.error);

diff --git a/...end/apps/dashboard/src/components/scan-configure-forms/VulnerabilityScanConfigureForm.tsx b/...end/apps/dashboard/src/components/scan-configure-forms/VulnerabilityScanConfigureForm.tsx
@@ -14,7 +14,7 @@ import {
 import { ScheduleScanForm } from '@/components/scan-configure-forms/ScheduleScanForm';
 import { invalidateAllQueries } from '@/queries';
 import { VulnerabilityScanNodeTypeEnum } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { isNodeTypeARegistryTagType, isNodeTypeARegistryType } from '@/utils/registry';
 
@@ -237,9 +237,10 @@ export const scanVulnerabilityApiAction = async ({
         startVulnerabilityScanResponse.error.response.status === 400 ||
         startVulnerabilityScanResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(startVulnerabilityScanResponse.error);
         return {
           success: false,
-          message: startVulnerabilityScanResponse.error.message ?? '',
+          message,
         };
       } else if (startVulnerabilityScanResponse.error.response.status === 403) {
         const message = await get403Message(startVulnerabilityScanResponse.error);
@@ -277,9 +278,10 @@ export const scanVulnerabilityApiAction = async ({
         scheduleResponse.error.response.status === 400 ||
         scheduleResponse.error.response.status === 409
       ) {
+        const { message } = await getResponseErrors(scheduleResponse.error);
         return {
           success: false,
-          message: scheduleResponse.error.message ?? '',
+          message,
         };
       } else if (scheduleResponse.error.response.status === 403) {
         const message = await get403Message(scheduleResponse.error);

diff --git a/deepfence_frontend/apps/dashboard/src/features/auth/data-components/logoutAction.ts b/deepfence_frontend/apps/dashboard/src/features/auth/data-components/logoutAction.ts
@@ -1,6 +1,7 @@
 import { toast } from 'sonner';
 
 import { getAuthenticationApiClient } from '@/api/api';
+import { getResponseErrors } from '@/utils/403';
 import { apiWrapper, redirectToLogin } from '@/utils/api';
 import storage from '@/utils/storage';
 
@@ -12,12 +13,13 @@ const action = async (): Promise<{
   });
   const logoutResponse = await logoutApi();
   if (!logoutResponse.ok) {
+    const { message } = await getResponseErrors(logoutResponse.error);
     if (logoutResponse.error.response.status === 404) {
       return {
-        error: logoutResponse.error.message,
+        error: message,
       };
     }
-    toast.error(logoutResponse.error.message);
+    toast.error(message);
     throw logoutResponse.error;
   }
 

diff --git a/deepfence_frontend/apps/dashboard/src/features/integrations/pages/DownloadReport.tsx b/deepfence_frontend/apps/dashboard/src/features/integrations/pages/DownloadReport.tsx
@@ -14,7 +14,7 @@ import { IntegrationsIcon } from '@/components/sideNavigation/icons/Integrations
 import { ReportTable } from '@/features/integrations/components/ReportsTable';
 import { SuccessModalContent } from '@/features/settings/components/SuccessModalContent';
 import { invalidateAllQueries, queries } from '@/queries';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { download } from '@/utils/download';
 import { usePageNavigation } from '@/utils/usePageNavigation';
@@ -108,8 +108,9 @@ const action = async ({ request }: ActionFunctionArgs): Promise<ActionData> => {
     });
     if (!r.ok) {
       if (r.error.response.status === 400) {
+        const { message } = await getResponseErrors(r.error);
         return {
-          message: r.error.message ?? 'Error in deleting report',
+          message: message ?? 'Error in deleting report',
           success: false,
         };
       } else if (r.error.response.status === 403) {

diff --git a/deepfence_frontend/apps/dashboard/src/features/integrations/pages/IntegrationAdd.tsx b/deepfence_frontend/apps/dashboard/src/features/integrations/pages/IntegrationAdd.tsx
@@ -23,7 +23,7 @@ import { PlusIcon } from '@/components/icons/common/Plus';
 import { integrationTypeToNameMapping } from '@/features/integrations/pages/Integrations';
 import { SuccessModalContent } from '@/features/settings/components/SuccessModalContent';
 import { invalidateAllQueries, queries } from '@/queries';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { getArrayTypeValuesFromFormData } from '@/utils/formData';
 
@@ -378,8 +378,10 @@ const action = async ({ request, params }: ActionFunctionArgs): Promise<ActionDa
     });
     if (!r.ok) {
       if (r.error.response.status === 400) {
+        const { message } = await getResponseErrors(r.error);
         return {
-          message: r.error.message ?? 'Error in deleting integrations',
+          success: false,
+          message: message ?? 'Error in deleting integrations',
         };
       } else if (r.error.response.status === 403) {
         const message = await get403Message(r.error);

diff --git a/deepfence_frontend/apps/dashboard/src/features/malwares/pages/MalwareScanResults.tsx b/deepfence_frontend/apps/dashboard/src/features/malwares/pages/MalwareScanResults.tsx
@@ -77,7 +77,7 @@ import { MalwaresCompare } from '@/features/malwares/components/scan-results/Mal
 import { SuccessModalContent } from '@/features/settings/components/SuccessModalContent';
 import { invalidateAllQueries, queries } from '@/queries';
 import { MalwareSeverityType, ScanTypeEnum } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { formatMilliseconds } from '@/utils/date';
 import { abbreviateNumber } from '@/utils/number';
@@ -143,10 +143,11 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           action: actionType,
           success: false,
-          message: result.error.message ?? '',
+          message: message ?? '',
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);
@@ -193,10 +194,11 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           action: actionType,
           success: false,
-          message: result.error.message ?? '',
+          message: message ?? '',
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);

diff --git a/deepfence_frontend/apps/dashboard/src/features/malwares/pages/MalwareScans.tsx b/deepfence_frontend/apps/dashboard/src/features/malwares/pages/MalwareScans.tsx
@@ -59,7 +59,7 @@ import { IconMapForNodeType } from '@/features/onboard/components/IconMapForNode
 import { SuccessModalContent } from '@/features/settings/components/SuccessModalContent';
 import { invalidateAllQueries, queries } from '@/queries';
 import { ScanTypeEnum } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { formatMilliseconds } from '@/utils/date';
 import {
@@ -129,9 +129,10 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           success: false,
-          message: result.error.message ?? '',
+          message,
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);

diff --git a/...ce_frontend/apps/dashboard/src/features/postures/data-component/toggleControlApiAction.ts b/...ce_frontend/apps/dashboard/src/features/postures/data-component/toggleControlApiAction.ts
@@ -3,6 +3,7 @@ import { toast } from 'sonner';
 
 import { getControlsApiClient } from '@/api/api';
 import { invalidateAllQueries } from '@/queries';
+import { getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 
 export enum ActionEnumType {
@@ -40,7 +41,9 @@ export const toggleControlApiAction = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
-        toast.error(result.error.message);
+        const { message } = await getResponseErrors(result.error);
+        toast.error(message);
+        return null;
       }
     }
     toast.success(

diff --git a/deepfence_frontend/apps/dashboard/src/features/postures/pages/Accounts.tsx b/deepfence_frontend/apps/dashboard/src/features/postures/pages/Accounts.tsx
@@ -72,7 +72,7 @@ import {
   isCloudOrgNode,
   ScanTypeEnum,
 } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { formatPercentage } from '@/utils/number';
 import {
@@ -164,9 +164,10 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           success: false,
-          message: result.error.message,
+          message,
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);

diff --git a/deepfence_frontend/apps/dashboard/src/features/postures/pages/PostureCloudScanResults.tsx b/deepfence_frontend/apps/dashboard/src/features/postures/pages/PostureCloudScanResults.tsx
@@ -84,7 +84,7 @@ import {
   PostureSeverityType,
   ScanTypeEnum,
 } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { formatMilliseconds } from '@/utils/date';
 import { abbreviateNumber } from '@/utils/number';
@@ -155,10 +155,11 @@ const action = async ({
 
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           action: actionType,
           success: false,
-          message: result.error.message,
+          message: message,
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);

diff --git a/deepfence_frontend/apps/dashboard/src/features/postures/pages/PostureScanResults.tsx b/deepfence_frontend/apps/dashboard/src/features/postures/pages/PostureScanResults.tsx
@@ -83,7 +83,7 @@ import {
   PostureSeverityType,
   ScanTypeEnum,
 } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { formatMilliseconds } from '@/utils/date';
 import { abbreviateNumber } from '@/utils/number';
@@ -149,10 +149,11 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           action: actionType,
           success: false,
-          message: result.error.message,
+          message,
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);

diff --git a/deepfence_frontend/apps/dashboard/src/features/secrets/pages/SecretScanResults.tsx b/deepfence_frontend/apps/dashboard/src/features/secrets/pages/SecretScanResults.tsx
@@ -77,7 +77,7 @@ import { SecretsCompare } from '@/features/secrets/components/scan-results/Secre
 import { SuccessModalContent } from '@/features/settings/components/SuccessModalContent';
 import { invalidateAllQueries, queries } from '@/queries';
 import { ScanTypeEnum, SecretSeverityType } from '@/types/common';
-import { get403Message } from '@/utils/403';
+import { get403Message, getResponseErrors } from '@/utils/403';
 import { apiWrapper } from '@/utils/api';
 import { formatMilliseconds } from '@/utils/date';
 import { abbreviateNumber } from '@/utils/number';
@@ -144,10 +144,11 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           action: actionType,
           success: false,
-          message: result.error.message ?? '',
+          message,
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);
@@ -193,10 +194,11 @@ const action = async ({
     });
     if (!result.ok) {
       if (result.error.response.status === 400 || result.error.response.status === 409) {
+        const { message } = await getResponseErrors(result.error);
         return {
           action: actionType,
           success: false,
-          message: result.error.message ?? '',
+          message,
         };
       } else if (result.error.response.status === 403) {
         const message = await get403Message(result.error);