scope down default error

apache · Oct 26, 2023 · a917225 · a917225
1 parent 906dced
commit a917225
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 43 deletions.
diff --git a/superset-frontend/packages/superset-ui-core/src/models/Registry.ts b/superset-frontend/packages/superset-ui-core/src/models/Registry.ts
@@ -54,7 +54,6 @@ export type Listener = (keys: string[]) => void;
 export interface RegistryConfig {
   name?: string;
   overwritePolicy?: OverwritePolicy;
-  defaultValue?: any;
 }
 
 /**
@@ -89,20 +88,13 @@ export default class Registry<
 
   listeners: Set<Listener>;
 
-  defaultValue?: V;
-
   constructor(config: RegistryConfig = {}) {
-    const {
-      name = '',
-      overwritePolicy = OverwritePolicy.ALLOW,
-      defaultValue,
-    } = config;
+    const { name = '', overwritePolicy = OverwritePolicy.ALLOW } = config;
     this.name = name;
     this.overwritePolicy = overwritePolicy;
     this.items = {};
     this.promises = {};
     this.listeners = new Set();
-    this.defaultValue = defaultValue;
   }
 
   clear() {
@@ -182,9 +174,7 @@ export default class Registry<
 
       return item.value;
     }
-    if (this.defaultValue) {
-      return this.defaultValue;
-    }
+
     return undefined;
   }
 

diff --git a/superset-frontend/packages/superset-ui-core/test/models/Registry.test.ts b/superset-frontend/packages/superset-ui-core/test/models/Registry.test.ts
@@ -463,19 +463,4 @@ describe('Registry', () => {
       });
     });
   });
-  describe('defaultValue', () => {
-    it('will return the default value if no value is registered', () => {
-      const registry = new Registry({
-        defaultValue: 'default',
-      });
-      expect(registry.get('a')).toBe('default');
-    });
-    it('will return a value if a value is registered', () => {
-      const registry = new Registry({
-        defaultValue: 'default',
-      });
-      registry.registerValue('a', 'testValue');
-      expect(registry.get('a')).toBe('testValue');
-    });
-  });
 });
diff --git a/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.ts b/superset-frontend/src/components/ErrorMessage/getErrorMessageComponentRegistry.ts
@@ -16,23 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  Registry,
-  makeSingleton,
-  OverwritePolicy,
-  ErrorTypeEnum,
-  ErrorLevel,
-} from '@superset-ui/core';
+import { Registry, makeSingleton, OverwritePolicy } from '@superset-ui/core';
 import { ErrorMessageComponent } from './types';
 
-/* Generic error to be returned when the backend returns an error response that is not
- * SIP-41 compliant. */
-const genericSupersetError = (extra: object) => ({
-  error_type: ErrorTypeEnum.GENERIC_BACKEND_ERROR,
-  extra,
-  level: 'error' as ErrorLevel,
-  message: 'An error occurred',
-});
 class ErrorMessageComponentRegistry extends Registry<
   ErrorMessageComponent,
   ErrorMessageComponent
@@ -41,7 +27,6 @@ class ErrorMessageComponentRegistry extends Registry<
     super({
       name: 'ErrorMessageComponent',
       overwritePolicy: OverwritePolicy.ALLOW,
-      defaultValue: genericSupersetError,
     });
   }
 }

diff --git a/superset-frontend/src/utils/errorMessages.ts b/superset-frontend/src/utils/errorMessages.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 // Error messages used in many places across applications
 const COMMON_ERR_MESSAGES = {
   SESSION_TIMED_OUT: