From dbbf58c10d20ffccd1d2e035db79e9fafe02a9d7 Mon Sep 17 00:00:00 2001 From: AAfghahi <48933336+AAfghahi@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:55:17 -0400 Subject: [PATCH 1/4] fix: add icons (#15122) * added alerts * revisions * added icon --- .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx index 40721000a9ed0..e35020065974d 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -361,6 +361,7 @@ const DatabaseModal: FunctionComponent = ({ ))} antDAlertStyles(theme)} type="info" message={t('Want to add a new database?')} @@ -532,6 +533,7 @@ const DatabaseModal: FunctionComponent = ({ antDAlertStyles(theme)} message="Additional fields may be required" + showIcon description={ <> Select databases require additional fields to be completed in @@ -548,7 +550,6 @@ const DatabaseModal: FunctionComponent = ({ } type="info" - showIcon /> )} @@ -660,6 +661,7 @@ const DatabaseModal: FunctionComponent = ({ antDAlertStyles(theme)} type="info" + showIcon message={t('Whitelisting IPs')} description={connectionAlert.WHITELISTED_IPS} /> From 8a4ff629cced16551f140f9d85bd00c104f62246 Mon Sep 17 00:00:00 2001 From: Arash Date: Thu, 17 Jun 2021 11:24:32 -0400 Subject: [PATCH 2/4] spinner --- .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx index a2f3145a78886..83e5fc06c5f14 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -49,6 +49,7 @@ import { DatabaseForm, CONFIGURATION_METHOD, } from 'src/views/CRUD/data/database/types'; +import Loading from 'src/components/Loading'; import ExtraOptions from './ExtraOptions'; import SqlAlchemyForm from './SqlAlchemyForm'; import DatabaseConnectionForm from './DatabaseConnectionForm'; @@ -376,7 +377,7 @@ const DatabaseModal: FunctionComponent = ({ ), }); } - + setLoading(true); const result = await updateResource( db.id as number, update as DatabaseObject, @@ -411,7 +412,7 @@ const DatabaseModal: FunctionComponent = ({ ), }); } - + setLoading(true); const dbId = await createResource(update as DatabaseObject); if (dbId) { setHasConnectedDb(true); @@ -425,6 +426,7 @@ const DatabaseModal: FunctionComponent = ({ } } } + setLoading(false); }; const onChange = (type: any, payload: any) => { @@ -593,7 +595,7 @@ const DatabaseModal: FunctionComponent = ({ if (isLoading) { setLoading(false); } - }, [availableDbs, isLoading]); + }, [availableDbs]); const tabChange = (key: string) => { setTabKey(key); @@ -910,6 +912,7 @@ const DatabaseModal: FunctionComponent = ({ ))} )} + {isLoading && } ); }; From 112cfc518518d5b6fbb915573c323eb47095704c Mon Sep 17 00:00:00 2001 From: Arash Date: Tue, 29 Jun 2021 22:07:51 -0400 Subject: [PATCH 3/4] edit DB modal works --- .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx index 55ffec9c979af..877c603464c02 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -174,6 +174,9 @@ function dbReducer( const trimmedState = { ...(state || {}), }; + if (!trimmedState.encrypted_extra) { + trimmedState.encrypted_extra = ''; + } let query = ''; switch (action.type) { @@ -380,7 +383,7 @@ const DatabaseModal: FunctionComponent = ({ database_name: db?.database_name?.trim() || undefined, impersonate_user: db?.impersonate_user || undefined, extra: db?.extra || undefined, - encrypted_extra: db?.encrypted_extra || undefined, + encrypted_extra: db?.encrypted_extra || '', server_cert: db?.server_cert || undefined, }; @@ -445,7 +448,6 @@ const DatabaseModal: FunctionComponent = ({ '[]', }); } - console.log(dbToUpdate.extra); if (db?.id) { setLoading(true); From 3963ef75da6971bfd618fc814bc88084939f08e2 Mon Sep 17 00:00:00 2001 From: Arash Date: Wed, 30 Jun 2021 11:12:12 -0400 Subject: [PATCH 4/4] moved to fetch action --- .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx index 877c603464c02..14f9b7a5996c1 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -174,9 +174,6 @@ function dbReducer( const trimmedState = { ...(state || {}), }; - if (!trimmedState.encrypted_extra) { - trimmedState.encrypted_extra = ''; - } let query = ''; switch (action.type) { @@ -287,6 +284,7 @@ function dbReducer( return { ...action.payload, + encrypted_extra: action.payload.encrypted_extra || '', engine: action.payload.backend || trimmedState.engine, configuration_method: action.payload.configuration_method, extra_json: deserializeExtraJSON,