Rebase with master and address review comments

apache · Sep 20, 2022 · 8e2b2c1 · 8e2b2c1
1 parent 9583534
commit 8e2b2c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/superset-frontend/src/logger/LogUtils.ts b/superset-frontend/src/logger/LogUtils.ts
@@ -65,13 +65,13 @@ export const LOG_EVENT_TYPE_USER = new Set([
   LOG_ACTIONS_MOUNT_EXPLORER,
 ]);
 
-export const LOG_EVENT_DATASET_TYPE_DATASET_CREATION = new Set([
+export const LOG_EVENT_DATASET_TYPE_DATASET_CREATION = [
   LOG_ACTIONS_DATASET_CREATION_EMPTY_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_DATABASE_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_SCHEMA_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_TABLE_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_SUCCESS,
-]);
+];
 
 export const Logger = {
   timeOriginOffset: 0,

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -31,19 +31,20 @@ import {
 } from 'src/logger/LogUtils';
 import { DatasetObject } from '../types';
 
+interface FooterProps {
+  url: string;
+  addDangerToast: () => void;
+  datasetObject?: Partial<DatasetObject> | null;
+  onDatasetAdd?: (dataset: DatasetObject) => void;
+}
+
 const INPUT_FIELDS = ['db', 'schema', 'table_name'];
 const LOG_ACTIONS = [
   LOG_ACTIONS_DATASET_CREATION_EMPTY_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_DATABASE_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_SCHEMA_CANCELLATION,
   LOG_ACTIONS_DATASET_CREATION_TABLE_CANCELLATION,
 ];
-interface FooterProps {
-  url: string;
-  addDangerToast: () => void;
-  datasetObject?: Partial<DatasetObject> | null;
-  onDatasetAdd?: (dataset: DatasetObject) => void;
-}
 
 function Footer({ url, datasetObject, addDangerToast }: FooterProps) {
   const { createResource } = useSingleViewResource<Partial<DatasetObject>>(
@@ -110,7 +111,7 @@ function Footer({ url, datasetObject, addDangerToast }: FooterProps) {
         tooltip={!datasetObject?.table_name ? tooltipText : undefined}
         onClick={onSave}
       >
-        Create Dataset
+        {t('Create Dataset')}
       </Button>
     </>
   );

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -82,7 +82,7 @@ const LeftPanelStyle = styled.div`
       overflow: auto;
       position: absolute;
       bottom: 0;
-      top: ${theme.gridUnit * 97.5}px;
+      top: ${theme.gridUnit * 92.25}px;
       left: ${theme.gridUnit * 3.25}px;
       right: 0;
       .options {
@@ -267,6 +267,7 @@ export default function LeftPanel({
                 }}
                 className="table-form"
                 placeholder={t('Search tables')}
+                allowClear
               />
             )}
           </Form>