Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 4, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const mockedProps = {
removeQuery: NOOP,
},
displayLimit: 1000,
latestQueryId: 'yhMUZCGb',
};

const setup = (overrides = {}) => (
Expand Down
9 changes: 8 additions & 1 deletion superset-frontend/src/SqlLab/components/QueryHistory/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ interface QueryHistoryProps {
removeQuery: Function;
};
displayLimit: number;
latestQueryId: string | undefined;
}

const StyledEmptyStateWrapper = styled.div`
Expand All @@ -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={[
Expand All @@ -61,6 +67,7 @@ const QueryHistory = ({ queries, actions, displayLimit }: QueryHistoryProps) =>
queries={queries}
actions={actions}
displayLimit={displayLimit}
latestQueryId={latestQueryId}
/>
) : (
<StyledEmptyStateWrapper>
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ describe('QueryTable', () => {
queries,
displayLimit: 100,
actions,
latestQueryId: 'ryhMUZCGb',
};
it('is valid', () => {
expect(React.isValidElement(<QueryTable displayLimit={100} />)).toBe(true);
Expand Down
16 changes: 10 additions & 6 deletions superset-frontend/src/SqlLab/components/QueryTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ interface QueryTableProps {
onUserClicked?: Function;
onDbClicked?: Function;
displayLimit: number;
latestQueryId?: string | undefined;
}

const openQuery = (id: number) => {
Expand All @@ -68,6 +69,7 @@ const QueryTable = ({
onUserClicked = () => undefined,
onDbClicked = () => undefined,
displayLimit,
latestQueryId,
}: QueryTableProps) => {
const theme = useTheme();

Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/SqlLab/components/SouthPane/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ export default function SouthPane({
queries={editorQueries}
actions={actions}
displayLimit={displayLimit}
latestQueryId={latestQueryId}
/>
</Tabs.TabPane>
{renderDataPreviewTabs()}
Expand Down