Dry

geido · geido · commit b7c4c2f0071d · 2023-01-24T11:35:19.000+01:00
diff --git a/superset-frontend/src/dashboard/actions/dashboardInfo.ts b/superset-frontend/src/dashboard/actions/dashboardInfo.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { Dispatch } from 'redux';
-import { makeApi, CategoricalColorNamespace, t } from '@superset-ui/core';
+import { makeApi, CategoricalColorNamespace } from '@superset-ui/core';
 import { isString } from 'lodash';
-import { getClientErrorObject } from 'src/utils/getClientErrorObject';
+import { getErrorText } from 'src/utils/getClientErrorObject';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import {
   DashboardInfo,
@@ -169,18 +169,7 @@ export function saveFilterBarOrientation(orientation: FilterBarOrientation) {
         dispatch(onSave(lastModifiedTime));
       }
     } catch (errorObject) {
-      const { error, message } = await getClientErrorObject(errorObject);
-      let errorText = t('Sorry, an unknown error occurred.');
-
-      if (error) {
-        errorText = t(
-          'Sorry, there was an error saving this dashboard: %s',
-          error,
-        );
-      }
-      if (typeof message === 'string' && message === 'Forbidden') {
-        errorText = t('You do not have permission to edit this dashboard');
-      }
+      const errorText = await getErrorText(errorObject, 'dashboard');
       dispatch(addDangerToast(errorText));
       throw errorObject;
     }
@@ -214,18 +203,7 @@ export function saveCrossFiltersSetting(crossFiltersEnabled: boolean) {
         dispatch(onSave(lastModifiedTime));
       }
     } catch (errorObject) {
-      const { error, message } = await getClientErrorObject(errorObject);
-      let errorText = t('Sorry, an unknown error occurred.');
-
-      if (error) {
-        errorText = t(
-          'Sorry, there was an error saving this dashboard: %s',
-          error,
-        );
-      }
-      if (typeof message === 'string' && message === 'Forbidden') {
-        errorText = t('You do not have permission to edit this dashboard');
-      }
+      const errorText = await getErrorText(errorObject, 'dashboard');
       dispatch(addDangerToast(errorText));
       throw errorObject;
     }
diff --git a/superset-frontend/src/utils/getClientErrorObject.ts b/superset-frontend/src/utils/getClientErrorObject.ts
@@ -41,6 +41,14 @@ interface TimeoutError {
   timeout: number;
 }
 
+type ErrorType =
+  | SupersetClientResponse
+  | TimeoutError
+  | { response: Response }
+  | string;
+
+type ErrorTextSource = 'dashboard' | 'chart' | 'query' | 'dataset' | 'database';
+
 export function parseErrorJson(responseObject: JsonObject): ClientErrorObject {
   let error = { ...responseObject };
   // Backwards compatibility for old error renderers with the new error object
@@ -78,6 +86,29 @@ export function parseErrorJson(responseObject: JsonObject): ClientErrorObject {
   return { ...error, error: error.error }; // explicit ClientErrorObject
 }
 
+/*
+ * Utility to get standardized error text for generic update failures
+ */
+export async function getErrorText(
+  errorObject: ErrorType,
+  source: ErrorTextSource,
+) {
+  const { error, message } = await getClientErrorObject(errorObject);
+  let errorText = t('Sorry, an unknown error occurred.');
+
+  if (error) {
+    errorText = t(
+      'Sorry, there was an error saving this %s: %s',
+      source,
+      error,
+    );
+  }
+  if (typeof message === 'string' && message === 'Forbidden') {
+    errorText = t('You do not have permission to edit this %s', source);
+  }
+  return errorText;
+}
+
 export function getClientErrorObject(
   response:
     | SupersetClientResponse
