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

This commit is contained in:
smileydev 2022-04-03 21:59:38 -04:00 committed by GitHub
parent ea708162a5
commit 5db36ec81c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 7 deletions

View File

@ -31,6 +31,7 @@ const mockedProps = {
removeQuery: NOOP,
},
displayLimit: 1000,
latestQueryId: 'yhMUZCGb',
};
const setup = (overrides = {}) => (

View File

@ -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>

View File

@ -32,6 +32,7 @@ describe('QueryTable', () => {
queries,
displayLimit: 100,
actions,
latestQueryId: 'ryhMUZCGb',
};
it('is valid', () => {
expect(React.isValidElement(<QueryTable displayLimit={100} />)).toBe(true);

View File

@ -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;

View File

@ -224,6 +224,7 @@ export default function SouthPane({
queries={editorQueries}
actions={actions}
displayLimit={displayLimit}
latestQueryId={latestQueryId}
/>
</Tabs.TabPane>
{renderDataPreviewTabs()}