-
-
- {(!isOnlyObserver || isObserverPlus || isAnyTeamObserverPlus) &&
- !!fleetQueries?.length && (
-
-
-
- )}
-
-
-
Manage queries to ask specific questions about your devices.
-
-
- {isTableDataLoading && !fleetQueriesError &&
}
- {!isTableDataLoading && fleetQueriesError ? (
-
- ) : (
-
{
+ if (isPremiumTier) {
+ if (userTeams) {
+ if (userTeams.length > 1 || isOnGlobalTeam) {
+ return (
+
- )}
-
+ );
+ } else if (!isOnGlobalTeam && userTeams.length === 1) {
+ return
{userTeams[0].name}
;
+ }
+ }
+ }
+ return
Queries
;
+ };
+
+ const renderCurrentScopeQueriesTable = () => {
+ if (isFetchingCurTeamQueries) {
+ return
;
+ }
+ if (curTeamQueriesError) {
+ return
;
+ }
+ return (
+
+
+
+ );
+ };
+
+ const renderShowInheritedQueriesTableButton = () => {
+ const inheritedQueryCount = globalEnhancedQueries?.length;
+ return (
+
schedule run on this team’s hosts.'
+ }
+ onClick={() => {
+ setShowInheritedQueries(!showInheritedQueries);
+ }}
+ />
+ );
+ };
+
+ const renderInheritedQueriesTable = () => {
+ if (isFetchingGlobalQueries) {
+ return
;
+ }
+ if (globalQueriesError) {
+ return
;
+ }
+ return (
+
+
+
+ );
+ };
+
+ const renderInheritedQueriesSection = () => {
+ return (
+ <>
+ {renderShowInheritedQueriesTableButton()}
+ {showInheritedQueries && renderInheritedQueriesTable()}
+
+ );
+ };
+
+ const renderModals = () => {
+ return (
+ <>
{showDeleteQueryModal && (
)}
+ {showManageAutomationsModal && (
+
+ )}
+
+ );
+ };
+
+ return (
+
+
+
+
+
+ {(isGlobalAdmin || isTeamAdmin) && (
+
+ )}
+ {(!isOnlyObserver || isObserverPlus || isAnyTeamObserverPlus) &&
+ !!curTeamEnhancedQueries?.length && (
+
+ )}
+
+
+
+
+ Manage and schedule queries to ask questions and collect telemetry
+ for all hosts{isAnyTeamSelected && " assigned to this team"}.
+
+
+ {renderCurrentScopeQueriesTable()}
+ {isAnyTeamSelected &&
+ globalEnhancedQueries &&
+ globalEnhancedQueries?.length > 0 &&
+ renderInheritedQueriesSection()}
+ {renderModals()}
);
diff --git a/frontend/pages/queries/ManageQueriesPage/_styles.scss b/frontend/pages/queries/ManageQueriesPage/_styles.scss
index d88be01d9c..6aee329207 100644
--- a/frontend/pages/queries/ManageQueriesPage/_styles.scss
+++ b/frontend/pages/queries/ManageQueriesPage/_styles.scss
@@ -56,7 +56,7 @@
&__action-button-container {
display: flex;
- align-items: flex-start;
+ gap: $pad-small;
}
.form-field--dropdown {
@@ -103,11 +103,11 @@
.platforms__header {
width: $col-sm;
}
- .author_name__header {
+ .updated_at__header {
display: none;
width: 0;
}
- .updated_at__header {
+ .performance__header {
display: none;
width: 0;
}
@@ -151,28 +151,16 @@
.platforms__cell {
max-width: $col-md;
}
- .author_name__cell {
- display: none;
- max-width: $col-md;
- img,
- div,
- span {
- display: flex;
- align-items: center;
- }
- div {
- padding-right: $pad-small;
- }
- .author-name {
- display: block;
- }
- }
.updated_at__cell {
display: none;
max-width: $col-md;
}
+ .performance__cell {
+ display: none;
+ max-width: $col-md;
+ }
@media (min-width: $break-md) {
- .author_name__cell {
+ .performance__cell {
display: table-cell;
}
}
diff --git a/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/AutomationsModal.tsx b/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/AutomationsModal.tsx
new file mode 100644
index 0000000000..ff49667d43
--- /dev/null
+++ b/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/AutomationsModal.tsx
@@ -0,0 +1,19 @@
+import React from "react";
+
+import Modal from "components/Modal";
+
+const baseClass = "automations-modal";
+
+interface IAutomationsModalProps {
+ onExit: () => void;
+}
+
+const AutomationsModal = ({ onExit }: IAutomationsModalProps): JSX.Element => {
+ return (
+
+
+
+ );
+};
+
+export default AutomationsModal;
diff --git a/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx b/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx
new file mode 100644
index 0000000000..cb6abd9cb8
--- /dev/null
+++ b/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx
@@ -0,0 +1,21 @@
+import React from "react";
+
+import Modal from "components/Modal";
+
+const baseClass = "automations-modal";
+
+interface IManageAutomationsModalProps {
+ onExit: () => void;
+}
+
+const ManageAutomationsModal = ({
+ onExit,
+}: IManageAutomationsModalProps): JSX.Element => {
+ return (
+
+
+
+ );
+};
+
+export default ManageAutomationsModal;
diff --git a/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/index.ts b/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/index.ts
new file mode 100644
index 0000000000..c9128e3c2d
--- /dev/null
+++ b/frontend/pages/queries/ManageQueriesPage/components/ManageAutomationsModal/index.ts
@@ -0,0 +1 @@
+export { default } from "./ManageAutomationsModal";
diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx
index 26e5bcc58f..a728da89a1 100644
--- a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx
@@ -7,12 +7,11 @@ import formatDistanceToNow from "date-fns/formatDistanceToNow";
import PATHS from "router/paths";
import permissionsUtils from "utilities/permissions";
-import { IQuery } from "interfaces/query";
import { IUser } from "interfaces/user";
-import { addGravatarUrlToResource } from "utilities/helpers";
+import { secondsToDhms } from "utilities/helpers";
+import { ISchedulableQuery } from "interfaces/schedulable_query";
import Icon from "components/Icon";
-import Avatar from "components/Avatar";
import Checkbox from "components/forms/fields/Checkbox";
import LinkCell from "components/TableContainer/DataTable/LinkCell/LinkCell";
import HeaderCell from "components/TableContainer/DataTable/HeaderCell/HeaderCell";
@@ -20,10 +19,11 @@ import PlatformCell from "components/TableContainer/DataTable/PlatformCell";
import TextCell from "components/TableContainer/DataTable/TextCell";
import PillCell from "components/TableContainer/DataTable/PillCell";
import TooltipWrapper from "components/TooltipWrapper";
+import StatusIndicator from "components/StatusIndicator";
interface IQueryRow {
id: string;
- original: IQuery;
+ original: ISchedulableQuery;
}
interface IGetToggleAllRowsSelectedProps {
@@ -46,7 +46,7 @@ interface IHeaderProps {
}
interface IRowProps {
row: {
- original: IQuery;
+ original: ISchedulableQuery;
getToggleRowSelectedProps: () => IGetToggleAllRowsSelectedProps;
toggleRowSelected: () => void;
};
@@ -54,6 +54,18 @@ interface IRowProps {
}
interface ICellProps extends IRowProps {
+ cell: {
+ value: string | number | boolean;
+ };
+}
+
+interface INumberCellProps extends IRowProps {
+ cell: {
+ value: number;
+ };
+}
+
+interface IStringCellProps extends IRowProps {
cell: {
value: string;
};
@@ -69,7 +81,9 @@ interface IDataColumn {
Header: ((props: IHeaderProps) => JSX.Element) | string;
Cell:
| ((props: ICellProps) => JSX.Element)
- | ((props: IPlatformCellProps) => JSX.Element);
+ | ((props: IPlatformCellProps) => JSX.Element)
+ | ((props: IStringCellProps) => JSX.Element)
+ | ((props: INumberCellProps) => JSX.Element);
id?: string;
title?: string;
accessor?: string;
@@ -148,28 +162,26 @@ const generateTableHeaders = ({
},
},
{
- title: "Author",
- Header: (cellProps) => (
-
- ),
- accessor: "author_name",
- Cell: (cellProps: ICellProps): JSX.Element => {
- const { author_name, author_email } = cellProps.row.original;
- const author = author_name === currentUser.name ? "You" : author_name;
+ title: "Frequency",
+ Header: "Frequency",
+ disableSortBy: true,
+ accessor: "interval",
+ Cell: (cellProps: INumberCellProps): JSX.Element => {
+ const val = cellProps.cell.value
+ ? `Every ${secondsToDhms(cellProps.cell.value)}`
+ : undefined;
return (
-
-
- {author}
-
+
+ Assign a frequency and turn automations on to
+ collect data at an interval.
+
+ }
+ />
);
},
- sortType: "caseInsensitive",
},
{
Header: () => {
@@ -189,7 +201,7 @@ const generateTableHeaders = ({
},
disableSortBy: true,
accessor: "performance",
- Cell: (cellProps: ICellProps) => (
+ Cell: (cellProps: IStringCellProps) => (
),
},
+ {
+ title: "Automations",
+ Header: "Automations",
+ disableSortBy: true,
+ accessor: "automations_enabled",
+ Cell: (cellProps: IStringCellProps): JSX.Element => {
+ let status;
+ if (cellProps.cell.value) {
+ if (cellProps.row.original.interval === 0) {
+ status = "paused";
+ } else {
+ status = "on";
+ }
+ } else {
+ status = "off";
+ }
+
+ const tooltip =
+ status === "paused"
+ ? {
+ id: cellProps.row.original.id,
+ tooltipText: (
+ <>
+ Automations will resume for this query when
+ a frequency is set.
+
+ ),
+ }
+ : undefined;
+ return ;
+ },
+ },
{
title: "Last modified",
Header: (cellProps) => (
@@ -207,7 +251,7 @@ const generateTableHeaders = ({
/>
),
accessor: "updated_at",
- Cell: (cellProps: ICellProps): JSX.Element => (
+ Cell: (cellProps: INumberCellProps): JSX.Element => (
void,
- onEditScheduledQueryClick: (selectedQuery: IEditScheduledQuery) => void,
- onShowQueryClick: (selectedQuery: IEditScheduledQuery) => void,
- allScheduledQueriesList: IScheduledQuery[],
- allScheduledQueriesError: Error | null,
- toggleScheduleEditorModal: () => void,
- isOnGlobalTeam: boolean,
- selectedTeamData: ITeam | undefined,
- isLoadingGlobalScheduledQueries: boolean,
- isLoadingTeamScheduledQueries: boolean,
- errorQueries: Error | null
-): JSX.Element => {
- return allScheduledQueriesError || errorQueries ? (
-
- ) : (
-
- );
-};
-
-const renderAllTeamsTable = (
- router: InjectedRouter,
- allTeamsScheduledQueriesList: IScheduledQuery[],
- allTeamsScheduledQueriesError: Error | null,
- isOnGlobalTeam: boolean,
- selectedTeamData: ITeam | undefined,
- isLoadingGlobalScheduledQueries: boolean,
- isLoadingTeamScheduledQueries: boolean
-): JSX.Element => {
- return allTeamsScheduledQueriesError ? (
-
- ) : (
-
-
-
- );
-};
-
-interface IFormData {
- interval: number;
- name?: string;
- shard: number;
- query?: string;
- query_id?: number;
- logging_type: string;
- platform: string;
- version: string;
- team_id?: number;
-}
-
-interface ITeamSchedulesPageProps {
- params: {
- team_id: string;
- };
- router: InjectedRouter; // v3
- route: any;
- location: any;
-}
-
-const ManageSchedulePage = ({
- router,
- location,
-}: ITeamSchedulesPageProps): JSX.Element => {
- const { renderFlash } = useContext(NotificationContext);
- const { MANAGE_PACKS } = paths;
- const handleAdvanced = () => router.push(MANAGE_PACKS);
-
- const {
- isOnGlobalTeam,
- isPremiumTier,
- isFreeTier,
- isSandboxMode,
- } = useContext(AppContext);
-
- const {
- currentTeamId,
- isAnyTeamSelected,
- isRouteOk,
- teamIdForApi,
- userTeams,
- handleTeamChange,
- } = useTeamIdParam({
- location,
- router,
- includeAllTeams: true,
- includeNoTeam: false,
- permittedAccessByTeamRole: {
- admin: true,
- maintainer: true,
- observer: false,
- observer_plus: false,
- },
- });
-
- const { data: teams, isLoading: isLoadingTeams } = useQuery<
- ILoadTeamsResponse,
- Error,
- ITeam[]
- >(["teams"], () => teamsAPI.loadAll(), {
- enabled: isRouteOk && !!isPremiumTier,
- refetchOnMount: false,
- refetchOnWindowFocus: false,
- select: (data) => data.teams,
- });
-
- const {
- data: fleetQueries,
- isLoading: isLoadingFleetQueries,
- error: errorQueries,
- } = useQuery(
- ["fleetQueries"],
- () => fleetQueriesAPI.loadAll(),
- {
- enabled: isRouteOk,
- refetchOnMount: false,
- refetchOnWindowFocus: false,
- select: (data) => data.queries,
- }
- );
-
- const {
- data: globalScheduledQueries,
- error: globalScheduledQueriesError,
- isLoading: isLoadingGlobalScheduledQueries,
- refetch: refetchGlobalScheduledQueries,
- } = useQuery<
- ILoadAllGlobalScheduledQueriesResponse,
- Error,
- IScheduledQuery[]
- >(["globalScheduledQueries"], () => globalScheduledQueriesAPI.loadAll(), {
- enabled: isRouteOk,
- select: (data) => data.global_schedule,
- });
-
- const {
- data: teamScheduledQueries,
- error: teamScheduledQueriesError,
- isLoading: isLoadingTeamScheduledQueries,
- refetch: refetchTeamScheduledQueries,
- } = useQuery(
- ["teamScheduledQueries", teamIdForApi],
- () => teamScheduledQueriesAPI.loadAll(teamIdForApi),
- {
- enabled: isRouteOk && isPremiumTier && !!teamIdForApi,
- select: (data) => data.scheduled,
- }
- );
-
- const refetchScheduledQueries = useCallback(() => {
- refetchGlobalScheduledQueries();
- if (isAnyTeamSelected) {
- refetchTeamScheduledQueries();
- }
- }, [
- isAnyTeamSelected,
- refetchGlobalScheduledQueries,
- refetchTeamScheduledQueries,
- ]);
-
- const allScheduledQueriesList =
- (isAnyTeamSelected ? teamScheduledQueries : globalScheduledQueries) || [];
- const allScheduledQueriesError = isAnyTeamSelected
- ? teamScheduledQueriesError
- : globalScheduledQueriesError;
-
- const inheritedScheduledQueriesList = globalScheduledQueries;
- const inheritedScheduledQueriesError = globalScheduledQueriesError;
-
- const inheritedQueryOrQueries =
- inheritedScheduledQueriesList?.length === 1 ? "query" : "queries";
-
- const selectedTeamData = isAnyTeamSelected
- ? teams?.find((team: ITeam) => teamIdForApi === team.id)
- : undefined;
-
- const [isUpdatingScheduledQuery, setIsUpdatingScheduledQuery] = useState(
- false
- );
- const [showInheritedQueries, setShowInheritedQueries] = useState(false);
- const [showScheduleEditorModal, setShowScheduleEditorModal] = useState(false);
- const [showShowQueryModal, setShowShowQueryModal] = useState(false);
- const [showPreviewDataModal, setShowPreviewDataModal] = useState(false);
- const [
- showRemoveScheduledQueryModal,
- setShowRemoveScheduledQueryModal,
- ] = useState(false);
- const [selectedQueryIds, setSelectedQueryIds] = useState(
- []
- );
- const [
- selectedScheduledQuery,
- setSelectedScheduledQuery,
- ] = useState();
-
- const toggleInheritedQueries = () => {
- setShowInheritedQueries(!showInheritedQueries);
- };
-
- const togglePreviewDataModal = useCallback(() => {
- setShowPreviewDataModal(!showPreviewDataModal);
- }, [setShowPreviewDataModal, showPreviewDataModal]);
-
- const toggleScheduleEditorModal = useCallback(() => {
- setSelectedScheduledQuery(undefined); // create modal renders
- setShowScheduleEditorModal(!showScheduleEditorModal);
- }, [showScheduleEditorModal, setShowScheduleEditorModal]);
-
- const toggleShowQueryModal = useCallback(() => {
- setSelectedScheduledQuery(undefined);
- setShowShowQueryModal(!showShowQueryModal);
- }, [showShowQueryModal, setShowShowQueryModal]);
-
- const toggleRemoveScheduledQueryModal = useCallback(() => {
- setShowRemoveScheduledQueryModal(!showRemoveScheduledQueryModal);
- }, [showRemoveScheduledQueryModal, setShowRemoveScheduledQueryModal]);
-
- const onRemoveScheduledQueryClick = (
- selectedTableQueryIds: number[]
- ): void => {
- toggleRemoveScheduledQueryModal();
- setSelectedQueryIds(selectedTableQueryIds);
- };
-
- const onShowQueryClick = (selectedQuery: IEditScheduledQuery): void => {
- toggleShowQueryModal();
- setSelectedScheduledQuery(selectedQuery);
- };
-
- const onEditScheduledQueryClick = (
- selectedQuery: IEditScheduledQuery
- ): void => {
- toggleScheduleEditorModal();
- setSelectedScheduledQuery(selectedQuery); // edit modal renders
- };
-
- const onRemoveScheduledQuerySubmit = useCallback(() => {
- setIsUpdatingScheduledQuery(true);
- const promises = selectedQueryIds.map((id: number) => {
- return isAnyTeamSelected
- ? teamScheduledQueriesAPI.destroy(teamIdForApi, id)
- : globalScheduledQueriesAPI.destroy({ id });
- });
- const queryOrQueries = selectedQueryIds.length === 1 ? "query" : "queries";
- return Promise.all(promises)
- .then(() => {
- renderFlash(
- "success",
- `Successfully removed scheduled ${queryOrQueries}.`
- );
- toggleRemoveScheduledQueryModal();
- refetchScheduledQueries();
- })
- .catch(() => {
- renderFlash(
- "error",
- `Unable to remove scheduled ${queryOrQueries}. Please try again.`
- );
- toggleRemoveScheduledQueryModal();
- })
- .finally(() => {
- refetchGlobalScheduledQueries();
- setIsUpdatingScheduledQuery(false);
- });
- }, [
- selectedQueryIds,
- isAnyTeamSelected,
- teamIdForApi,
- renderFlash,
- toggleRemoveScheduledQueryModal,
- refetchScheduledQueries,
- refetchGlobalScheduledQueries,
- ]);
-
- const onAddScheduledQuerySubmit = useCallback(
- (formData: IFormData, editQuery: IEditScheduledQuery | undefined) => {
- setIsUpdatingScheduledQuery(true);
- if (editQuery) {
- const updatedAttributes = deepDifference(formData, editQuery);
-
- const editResponse =
- editQuery.type === "team_scheduled_query"
- ? teamScheduledQueriesAPI.update(editQuery, updatedAttributes)
- : globalScheduledQueriesAPI.update(editQuery, updatedAttributes);
-
- editResponse
- .then(() => {
- renderFlash(
- "success",
- `Successfully updated ${formData.name} in the schedule.`
- );
- refetchScheduledQueries();
- toggleScheduleEditorModal();
- })
- .catch(() => {
- renderFlash(
- "error",
- "Could not update scheduled query. Please try again."
- );
- })
- .finally(() => {
- setIsUpdatingScheduledQuery(false);
- refetchGlobalScheduledQueries();
- });
- } else {
- const createResponse = isAnyTeamSelected
- ? teamScheduledQueriesAPI.create({ ...formData })
- : globalScheduledQueriesAPI.create({ ...formData });
-
- createResponse
- .then(() => {
- renderFlash(
- "success",
- `Successfully added ${formData.name} to the schedule.`
- );
- refetchScheduledQueries();
- toggleScheduleEditorModal();
- })
- .catch(() => {
- renderFlash("error", "Could not schedule query. Please try again.");
- })
- .finally(() => {
- setIsUpdatingScheduledQuery(false);
- refetchGlobalScheduledQueries();
- });
- }
- },
- [
- isAnyTeamSelected,
- refetchGlobalScheduledQueries,
- refetchScheduledQueries,
- renderFlash,
- toggleScheduleEditorModal,
- ]
- );
-
- if (!isRouteOk || (isPremiumTier && !userTeams?.length)) {
- return (
-
-
-
- );
- }
-
- return (
-
-
-
-
-
-
- {isFreeTier &&
Schedule
}
- {isPremiumTier &&
- userTeams &&
- (userTeams.length > 1 || isOnGlobalTeam) && (
-
- )}
- {isPremiumTier &&
- !isOnGlobalTeam &&
- userTeams &&
- userTeams.length === 1 && {userTeams[0].name}
}
-
-
-
- {allScheduledQueriesList?.length !== 0 && !allScheduledQueriesError && (
-
- {/* NOTE: Product decision to remove packs from UI
- {isOnGlobalTeam && (
-
- )} */}
-
-
- )}
-
-
- {!isLoadingTeams && (
-
- {isAnyTeamSelected ? (
-
- Schedule queries for{" "}
- all hosts assigned to this team
-
- ) : (
-
- Schedule queries to run at regular intervals across{" "}
- all of your hosts
-
- )}
-
- )}
-
-
- {isLoadingTeams ||
- isLoadingFleetQueries ||
- isLoadingGlobalScheduledQueries ||
- isLoadingTeamScheduledQueries ? (
-
- ) : (
- renderTable(
- router,
- onRemoveScheduledQueryClick,
- onEditScheduledQueryClick,
- onShowQueryClick,
- allScheduledQueriesList,
- allScheduledQueriesError,
- toggleScheduleEditorModal,
- isOnGlobalTeam || false,
- selectedTeamData,
- isLoadingGlobalScheduledQueries,
- isLoadingTeamScheduledQueries,
- errorQueries
- )
- )}
-
- {/* must use ternary for NaN */}
- {isAnyTeamSelected &&
- inheritedScheduledQueriesList &&
- inheritedScheduledQueriesList.length > 0 ? (
-
schedule run on this team’s hosts.'
- }
- onClick={toggleInheritedQueries}
- />
- ) : null}
- {showInheritedQueries &&
- inheritedScheduledQueriesList &&
- renderAllTeamsTable(
- router,
- inheritedScheduledQueriesList,
- inheritedScheduledQueriesError,
- isOnGlobalTeam || false,
- selectedTeamData,
- isLoadingGlobalScheduledQueries,
- isLoadingTeamScheduledQueries
- )}
- {showScheduleEditorModal && fleetQueries && (
-
- )}
- {showRemoveScheduledQueryModal && (
-
- )}
- {showShowQueryModal && (
-
- )}
-
-
-
- The data sent to your configured log destination will look similar
- to the following JSON:
-
-
-
-
-
-
-
- Are you sure you want to remove the selected queries from the schedule?
-
-
-
-
-
-
- EmptyTable({
- iconName: emptyState().iconName,
- header: emptyState().header,
- info: emptyState().info,
- additionalInfo: emptyState().additionalInfo,
- primaryButton: emptyState().primaryButton,
- secondaryButton: emptyState().secondaryButton,
- })
- }
- />
-
-
- EmptyTable({
- iconName: emptyState().iconName,
- header: emptyState().header,
- info: emptyState().info,
- additionalInfo: emptyState().additionalInfo,
- primaryButton: emptyState().primaryButton,
- secondaryButton: emptyState().secondaryButton,
- })
- }
- isClientSidePagination
- />
-
-
- performance impact
- across all hosts where this
- query was scheduled.`}
- >
- Performance impact
-
-
- );
- },
- disableSortBy: true,
- accessor: "performance",
- Cell: (cellProps: IPillCellProps) => (
-
- ),
- },
- {
- title: "Actions",
- Header: "",
- disableSortBy: true,
- accessor: "actions",
- Cell: (cellProps: IDropdownCellProps) => (
-
- actionSelectHandler(value, cellProps.row.original)
- }
- placeholder={"Actions"}
- />
- ),
- },
- ];
-};
-
-const generateInheritedQueriesTableHeaders = (): IDataColumn[] => {
- return [
- {
- title: "Query",
- Header: "Query",
- disableSortBy: true,
- accessor: "query_name",
- Cell: (cellProps: ICellProps): JSX.Element => (
-
- ),
- },
- {
- title: "Frequency",
- Header: "Frequency",
- disableSortBy: true,
- accessor: "interval",
- Cell: (cellProps: INumberCellProps): JSX.Element => (
-
- ),
- },
- {
- title: "Performance impact",
- Header: "Performance impact",
- disableSortBy: true,
- accessor: "performance",
- Cell: (cellProps: IPillCellProps) => (
-
- ),
- },
- ];
-};
-
-const generateActionDropdownOptions = (): IDropdownOption[] => {
- const dropdownOptions = [
- {
- label: "Edit",
- disabled: false,
- value: "edit",
- },
- {
- label: "Show query",
- disabled: false,
- value: "showQuery",
- },
- {
- label: "Remove",
- disabled: false,
- value: "remove",
- },
- ];
- return dropdownOptions;
-};
-
-const enhanceAllScheduledQueryData = (
- allScheduledQueries: IScheduledQuery[],
- teamId: number | undefined
-): IAllScheduledQueryTableData[] => {
- return allScheduledQueries.map((scheduledQuery: IScheduledQuery) => {
- const scheduledQueryPerformance = {
- user_time_p50: scheduledQuery.stats?.user_time_p50,
- system_time_p50: scheduledQuery.stats?.system_time_p50,
- total_executions: scheduledQuery.stats?.total_executions,
- };
- return {
- name: scheduledQuery.name,
- query_name: scheduledQuery.query_name,
- interval: scheduledQuery.interval,
- actions: generateActionDropdownOptions(),
- id: scheduledQuery.id,
- query: scheduledQuery.query,
- query_id: scheduledQuery.query_id,
- snapshot: scheduledQuery.snapshot,
- removed: scheduledQuery.removed,
- platform: scheduledQuery.platform,
- version: scheduledQuery.version,
- shard: scheduledQuery.shard,
- type: teamId ? "team_scheduled_query" : "global_scheduled_query",
- performance: {
- indicator: performanceIndicator(scheduledQueryPerformance),
- id: scheduledQuery.id,
- },
- };
- });
-};
-
-const generateDataSet = (
- allScheduledQueries: IScheduledQuery[],
- teamId: number | undefined
-): IAllScheduledQueryTableData[] => {
- return [...enhanceAllScheduledQueryData(allScheduledQueries, teamId)];
-};
-
-export {
- generateInheritedQueriesTableHeaders,
- generateTableHeaders,
- generateDataSet,
-};
diff --git a/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/index.ts b/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/index.ts
deleted file mode 100644
index fb4310e446..0000000000
--- a/frontend/pages/schedule/ManageSchedulePage/components/ScheduleTable/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./ScheduleTable";
diff --git a/frontend/pages/schedule/ManageSchedulePage/index.ts b/frontend/pages/schedule/ManageSchedulePage/index.ts
deleted file mode 100644
index ab51b9b30f..0000000000
--- a/frontend/pages/schedule/ManageSchedulePage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./ManageSchedulePage";
diff --git a/frontend/router/index.tsx b/frontend/router/index.tsx
index 69909599bd..a4ef257c22 100644
--- a/frontend/router/index.tsx
+++ b/frontend/router/index.tsx
@@ -33,7 +33,6 @@ import ManageSoftwarePage from "pages/software/ManageSoftwarePage";
import ManageQueriesPage from "pages/queries/ManageQueriesPage";
import ManagePacksPage from "pages/packs/ManagePacksPage";
import ManagePoliciesPage from "pages/policies/ManagePoliciesPage";
-import ManageSchedulePage from "pages/schedule/ManageSchedulePage";
import PackComposerPage from "pages/packs/PackComposerPage";
import PolicyPage from "pages/policies/PolicyPage";
import QueryPage from "pages/queries/QueryPage";
@@ -169,7 +168,6 @@ const routes = (
-
@@ -204,14 +202,6 @@ const routes = (
-
-
-
-
-
-
-
-
diff --git a/frontend/services/entities/queries.ts b/frontend/services/entities/queries.ts
index 384c0604f6..a4a512a2e2 100644
--- a/frontend/services/entities/queries.ts
+++ b/frontend/services/entities/queries.ts
@@ -4,6 +4,7 @@ import endpoints from "utilities/endpoints";
import { IQueryFormData } from "interfaces/query";
import { ISelectedTargets } from "interfaces/target";
import { AxiosResponse } from "axios";
+import { buildQueryStringFromParams } from "utilities/url";
// Mock API requests to be used in developing FE for #7765 in parallel with BE development
// import { sendRequest } from "services/mock_service/service/service";
@@ -25,16 +26,26 @@ export default {
return sendRequest("DELETE", path);
},
+ bulkDestroy: (ids: number[]) => {
+ const { QUERIES } = endpoints;
+ const path = `${QUERIES}/delete`;
+ return sendRequest("POST", path, { ids });
+ },
load: (id: number) => {
const { QUERIES } = endpoints;
const path = `${QUERIES}/${id}`;
return sendRequest("GET", path);
},
- loadAll: () => {
+ loadAll: (teamId?: number) => {
const { QUERIES } = endpoints;
+ const queryString = buildQueryStringFromParams({ team_id: teamId });
+ const path = `${QUERIES}`;
- return sendRequest("GET", QUERIES);
+ return sendRequest(
+ "GET",
+ queryString ? path.concat(`?${queryString}`) : path
+ );
},
run: async ({
query,