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,