dnt make network calls with ssh enabled

apache · Jun 29, 2023 · 5fb76e7 · 5fb76e7
1 parent 5e843f9
commit 5fb76e7
Showing 1 changed file with 109 additions and 105 deletions.
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
@@ -740,128 +740,132 @@ export function useDatabaseValidation() {
  null,
  );
  const getValidation = useCallback(
- (database: Partial<DatabaseObject> | null, onCreate = false) =>
- SupersetClient.post({
- endpoint: '/api/v1/database/validate_parameters/',
- body: JSON.stringify(transformDB(database)),
- headers: { 'Content-Type': 'application/json' },
- })
- .then(() => {
- setValidationErrors(null);
+ (database: Partial<DatabaseObject> | null, onCreate = false) => {
+ if (database?.parameters?.ssh) {
+ // when ssh tunnel is enabled we don't want to render any validation errors
+ setValidationErrors(null);
+ return [];
+ }
+
+ return (
+ SupersetClient.post({
+ endpoint: '/api/v1/database/validate_parameters/',
+ body: JSON.stringify(transformDB(database)),
+ headers: { 'Content-Type': 'application/json' },
  })
- // eslint-disable-next-line consistent-return
- .catch(e => {
- if (typeof e.json === 'function') {
- return e.json().then(({ errors = [] }: JsonObject) => {
- if (database?.parameters?.ssh) {
- // when ssh tunnel is enabled we don't want to render any validation errors
- setValidationErrors([]);
- return [];
- }
- const parsedErrors = errors
- .filter((error: { error_type: string }) => {
- const skipValidationError = ![
- 'CONNECTION_MISSING_PARAMETERS_ERROR',
- 'CONNECTION_ACCESS_DENIED_ERROR',
- ].includes(error.error_type);
- return skipValidationError || onCreate;
- })
- .reduce(
- (
- obj: {},
- {
- error_type,
- extra,
- message,
- }: {
- error_type: string;
- extra: {
- invalid?: string[];
- missing?: string[];
- name: string;
- catalog: {
+ .then(() => {
+ setValidationErrors(null);
+ })
+ // eslint-disable-next-line consistent-return
+ .catch(e => {
+ if (typeof e.json === 'function') {
+ return e.json().then(({ errors = [] }: JsonObject) => {
+ const parsedErrors = errors
+ .filter((error: { error_type: string }) => {
+ const skipValidationError = ![
+ 'CONNECTION_MISSING_PARAMETERS_ERROR',
+ 'CONNECTION_ACCESS_DENIED_ERROR',
+ ].includes(error.error_type);
+ return skipValidationError || onCreate;
+ })
+ .reduce(
+ (
+ obj: {},
+ {
+ error_type,
+ extra,
+ message,
+ }: {
+ error_type: string;
+ extra: {
+ invalid?: string[];
+ missing?: string[];
  name: string;
- url: string;
- idx: number;
+ catalog: {
+ name: string;
+ url: string;
+ idx: number;
+ };
+ issue_codes?: {
+ code?: number;
+ message?: string;
+ }[];
  };
- issue_codes?: {
- code?: number;
- message?: string;
- }[];
- };
- message: string;
- },
- ) => {
- if (extra.catalog) {
- if (extra.catalog.name) {
+ message: string;
+ },
+ ) => {
+ if (extra.catalog) {
+ if (extra.catalog.name) {
+ return {
+ ...obj,
+ error_type,
+ [extra.catalog.idx]: {
+ name: message,
+ },
+ };
+ }
+ if (extra.catalog.url) {
+ return {
+ ...obj,
+ error_type,
+ [extra.catalog.idx]: {
+ url: message,
+ },
+ };
+ }
+
  return {
  ...obj,
  error_type,
  [extra.catalog.idx]: {
  name: message,
+ url: message,
  },
  };
  }
- if (extra.catalog.url) {
+ // if extra.invalid doesn't exist then the
+ // error can't be mapped to a parameter
+ // so leave it alone
+ if (extra.invalid) {
  return {
  ...obj,
+ [extra.invalid[0]]: message,
  error_type,
- [extra.catalog.idx]: {
- url: message,
- },
+ };
+ }
+ if (extra.missing) {
+ return {
+ ...obj,
+ error_type,
+ ...Object.assign(
+ {},
+ ...extra.missing.map(field => ({
+ [field]: 'This is a required field',
+ })),
+ ),
+ };
+ }
+ if (extra.issue_codes?.length) {
+ return {
+ ...obj,
+ error_type,
+ description: message || extra.issue_codes[0]?.message,
  };
  }
 
- return {
- ...obj,
- error_type,
- [extra.catalog.idx]: {
- name: message,
- url: message,
- },
- };
- }
- // if extra.invalid doesn't exist then the
- // error can't be mapped to a parameter
- // so leave it alone
- if (extra.invalid) {
- return {
- ...obj,
- [extra.invalid[0]]: message,
- error_type,
- };
- }
- if (extra.missing) {
- return {
- ...obj,
- error_type,
- ...Object.assign(
- {},
- ...extra.missing.map(field => ({
- [field]: 'This is a required field',
- })),
- ),
- };
- }
- if (extra.issue_codes?.length) {
- return {
- ...obj,
- error_type,
- description: message || extra.issue_codes[0]?.message,
- };
- }
-
- return obj;
- },
- {},
- );
- setValidationErrors(parsedErrors);
- return parsedErrors;
- });
- }
- // eslint-disable-next-line no-console
- console.error(e);
- }),
+ return obj;
+ },
+ {},
+ );
+ setValidationErrors(parsedErrors);
+ return parsedErrors;
+ });
+ }
+ // eslint-disable-next-line no-console
+ console.error(e);
+ })
+ );
+ },
  [setValidationErrors],
  );