IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore-Query Library: Close drawer when clicking on Run query (#90404)

Browse Source 
Close drawer when clicking on Run query
This commit is contained in:
Haris Rozajac 2024-07-15 15:43:22 -06:00 committed by GitHub
parent 9c05b30489
commit 118597d80f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/explore/ExploreRunQueryButton.tsx
View File

@ -22,6 +22,7 @@ interface ExploreRunQueryButtonProps {
queries: DataQuery[];
rootDatasourceUid?: string;
disabled?: boolean;
onClick?: () => void;
}
export type Props = ConnectedProps<typeof connector> & ExploreRunQueryButtonProps;
@ -35,6 +36,7 @@ export function ExploreRunQueryButton({
rootDatasourceUid,
queries,
disabled = false,
onClick,
changeDatasource,
setQueries,
}: Props) {
@ -82,7 +84,10 @@ export function ExploreRunQueryButton({
<Button
variant="secondary"
aria-label={buttonText.translation}
onClick={() => runQuery(exploreId)}
onClick={() => {
runQuery(exploreId);
onClick?.();
}}
disabled={isInvalid || exploreId === undefined}
>
{buttonText.translation}
@ -101,6 +106,7 @@ export function ExploreRunQueryButton({
ariaLabel={buttonText.fallbackText}
onClick={() => {
runQuery(pane[0]);
onClick?.();
}}
label={`${paneLabel}: ${buttonText.translation}`}
disabled={isInvalid || pane[0] === undefined}

8
public/app/features/explore/QueryLibrary/QueryTemplatesTable/ActionsCell.tsx
View File

@ -9,6 +9,7 @@ import { dispatch } from 'app/store/store';
import { ShowConfirmModalEvent } from 'app/types/events';
import ExploreRunQueryButton from '../../ExploreRunQueryButton';
import { useQueriesDrawerContext } from '../../QueriesDrawer/QueriesDrawerContext';
import { useQueryLibraryListStyles } from './styles';
@ -20,6 +21,7 @@ interface ActionsCellProps {
function ActionsCell({ query, rootDatasourceUid, queryUid }: ActionsCellProps) {
const [deleteQueryTemplate] = useDeleteQueryTemplateMutation();
const { setDrawerOpened } = useQueriesDrawerContext();
const styles = useQueryLibraryListStyles();
const onDeleteQuery = (queryUid: string) => {
@ -57,7 +59,11 @@ function ActionsCell({ query, rootDatasourceUid, queryUid }: ActionsCellProps) {
}
}}
/>
<ExploreRunQueryButton queries={query ? [query] : []} rootDatasourceUid={rootDatasourceUid} />
<ExploreRunQueryButton
queries={query ? [query] : []}
rootDatasourceUid={rootDatasourceUid}
onClick={() => setDrawerOpened(false)}
/>
</div>
);
}