You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ru...@apache.org on 2022/04/04 01:59:51 UTC
[superset] branch master updated: fix(sqllab): make to hide the delete button of most recent query history (#19358)
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 5db36ec81c fix(sqllab): make to hide the delete button of most recent query history (#19358)
5db36ec81c is described below
commit 5db36ec81c0e8b6d4ce8435a77c3dce8a036fec6
Author: smileydev <47...@users.noreply.github.com>
AuthorDate: Sun Apr 3 21:59:38 2022 -0400
fix(sqllab): make to hide the delete button of most recent query history (#19358)
---
.../SqlLab/components/QueryHistory/QueryHistory.test.tsx | 1 +
.../src/SqlLab/components/QueryHistory/index.tsx | 9 ++++++++-
.../src/SqlLab/components/QueryTable/QueryTable.test.jsx | 1 +
.../src/SqlLab/components/QueryTable/index.tsx | 16 ++++++++++------
.../src/SqlLab/components/SouthPane/index.tsx | 1 +
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx b/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx
index 782b147839..e63de3fdca 100644
--- 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
index 7cf9d6ba65..bbae677ffe 100644
--- 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
index 5be5a38486..f77e631ae2 100644
--- 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
index 142d8a1309..65189c8ae0 100644
--- 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
index afdb13e6f7..767b608f3b 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
@@ -224,6 +224,7 @@ export default function SouthPane({
queries={editorQueries}
actions={actions}
displayLimit={displayLimit}
+ latestQueryId={latestQueryId}
/>
</Tabs.TabPane>
{renderDataPreviewTabs()}