Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Fleet UI: Pass teamId through all query flows (#18204)

Browse source
This commit is contained in:
RachelElysia 2024-04-10 17:26:16 -04:00 committed by GitHub
parent 01f9963856
commit 565e45c041
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
View file

@ -270,7 +270,10 @@ const QueryDetailsPage = ({
className={`${baseClass}__run`}
variant="blue-green"
onClick={() => {
queryId && router.push(PATHS.LIVE_QUERY(queryId));
queryId &&
router.push(
PATHS.LIVE_QUERY(queryId, currentTeamId)
);
}}
disabled={disabledLiveQuery}
>

16
frontend/pages/queries/live/LiveQueryPage/LiveQueryPage.tsx
View file

@ -3,6 +3,7 @@ import { useQuery } from "react-query";
import { useErrorHandler } from "react-error-boundary";
import { InjectedRouter, Params } from "react-router/lib/Router";
import PATHS from "router/paths";
import useTeamIdParam from "hooks/useTeamIdParam";
import { AppContext } from "context/app";
import { QueryContext } from "context/query";
@ -41,6 +42,13 @@ const RunQueryPage = ({
}: IRunQueryPageProps): JSX.Element => {
const queryId = paramsQueryId ? parseInt(paramsQueryId, 10) : null;
const { currentTeamId } = useTeamIdParam({
location,
router,
includeAllTeams: true,
includeNoTeam: false,
});
const handlePageError = useErrorHandler();
const { config } = useContext(AppContext);
const {
@ -78,8 +86,8 @@ const RunQueryPage = ({
// Reroute users out of live flow when live queries are globally disabled
if (disabledLiveQuery) {
queryId
? router.push(PATHS.QUERY_DETAILS(queryId))
: router.push(PATHS.NEW_QUERY());
? router.push(PATHS.QUERY_DETAILS(queryId, currentTeamId))
: router.push(PATHS.NEW_QUERY(currentTeamId));
}
// disabled on page load so we can control the number of renders
@ -150,8 +158,8 @@ const RunQueryPage = ({
const goToQueryEditor = useCallback(
() =>
queryId
? router.push(PATHS.EDIT_QUERY(queryId))
: router.push(PATHS.NEW_QUERY()),
? router.push(PATHS.EDIT_QUERY(queryId, currentTeamId))
: router.push(PATHS.NEW_QUERY(currentTeamId)),
[]
);