fix(sqllab): make to hide the delete button of most recent query history

apache · Mar 24, 2022 · 1e73c29 · 1e73c29
1 parent 3313530
commit 1e73c29
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx b/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx
@@ -31,6 +31,7 @@ const mockedProps = {
     removeQuery: NOOP,
   },
   displayLimit: 1000,
+  latestQueryId: 'yhMUZCGb',
 };
 
 const setup = (overrides = {}) => (

diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx b/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx
@@ -32,6 +32,7 @@ interface QueryHistoryProps {
     removeQuery: Function;
   };
   displayLimit: number;
+  latestQueryId: string | undefined;
 }
 
 const StyledEmptyStateWrapper = styled.div`
@@ -45,7 +46,12 @@ const StyledEmptyStateWrapper = styled.div`
   }
 `;
 
-const QueryHistory = ({ queries, actions, displayLimit }: QueryHistoryProps) =>
+const QueryHistory = ({
+  queries,
+  actions,
+  displayLimit,
+  latestQueryId,
+}: QueryHistoryProps) =>
   queries.length > 0 ? (
     <QueryTable
       columns={[
@@ -61,6 +67,7 @@ const QueryHistory = ({ queries, actions, displayLimit }: QueryHistoryProps) =>
       queries={queries}
       actions={actions}
       displayLimit={displayLimit}
+      latestQueryId={latestQueryId}
     />
   ) : (
     <StyledEmptyStateWrapper>

diff --git a/superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.jsx b/superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.jsx
@@ -32,6 +32,7 @@ describe('QueryTable', () => {
     queries,
     displayLimit: 100,
     actions,
+    latestQueryId: 'ryhMUZCGb',
   };
   it('is valid', () => {
     expect(React.isValidElement(<QueryTable displayLimit={100} />)).toBe(true);

diff --git a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
@@ -54,6 +54,7 @@ interface QueryTableProps {
   onUserClicked?: Function;
   onDbClicked?: Function;
   displayLimit: number;
+  latestQueryId?: string | undefined;
 }
 
 const openQuery = (id: number) => {
@@ -68,6 +69,7 @@ const QueryTable = ({
   onUserClicked = () => undefined,
   onDbClicked = () => undefined,
   displayLimit,
+  latestQueryId,
 }: QueryTableProps) => {
   const theme = useTheme();
 
@@ -290,12 +292,14 @@ const QueryTable = ({
             >
               <Icons.PlusCircleOutlined iconSize="xs" css={verticalAlign} />
             </StyledTooltip>
-            <StyledTooltip
-              tooltip={t('Remove query from log')}
-              onClick={() => removeQuery(query)}
-            >
-              <Icons.Trash iconSize="xs" />
-            </StyledTooltip>
+            {q.id !== latestQueryId && (
+              <StyledTooltip
+                tooltip={t('Remove query from log')}
+                onClick={() => removeQuery(query)}
+              >
+                <Icons.Trash iconSize="xs" />
+              </StyledTooltip>
+            )}
           </div>
         );
         return q;

diff --git a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
@@ -223,6 +223,7 @@ export default function SouthPane({
             queries={editorQueries}
             actions={actions}
             displayLimit={displayLimit}
+            latestQueryId={latestQueryId}
           />
         </Tabs.TabPane>
         {renderDataPreviewTabs()}