From 6ecdb770d5a3eac27c1d513bf1790dba85f2b298 Mon Sep 17 00:00:00 2001
From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:26:20 -0800
Subject: [PATCH] =?UTF-8?q?UI=20=E2=80=93=20render=20all=20global=20querie?=
=?UTF-8?q?s=20on=20queries=20page=20(#15627)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Addresses [this
clarification](https://github.com/fleetdm/fleet/issues/14415#issuecomment-1854432825)
- For Observers and Observers+ (that is, all global users), render _all_
global queries, which are returned from the API, instead of filtering
out those without "Observer can run"
- [x] Changes file added for user-visible changes in `changes/`
- [x] Manual QA for all new/changed functionality
---------
Co-authored-by: Jacob Shandling
---
changes/show-all-global-queries-for-global-users | 2 ++
.../ManageQueriesPage/ManageQueriesPage.tsx | 14 ++------------
2 files changed, 4 insertions(+), 12 deletions(-)
create mode 100644 changes/show-all-global-queries-for-global-users
diff --git a/changes/show-all-global-queries-for-global-users b/changes/show-all-global-queries-for-global-users
new file mode 100644
index 0000000000..535cd7b73a
--- /dev/null
+++ b/changes/show-all-global-queries-for-global-users
@@ -0,0 +1,2 @@
+- Global observers and global observers+ are now shown all global queries on the Queries page, now
+ including those that are not marked "Observers can run"
diff --git a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
index fa051cd7ee..3b363dcdfc 100644
--- a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
@@ -124,16 +124,6 @@ const ManageQueriesPage = ({
const [showInheritedQueries, setShowInheritedQueries] = useState(false);
const [isUpdatingAutomations, setIsUpdatingAutomations] = useState(false);
- const filterGlobalQueriesForObserverUI = (queries: any) => {
- if (isGlobalObserver) {
- return queries
- .filter((q: ISchedulableQuery) => q.observer_can_run)
- .map(enhanceQuery);
- }
-
- return queries.map(enhanceQuery);
- };
-
const {
data: curTeamEnhancedQueries,
error: curTeamQueriesError,
@@ -149,7 +139,7 @@ const ManageQueriesPage = ({
({ queryKey: [{ teamId }] }) =>
queriesAPI
.loadAll(teamId)
- .then(({ queries }) => filterGlobalQueriesForObserverUI(queries)),
+ .then(({ queries }) => queries.map(enhanceQuery)),
{
refetchOnWindowFocus: false,
enabled: isRouteOk,
@@ -173,7 +163,7 @@ const ManageQueriesPage = ({
({ queryKey: [{ teamId }] }) =>
queriesAPI
.loadAll(teamId)
- .then(({ queries }) => filterGlobalQueriesForObserverUI(queries)),
+ .then(({ queries }) => queries.map(enhanceQuery)),
{
refetchOnWindowFocus: false,
enabled: isRouteOk && isAnyTeamSelected,