From 346cfc53c498721ee5e8fe18d51474d5e597bc54 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Fri, 6 May 2022 10:37:02 -0700 Subject: [PATCH 01/10] add flow for dbconnmodal to datasetmodal --- .../src/utils/localStorageHelpers.ts | 1 + .../data/database/DatabaseModal/index.tsx | 21 +++++++++++++++++++ .../CRUD/data/dataset/AddDatasetModal.tsx | 7 +++++++ .../views/CRUD/data/dataset/DatasetList.tsx | 8 +++++++ 4 files changed, 37 insertions(+) diff --git a/superset-frontend/src/utils/localStorageHelpers.ts b/superset-frontend/src/utils/localStorageHelpers.ts index e3a37933418d3..d6ca4d17e7842 100644 --- a/superset-frontend/src/utils/localStorageHelpers.ts +++ b/superset-frontend/src/utils/localStorageHelpers.ts @@ -31,6 +31,7 @@ export enum LocalStorageKeys { * and therefore should be done in a major release. */ filter_box_transition_snoozed_at = 'filter_box_transition_snoozed_at', + db = 'db', chart_split_sizes = 'chart_split_sizes', controls_width = 'controls_width', datasource_width = 'datasource_width', 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 12334a1b090a1..55888896ccc9b 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -30,6 +30,7 @@ import React, { useReducer, Reducer, } from 'react'; +import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers'; import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface'; import Tabs from 'src/components/Tabs'; import { AntdSelect, Upload } from 'src/components'; @@ -1085,6 +1086,25 @@ const DatabaseModal: FunctionComponent = ({ return <>; }; + const renderCTABtns = () => ( + <> + + + + ); + const renderFinishState = () => { if (!editNewDb) { return ( @@ -1417,6 +1437,7 @@ const DatabaseModal: FunctionComponent = ({ dbModel={dbModel} editNewDb={editNewDb} /> + {renderCTABtns()} {renderFinishState()} ) : ( diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index 7e7e7429bddd3..802d35aa835e0 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -23,6 +23,7 @@ import Modal from 'src/components/Modal'; import TableSelector from 'src/components/TableSelector'; import withToasts from 'src/components/MessageToasts/withToasts'; import { DatabaseObject } from 'src/components/DatabaseSelector'; +import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers'; type DatasetAddObject = { id: number; @@ -62,7 +63,13 @@ const DatasetModal: FunctionComponent = ({ addDangerToast, ); + const currentUserSelectedDb = getItem( + LocalStorageKeys.db, + null, + ) as DatabaseObject; + useEffect(() => { + if (currentUserSelectedDb) setCurrentDatabase(currentUserSelectedDb); setDisableSave(currentDatabase === undefined || currentTableName === ''); }, [currentTableName, currentDatabase]); diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index 563a3bce1fc4c..e1f977d0c891b 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx @@ -22,6 +22,7 @@ import React, { useState, useMemo, useCallback, + useEffect, } from 'react'; import rison from 'rison'; import { @@ -29,6 +30,7 @@ import { createFetchDistinct, createErrorHandler, } from 'src/views/CRUD/utils'; +import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers'; import { ColumnObject } from 'src/views/CRUD/data/dataset/types'; import { useListViewResource } from 'src/views/CRUD/hooks'; import ConfirmStatusChange from 'src/components/ConfirmStatusChange'; @@ -178,6 +180,12 @@ const DatasetList: FunctionComponent = ({ const initialSort = SORT_BY; + useEffect(() => { + const db = getItem(LocalStorageKeys.db, null); + if (db) { + setDatasetAddModalOpen(true); + } + }, []); const openDatasetEditModal = useCallback( ({ id }: Dataset) => { SupersetClient.get({ From 08623e1141c3140ac9f2bd34d2dfde4e508484e4 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Fri, 6 May 2022 12:34:09 -0700 Subject: [PATCH 02/10] fix bug --- .../src/views/CRUD/data/dataset/AddDatasetModal.tsx | 13 ++++++++----- .../src/views/CRUD/data/dataset/DatasetList.tsx | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index 802d35aa835e0..20db8cb7a5362 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -63,16 +63,19 @@ const DatasetModal: FunctionComponent = ({ addDangerToast, ); - const currentUserSelectedDb = getItem( - LocalStorageKeys.db, - null, - ) as DatabaseObject; useEffect(() => { - if (currentUserSelectedDb) setCurrentDatabase(currentUserSelectedDb); setDisableSave(currentDatabase === undefined || currentTableName === ''); }, [currentTableName, currentDatabase]); + useEffect(() => { + const currentUserSelectedDb = getItem( + LocalStorageKeys.db, + null, + ) as DatabaseObject; + if (currentUserSelectedDb) setCurrentDatabase(currentUserSelectedDb); + }, []); + const onDbChange = (db: DatabaseObject) => { setCurrentDatabase(db); }; diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index e1f977d0c891b..70f02e4d88d0d 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx @@ -179,13 +179,13 @@ const DatasetList: FunctionComponent = ({ const canExport = hasPerm('can_export'); const initialSort = SORT_BY; - useEffect(() => { const db = getItem(LocalStorageKeys.db, null); - if (db) { + if (!loading && db) { setDatasetAddModalOpen(true); } - }, []); + }, [loading]); + const openDatasetEditModal = useCallback( ({ id }: Dataset) => { SupersetClient.get({ From 7e47c3d6e14c1de890156047117306dbff4f39d2 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Fri, 6 May 2022 13:52:23 -0700 Subject: [PATCH 03/10] second part --- .../components/SqlEditorLeftBar/index.tsx | 12 +++++++++-- .../database/DatabaseModal/ModalHeader.tsx | 4 ++-- .../data/database/DatabaseModal/index.tsx | 20 ++++++++++++++++--- .../data/database/DatabaseModal/styles.ts | 2 -- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx index f74249465456a..afb312a7b8d93 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx +++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx @@ -25,6 +25,7 @@ import React, { Dispatch, SetStateAction, } from 'react'; +import querystring from 'query-string'; import Button from 'src/components/Button'; import { t, styled, css, SupersetTheme } from '@superset-ui/core'; import Collapse from 'src/components/Collapse'; @@ -35,6 +36,7 @@ import { QueryEditor } from 'src/SqlLab/types'; import { DatabaseObject } from 'src/components/DatabaseSelector'; import { EmptyStateSmall } from 'src/components/EmptyState'; import TableElement, { Table, TableElementProps } from '../TableElement'; +import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers'; interface ExtendedTable extends Table { expanded: boolean; @@ -105,8 +107,14 @@ export default function SqlEditorLeftBar({ // that require and modify the queryEditor const queryEditorRef = useRef(queryEditor); const [emptyResultsWithSearch, setEmptyResultsWithSearch] = useState(false); + const [userSelectedDb, setUserSelected] = useState(null); useEffect(() => { + const bool = querystring.parse(window.location.search).db; + const userSelected = getItem(LocalStorageKeys.db, null); + if(bool && userSelected) { + setUserSelected(userSelected) + } queryEditorRef.current = queryEditor; }, [queryEditor]); @@ -216,13 +224,13 @@ export default function SqlEditorLeftBar({ }, [actions], ); - + console.log('userSelected',userSelectedDb) return (

STEP 3 OF 3

- Your database was successfully connected! Here are some optional - settings for your database + Your database was successfully connected! Create a dataset to begin + visualizing your data as a chart or go to SQL Lab to query your data.

Need help? Learn more about{' '} 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 55888896ccc9b..169e97e1167b9 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -21,6 +21,7 @@ import { SupersetTheme, FeatureFlag, isFeatureEnabled, + styled, } from '@superset-ui/core'; import React, { FunctionComponent, @@ -176,6 +177,12 @@ type DBReducerActionType = }; }; +const StyledBtns = styled.div` + display: flex; + justify-content: space-evenly; + padding: ${({ theme }) => theme.gridUnit * 4}px; +`; + function dbReducer( state: Partial | null, action: DBReducerActionType, @@ -1087,9 +1094,10 @@ const DatabaseModal: FunctionComponent = ({ }; const renderCTABtns = () => ( - <> + - - + + ); const renderFinishState = () => { diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts index d3d0b11dd76a4..de482a7eef7fb 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts @@ -40,8 +40,6 @@ export const marginBottom = (theme: SupersetTheme) => css` `; export const StyledFormHeader = styled.header` - border-bottom: ${({ theme }) => `${theme.gridUnit * 0.25}px solid - ${theme.colors.grayscale.light2};`} padding: ${({ theme }) => theme.gridUnit * 2}px ${({ theme }) => theme.gridUnit * 4}px; line-height: ${({ theme }) => theme.gridUnit * 6}px; From 02afc936d63a430751d9fa7078cd962c6a4b3ae9 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Wed, 11 May 2022 12:17:44 -0700 Subject: [PATCH 04/10] fix dataset to sql lab --- .../components/SqlEditorLeftBar/index.tsx | 28 +++++++++++++------ .../src/components/DatabaseSelector/index.tsx | 2 +- .../src/components/TableSelector/index.tsx | 9 ++++-- .../data/database/DatabaseModal/index.tsx | 17 +++++++---- .../CRUD/data/dataset/AddDatasetModal.tsx | 3 +- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx index afb312a7b8d93..a966e914bb48f 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx +++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx @@ -35,8 +35,8 @@ import { IconTooltip } from 'src/components/IconTooltip'; import { QueryEditor } from 'src/SqlLab/types'; import { DatabaseObject } from 'src/components/DatabaseSelector'; import { EmptyStateSmall } from 'src/components/EmptyState'; +import { getItem, LocalStorageKeys, setItem } from 'src/utils/localStorageHelpers'; import TableElement, { Table, TableElementProps } from '../TableElement'; -import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers'; interface ExtendedTable extends Table { expanded: boolean; @@ -107,16 +107,26 @@ export default function SqlEditorLeftBar({ // that require and modify the queryEditor const queryEditorRef = useRef(queryEditor); const [emptyResultsWithSearch, setEmptyResultsWithSearch] = useState(false); - const [userSelectedDb, setUserSelected] = useState(null); + const [userSelectedDb, setUserSelected] = useState( + null, + ); useEffect(() => { const bool = querystring.parse(window.location.search).db; - const userSelected = getItem(LocalStorageKeys.db, null); - if(bool && userSelected) { - setUserSelected(userSelected) - } + const userSelected = getItem( + LocalStorageKeys.db, + null, + ) as DatabaseObject | null; + + if (bool && userSelected) { + setUserSelected(userSelected); + setItem(LocalStorageKeys.db, null); + } else setUserSelected(database); + }, []); + + useEffect(() => { queryEditorRef.current = queryEditor; - }, [queryEditor]); + }, [queryEditor, database]); const onEmptyResults = (searchText?: string) => { setEmptyResultsWithSearch(!!searchText); @@ -224,13 +234,13 @@ export default function SqlEditorLeftBar({ }, [actions], ); - console.log('userSelected',userSelectedDb) + return (

{}; diff --git a/superset-frontend/src/components/TableSelector/index.tsx b/superset-frontend/src/components/TableSelector/index.tsx index fcc5dbe10d214..5ad7f203be207 100644 --- a/superset-frontend/src/components/TableSelector/index.tsx +++ b/superset-frontend/src/components/TableSelector/index.tsx @@ -81,7 +81,7 @@ const TableLabel = styled.span` interface TableSelectorProps { clearable?: boolean; - database?: DatabaseObject; + database?: DatabaseObject | null | undefined; emptyState?: ReactNode; formMode?: boolean; getDbList?: (arg0: any) => {}; @@ -166,12 +166,11 @@ const TableSelector: FunctionComponent = ({ onTableSelectChange, }) => { const [currentDatabase, setCurrentDatabase] = useState< - DatabaseObject | undefined + DatabaseObject | null | undefined >(database); const [currentSchema, setCurrentSchema] = useState( schema, ); - const [tableOptions, setTableOptions] = useState([]); const [tableSelectValue, setTableSelectValue] = useState< SelectValue | undefined @@ -190,6 +189,10 @@ const TableSelector: FunctionComponent = ({ } }, [database, tableSelectMode]); + useEffect(() => { + setCurrentDatabase(database); + }, [database]); + useEffect(() => { if (tableSelectMode === 'single') { setTableSelectValue( 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 169e97e1167b9..2d71f33222cc5 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -1093,16 +1093,20 @@ const DatabaseModal: FunctionComponent = ({ return <>; }; + const fetchAndSetDB = () => { + setLoading(true); + fetchResource(dbFetched?.id as number).then(r => { + setItem(LocalStorageKeys.db, r); + }); + }; + const renderCTABtns = () => ( diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index 20db8cb7a5362..1e03ad6f0d22b 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -23,7 +23,7 @@ import Modal from 'src/components/Modal'; import TableSelector from 'src/components/TableSelector'; import withToasts from 'src/components/MessageToasts/withToasts'; import { DatabaseObject } from 'src/components/DatabaseSelector'; -import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers'; +import { getItem, LocalStorageKeys, setItem } from 'src/utils/localStorageHelpers'; type DatasetAddObject = { id: number; @@ -96,6 +96,7 @@ const DatasetModal: FunctionComponent = ({ }; const hide = () => { + setItem(LocalStorageKeys.db, null); clearModal(); onHide(); }; From bf621a6a0764f7bdcd2ceeb1258c1dfc8306ca77 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Wed, 11 May 2022 12:48:26 -0700 Subject: [PATCH 05/10] fix lint --- .../src/views/CRUD/data/dataset/AddDatasetModal.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index 1e03ad6f0d22b..911838744807f 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -23,7 +23,11 @@ import Modal from 'src/components/Modal'; import TableSelector from 'src/components/TableSelector'; import withToasts from 'src/components/MessageToasts/withToasts'; import { DatabaseObject } from 'src/components/DatabaseSelector'; -import { getItem, LocalStorageKeys, setItem } from 'src/utils/localStorageHelpers'; +import { + getItem, + LocalStorageKeys, + setItem, +} from 'src/utils/localStorageHelpers'; type DatasetAddObject = { id: number; @@ -63,7 +67,6 @@ const DatasetModal: FunctionComponent = ({ addDangerToast, ); - useEffect(() => { setDisableSave(currentDatabase === undefined || currentTableName === ''); }, [currentTableName, currentDatabase]); From c1ed3a87dda3bbc930ed1e1d86eacba7efeb478b Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Wed, 11 May 2022 12:55:44 -0700 Subject: [PATCH 06/10] more lint --- .../src/SqlLab/components/SqlEditorLeftBar/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx index a966e914bb48f..ed0d99cfa1891 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx +++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx @@ -35,7 +35,11 @@ import { IconTooltip } from 'src/components/IconTooltip'; import { QueryEditor } from 'src/SqlLab/types'; import { DatabaseObject } from 'src/components/DatabaseSelector'; import { EmptyStateSmall } from 'src/components/EmptyState'; -import { getItem, LocalStorageKeys, setItem } from 'src/utils/localStorageHelpers'; +import { + getItem, + LocalStorageKeys, + setItem, +} from 'src/utils/localStorageHelpers'; import TableElement, { Table, TableElementProps } from '../TableElement'; interface ExtendedTable extends Table { From c378a47c79bd37d10eada7e4a6809772835835fe Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Wed, 11 May 2022 13:30:50 -0700 Subject: [PATCH 07/10] add key value --- superset-frontend/src/utils/localStorageHelpers.ts | 1 + .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/src/utils/localStorageHelpers.ts b/superset-frontend/src/utils/localStorageHelpers.ts index d6ca4d17e7842..04bb56b845e4e 100644 --- a/superset-frontend/src/utils/localStorageHelpers.ts +++ b/superset-frontend/src/utils/localStorageHelpers.ts @@ -55,6 +55,7 @@ export enum LocalStorageKeys { export type LocalStorageValues = { filter_box_transition_snoozed_at: Record; + db: object; chart_split_sizes: [number, number]; controls_width: number; datasource_width: number; 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 c3e7680ebdee3..e9c4e2ed69d79 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -22,7 +22,6 @@ import { SupersetTheme, FeatureFlag, isFeatureEnabled, - styled, } from '@superset-ui/core'; import React, { FunctionComponent, From e01be75de9b1d0b00a467c8613dfcad2f3e5071c Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Wed, 11 May 2022 14:24:37 -0700 Subject: [PATCH 08/10] fix type --- superset-frontend/src/utils/localStorageHelpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/src/utils/localStorageHelpers.ts b/superset-frontend/src/utils/localStorageHelpers.ts index 04bb56b845e4e..8784781011138 100644 --- a/superset-frontend/src/utils/localStorageHelpers.ts +++ b/superset-frontend/src/utils/localStorageHelpers.ts @@ -55,7 +55,7 @@ export enum LocalStorageKeys { export type LocalStorageValues = { filter_box_transition_snoozed_at: Record; - db: object; + db: object | null; chart_split_sizes: [number, number]; controls_width: number; datasource_width: number; From 4c9b734b6c09644e4a4937825de6967bfe407438 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Fri, 1 Jul 2022 08:05:31 -0700 Subject: [PATCH 09/10] add new styling --- .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 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 e9c4e2ed69d79..7dd9b34b3fc11 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -190,9 +190,8 @@ type DBReducerActionType = }; const StyledBtns = styled.div` - display: flex; - justify-content: space-evenly; - padding: ${({ theme }) => theme.gridUnit * 4}px; + margin-bottom: ${({ theme }) => theme.gridUnit * 3}px; + margin-left: ${({ theme }) => theme.gridUnit * 3}px; `; function dbReducer( @@ -1133,7 +1132,7 @@ const DatabaseModal: FunctionComponent = ({ window.location.href = `/superset/sqllab/?db=true`; }} > - {t('GO TO SQL LAB')}{' '} + {t('QUERY DATA IN SQL LAB')}{' '} ); From 6f98cc273d5c4358b684ccbcb0d70252fbd7442a Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Tue, 5 Jul 2022 08:11:13 -0700 Subject: [PATCH 10/10] remove undefined from types --- superset-frontend/src/components/DatabaseSelector/index.tsx | 2 +- superset-frontend/src/components/TableSelector/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/components/DatabaseSelector/index.tsx b/superset-frontend/src/components/DatabaseSelector/index.tsx index c34729a83af8b..4a5e94b2bcbac 100644 --- a/superset-frontend/src/components/DatabaseSelector/index.tsx +++ b/superset-frontend/src/components/DatabaseSelector/index.tsx @@ -87,7 +87,7 @@ export type DatabaseObject = { type SchemaValue = { label: string; value: string }; export interface DatabaseSelectorProps { - db?: DatabaseObject | null | undefined; + db?: DatabaseObject | null; emptyState?: ReactNode; formMode?: boolean; getDbList?: (arg0: any) => {}; diff --git a/superset-frontend/src/components/TableSelector/index.tsx b/superset-frontend/src/components/TableSelector/index.tsx index 5ad7f203be207..d7b867347abf8 100644 --- a/superset-frontend/src/components/TableSelector/index.tsx +++ b/superset-frontend/src/components/TableSelector/index.tsx @@ -81,7 +81,7 @@ const TableLabel = styled.span` interface TableSelectorProps { clearable?: boolean; - database?: DatabaseObject | null | undefined; + database?: DatabaseObject | null; emptyState?: ReactNode; formMode?: boolean; getDbList?: (arg0: any) => {};