To RC: UI - Support software status filter for 'No teams' on the host…

…s page … (#22163) #### This PR already merged to `main`, see #22143. This is against the release branch so it can be included in 4.57.0 (issue #22136 ) Co-authored-by: Jacob Shandling <[email protected]>
fleetdm · Sep 17, 2024 · 02f0a81 · 02f0a81
1 parent ca45468
commit 02f0a81
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/changes/22136-software-status-no-teams-hosts-page b/changes/22136-software-status-no-teams-hosts-page
@@ -0,0 +1 @@
+* Support the software status filter for 'No teams' on the hosts page
diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
@@ -54,7 +54,7 @@ import {
   isValidSoftwareAggregateStatus,
   SoftwareAggregateStatus,
 } from "interfaces/software";
-import { ITeam } from "interfaces/team";
+import { API_ALL_TEAMS_ID, ITeam } from "interfaces/team";
 import { IEmptyTableProps } from "interfaces/empty_table";
 import {
   DiskEncryptionStatus,
@@ -169,9 +169,9 @@ const ManageHostsPage = ({
     includeAllTeams: true,
     includeNoTeam: true,
     overrideParamsOnTeamChange: {
-      // remove the software status filter when selecting all teams
-      // TODO - update if supporting 'No teams' for this filter
-      [HOSTS_QUERY_PARAMS.SOFTWARE_STATUS]: (newTeamId?: number) => !newTeamId,
+      // remove the software status filter when selecting All teams
+      [HOSTS_QUERY_PARAMS.SOFTWARE_STATUS]: (newTeamId?: number) =>
+        newTeamId === API_ALL_TEAMS_ID,
     },
   });
 
@@ -738,7 +738,7 @@ const ManageHostsPage = ({
     );
   };
 
-  const handleSoftwareInstallStatausChange = (
+  const handleSoftwareInstallStatusChange = (
     newStatus: SoftwareAggregateStatus
   ) => {
     handleResetPageIndex();
@@ -848,9 +848,8 @@ const ManageHostsPage = ({
         newQueryParams.software_version_id = softwareVersionId;
       } else if (softwareTitleId) {
         newQueryParams.software_title_id = softwareTitleId;
-        if (softwareStatus && teamIdForApi && teamIdForApi > 0) {
-          // software_status is only valid when software_title_id is present and a team (other than
-          // 'No team') is selected
+        if (softwareStatus && teamIdForApi !== API_ALL_TEAMS_ID) {
+          // software_status is only valid when software_title_id is present and a subset of hosts ('No team' or a team) is selected
           newQueryParams[HOSTS_QUERY_PARAMS.SOFTWARE_STATUS] = softwareStatus;
         }
       } else if (mdmId) {
@@ -1379,7 +1378,10 @@ const ManageHostsPage = ({
       teamId: teamIdForApi,
     };
 
-    if (queryParams.team_id) {
+    if (
+      queryParams.team_id !== API_ALL_TEAMS_ID &&
+      queryParams.team_id !== ""
+    ) {
       options.teamId = queryParams.team_id;
     }
 
@@ -1554,7 +1556,6 @@ const ManageHostsPage = ({
       softwareId ||
       softwareTitleId ||
       softwareVersionId ||
-      softwareStatus ||
       osName ||
       osVersionId ||
       osVersion ||
@@ -1726,7 +1727,7 @@ const ManageHostsPage = ({
             }
             onChangeMacSettingsFilter={handleMacSettingsStatusDropdownChange}
             onChangeSoftwareInstallStatusFilter={
-              handleSoftwareInstallStatausChange
+              handleSoftwareInstallStatusChange
             }
             onClickEditLabel={onEditLabelClick}
             onClickDeleteLabel={toggleDeleteLabelModal}

diff --git a/frontend/utilities/url/index.ts b/frontend/utilities/url/index.ts
@@ -10,6 +10,7 @@ import {
   MacSettingsStatusQueryParam,
 } from "services/entities/hosts";
 import { isValidSoftwareAggregateStatus } from "interfaces/software";
+import { API_ALL_TEAMS_ID } from "interfaces/team";
 
 export type QueryValues = string | number | boolean | undefined | null;
 export type QueryParams = Record<string, QueryValues>;
@@ -121,9 +122,7 @@ export const reconcileSoftwareParams = ({
   if (
     isValidSoftwareAggregateStatus(softwareStatus) &&
     softwareTitleId &&
-    // TODO - update if supporting 'No team' for software status filter
-    teamId &&
-    teamId > 0
+    teamId !== API_ALL_TEAMS_ID
   ) {
     return {
       software_title_id: softwareTitleId,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Support the software status filter for 'No teams' on the hosts page