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.

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

Do not show the Add to Filters action button if the filter exists #285

Merged
merged 4 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 18 additions & 5 deletions src/components/Explore/actions/AddToFiltersAction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,19 @@ export class AddToFiltersAction extends SceneObjectBase<AddToFiltersActionState>
};

public static Component = ({ model }: SceneComponentProps<AddToFiltersAction>) => {
return (
<Button variant="primary" size="sm" fill="text" onClick={model.onClick} icon={'search-plus'}>
Add to filters
</Button>
);
const key = model.state?.labelKey ?? '';
const field = model.state?.frame.fields.filter(x => x.type !== 'time');
const value = field?.[0]?.labels?.[key] ?? '';
const filterExists = filterExistsForKey(getFiltersVariable(model), key, value.replace(/"/g, ''));

if (!filterExists) {
return (
<Button variant="primary" size="sm" fill="text" onClick={model.onClick} icon={'search-plus'}>
Add to filters
</Button>
);
}
return <></>;
};
}

Expand All @@ -61,3 +69,8 @@ export const addToFilters = (variable: AdHocFiltersVariable, label: string, valu
],
});
};

export const filterExistsForKey = (model: AdHocFiltersVariable, key: string, value: string) => {
const variable = getFiltersVariable(model);
return variable.state.filters.find((f) => f.key === key && f.value === value);
}
24 changes: 14 additions & 10 deletions src/components/Explore/layouts/HighestDifferencePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Button, Stack, useStyles2 } from '@grafana/ui';
import { css } from '@emotion/css';
import React from 'react';
import { getFiltersVariable } from '../../../utils/utils';
import { addToFilters } from '../actions/AddToFiltersAction';
import { addToFilters, filterExistsForKey } from '../actions/AddToFiltersAction';
import { computeHighestDifference } from '../../../utils/comparison';

export interface HighestDifferencePanelState extends SceneObjectState {
Expand Down Expand Up @@ -50,6 +50,8 @@ export class HighestDifferencePanel extends SceneObjectBase<HighestDifferencePan
const { maxDifference, maxDifferenceIndex, panel } = model.useState();
const styles = useStyles2(getStyles);
const value = model.getValue();
const key = model.state.frame.name ?? '';
const filterExists = filterExistsForKey(getFiltersVariable(model), key, value.replace(/"/g, ''));

return (
<div className={styles.container}>
Expand All @@ -58,15 +60,17 @@ export class HighestDifferencePanel extends SceneObjectBase<HighestDifferencePan
<div className={styles.differenceContainer}>
<Stack gap={1} justifyContent={'space-between'} alignItems={'center'}>
<div className={styles.title}>Highest difference</div>
<Button
size="sm"
variant="primary"
icon={'search-plus'}
fill="text"
onClick={() => model.onAddToFilters()}
>
Add to filters
</Button>
{!filterExists && (
<Button
size="sm"
variant="primary"
icon={'search-plus'}
fill="text"
onClick={() => model.onAddToFilters()}
>
Add to filters
</Button>
)}
</Stack>

<div className={styles.differenceValue}>
Expand Down
Loading