Fix Policies automations filter disappearing for the Unassigned fleet (#49224)

**Related issue:** Resolves #44624 Switching to the "Unassigned" fleet with an automation filter already set kept the filter's value in the URL, but the filter dropdown's option list silently collapsed to only "All automations" and "Webhooks or tickets" — the same restricted set used for "All fleets" — because the "Unassigned" fleet's team ID (0) is falsy and was treated the same as the undefined team ID used for "All fleets". This made the filter appear to disappear from the UI. # Checklist for submitter - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually #### Before (issue's video) https://github.com/user-attachments/assets/a2bca626-5700-4174-beb2-94aadf847a6c #### After https://github.com/user-attachments/assets/a5912056-02ef-4827-8110-29ad4d629fa8  ## Summary by CodeRabbit * **Bug Fixes** * Fixed the automations filter on the Policies page so it remains visible when viewing the Unassigned fleet. * Preserved the selected automation filter when switching views. * Updated available options for Unassigned fleets by excluding Calendar while retaining supported automation types. * Improved the empty-state experience when no policies match the selected filters.
2026-07-13 15:58:53 -03:00
parent 95632edf0d
commit bfb0f297db
3 changed files with 215 additions and 10 deletions
@@ -0,0 +1 @@
+* Fixed the Policies page automations filter disappearing from the UI when switching to the "Unassigned" fleet and selecting a different automation type.
@@ -0,0 +1,188 @@
+import React from "react";
+import { screen, waitFor } from "@testing-library/react";
+import { http, HttpResponse } from "msw";
+
+import {
+  createCustomRenderer,
+  createMockRouter,
+  baseUrl,
+} from "test/test-utils";
+import mockServer from "test/mock-server";
+import createMockConfig from "__mocks__/configMock";
+import createMockUser from "__mocks__/userMock";
+import createMockPolicy from "__mocks__/policyMock";
+
+import ManagePoliciesPage from "./ManagePoliciesPage";
+
+const FLEET_WITH_POLICIES_ID = 1;
+const FLEET_WITHOUT_POLICIES_ID = 2;
+
+const getConfigHandler = () =>
+  http.get(baseUrl("/config"), () => HttpResponse.json(createMockConfig()));
+
+const getFleetHandler = () =>
+  http.get(baseUrl("/fleets/:id"), ({ params }) => {
+    const fleetId = Number(params.id);
+    const fleet = {
+      ...createMockConfig(),
+      id: fleetId,
+      name: `Fleet ${fleetId}`,
+    };
+    return HttpResponse.json({ team: fleet, fleet });
+  });
+
+const getFleetPoliciesHandler = () =>
+  http.get(baseUrl("/fleets/:fleetId/policies"), ({ params }) => {
+    const fleetId = Number(params.fleetId);
+    const policies =
+      fleetId === FLEET_WITH_POLICIES_ID
+        ? [
+            createMockPolicy({
+              id: 1,
+              name: "Software policy",
+              team_id: fleetId,
+              install_software: { name: "Zoom", software_title_id: 1 },
+            }),
+          ]
+        : [];
+    return HttpResponse.json({ policies });
+  });
+
+const getFleetPoliciesCountHandler = () =>
+  http.get(baseUrl("/fleets/:fleetId/policies/count"), ({ params }) => {
+    const fleetId = Number(params.fleetId);
+    return HttpResponse.json({
+      count: fleetId === FLEET_WITH_POLICIES_ID ? 1 : 0,
+    });
+  });
+
+const getGlobalPoliciesHandler = () =>
+  http.get(baseUrl("/policies"), () => HttpResponse.json({ policies: [] }));
+
+const getGlobalPoliciesCountHandler = () =>
+  http.get(baseUrl("/policies/count"), () => HttpResponse.json({ count: 0 }));
+
+const getAutomationFilterControl = (): HTMLElement => {
+  const control = document.querySelector(
+    ".manage-policies-page__filter-automation-dropdown .react-select__control"
+  );
+  if (!control) {
+    throw new Error("Automations filter control not found");
+  }
+  return control as HTMLElement;
+};
+
+const setupHandlers = () => {
+  mockServer.use(
+    getConfigHandler(),
+    getFleetHandler(),
+    getFleetPoliciesHandler(),
+    getFleetPoliciesCountHandler(),
+    getGlobalPoliciesHandler(),
+    getGlobalPoliciesCountHandler()
+  );
+};
+
+describe("ManagePoliciesPage - automations filter", () => {
+  const renderPage = (fleetId: string, automationType?: string) => {
+    setupHandlers();
+
+    const render = createCustomRenderer({
+      withBackendMock: true,
+      context: {
+        app: {
+          currentUser: createMockUser({ global_role: "admin" }),
+          isGlobalAdmin: true,
+          isOnGlobalTeam: true,
+          isPremiumTier: true,
+          availableTeams: [
+            { id: -1, name: "All fleets" },
+            { id: 0, name: "Unassigned" },
+            { id: FLEET_WITH_POLICIES_ID, name: "Fleet with policies" },
+            { id: FLEET_WITHOUT_POLICIES_ID, name: "Fleet without policies" },
+          ],
+          config: createMockConfig(),
+          setCurrentTeam: jest.fn(),
+          setFilteredPoliciesPath: jest.fn(),
+          setConfig: jest.fn(),
+        },
+      },
+    });
+
+    const query: Record<string, string> = { fleet_id: fleetId };
+    if (automationType) {
+      query.automation_type = automationType;
+    }
+
+    return render(
+      <ManagePoliciesPage
+        router={createMockRouter()}
+        location={{
+          action: "PUSH",
+          hash: "",
+          key: "",
+          pathname: "/policies/manage",
+          query,
+          search: `?${new URLSearchParams(query).toString()}`,
+        }}
+      />
+    );
+  };
+
+  it("keeps the automations filter dropdown visible and enabled for a fleet with no policies when a filter is present in the URL", async () => {
+    renderPage(FLEET_WITHOUT_POLICIES_ID.toString(), "software");
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("No policies match the current filters.")
+      ).toBeInTheDocument();
+    });
+
+    // Per the fix for #44624: when a filter is present in the query params,
+    // the automations filter dropdown must remain visible and enabled (and
+    // reflect the selected filter) even though this fleet has zero policies.
+    expect(screen.getByText("Software")).toBeInTheDocument();
+    expect(getAutomationFilterControl()).not.toHaveClass(
+      "react-select__control--is-disabled"
+    );
+  });
+
+  it("offers software/scripts/conditional access automation types for the 'Unassigned' fleet, but not calendar", async () => {
+    const { user } = renderPage("0", "software");
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("No policies match the current filters.")
+      ).toBeInTheDocument();
+    });
+
+    // The selected filter persists (sticky), matching what's in the URL.
+    expect(screen.getByText("Software")).toBeInTheDocument();
+
+    // "Unassigned" is a real, policy-bearing fleet (unlike "All fleets", which
+    // is restricted to webhook/ticket-only automations) -- it should offer
+    // every automation type EXCEPT calendar events, which
+    // PolicyAutomationsFields hardcodes as fleet-only (never available for
+    // "All fleets" or "Unassigned").
+    await user.click(getAutomationFilterControl());
+
+    expect(screen.getByText("Scripts")).toBeInTheDocument();
+    expect(screen.getByText("Conditional access")).toBeInTheDocument();
+    expect(screen.queryByText("Calendar")).not.toBeInTheDocument();
+  });
+
+  it("rejects an automation_type=calendar query param for the 'Unassigned' fleet, since calendar isn't a valid option there", async () => {
+    renderPage("0", "calendar");
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("No policies for this fleet")
+      ).toBeInTheDocument();
+    });
+
+    // "calendar" isn't a valid filter for "Unassigned", so it must not stick
+    // as the selected value -- the filter should fall back to its default.
+    expect(screen.getByText("All automations")).toBeInTheDocument();
+    expect(screen.queryByText("Calendar")).not.toBeInTheDocument();
+  });
+});
@@ -28,8 +28,8 @@ import {
 } from "interfaces/policy";
 import {
  API_ALL_TEAMS_ID,
+  API_NO_TEAM_ID,
  APP_CONTEXT_ALL_TEAMS_ID,
-  ITeamConfig,
 } from "interfaces/team";
 import { isQueryablePlatform } from "interfaces/platform";

@@ -105,6 +105,22 @@ const AUTOMATION_TYPES: AutomationType[] = [

 const GLOBAL_AUTOMATION_TYPES: GlobalPoliciesAutomationType[] = ["other"];

+const getValidAutomationTypesForTeam = (
+  teamIdForApi: number | undefined
+): (AutomationType | GlobalPoliciesAutomationType)[] => {
+  if (teamIdForApi === undefined) {
+    // All fleets → global policies only support webhook/ticket automations.
+    return GLOBAL_AUTOMATION_TYPES;
+  }
+  if (teamIdForApi === API_NO_TEAM_ID) {
+    // Unassigned supports every automation type EXCEPT calendar events,
+    // which PolicyAutomationsFields hardcodes as fleet-only (never available
+    // for "All fleets" or "Unassigned").
+    return AUTOMATION_TYPES.filter((type) => type !== "calendar");
+  }
+  return AUTOMATION_TYPES;
+};
+
 const baseClass = "manage-policies-page";

 const ManagePolicyPage = ({
@@ -191,9 +207,7 @@ const ManagePolicyPage = ({
      return null;
    }

-    const validValues = isAllTeamsSelected
-      ? GLOBAL_AUTOMATION_TYPES
-      : AUTOMATION_TYPES;
+    const validValues = getValidAutomationTypesForTeam(teamIdForApi);

    return (validValues as string[]).includes(automationQueryParam)
      ? automationQueryParam
@@ -786,12 +800,14 @@ const ManagePolicyPage = ({
          !automationFilter &&
          !targetedPlatformParam;

-        // No team ID = All fleets → only show "all" and "other" options
-        const optionsForTeam = teamIdForApi
-          ? automationFilterOptions
-          : automationFilterOptions.filter((opt) =>
-              ["all", "other"].includes(opt.value as string)
-            );
+        const validAutomationTypesForTeam = getValidAutomationTypesForTeam(
+          teamIdForApi
+        );
+        const optionsForTeam = automationFilterOptions.filter(
+          (opt) =>
+            opt.value === "all" ||
+            (validAutomationTypesForTeam as string[]).includes(opt.value)
+        );

        return (
          <DropdownWrapper
				`@@ -0,0 +1 @@`
				`* Fixed the Policies page automations filter disappearing from the UI when switching to the "Unassigned" fleet and selecting a different automation type.`