feat(ui): source scheduled scans tab from /schedules endpoint (#11670)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: alejandrobailo

ui/actions/schedules/schedules.test.ts

@@ -35,6 +35,7 @@ vi.mock("@/lib/server-actions-helper", () => ({
 
 import {
   getSchedule,
+  getSchedulesPage,
   removeSchedule,
   updateSchedule,
   updateSchedulesBulk,
@@ -212,3 +213,53 @@ describe("schedule write actions revalidate only on success", () => {
     expect(fetchMock).not.toHaveBeenCalled();
   });
 });
+
+describe("getSchedulesPage delegates pagination to the endpoint", () => {
+  beforeEach(() => {
+    vi.stubGlobal("fetch", fetchMock);
+    getAuthHeadersMock.mockResolvedValue({ Authorization: "Bearer token" });
+    fetchMock.mockResolvedValue(new Response(null, { status: 200 }));
+    handleApiErrorMock.mockReturnValue({ error: "Failed" });
+  });
+
+  it("requests only configured schedules with native pagination and include", async () => {
+    handleApiResponseMock.mockResolvedValue({
+      data: [],
+      included: [],
+      meta: { pagination: { page: 2, pages: 4, count: 35 } },
+    });
+
+    const result = await getSchedulesPage({
+      page: 2,
+      pageSize: 10,
+      sort: "next_scan_at",
+      filters: { "filter[provider_type__in]": "aws,azure" },
+    });
+
+    const calledUrl = new URL(fetchMock.mock.calls[0][0] as string);
+    expect(calledUrl.pathname).toBe("/api/v1/schedules");
+    expect(calledUrl.searchParams.get("filter[configured]")).toBe("true");
+    expect(calledUrl.searchParams.get("include")).toBe("provider");
+    expect(calledUrl.searchParams.get("page[number]")).toBe("2");
+    expect(calledUrl.searchParams.get("page[size]")).toBe("10");
+    expect(calledUrl.searchParams.get("sort")).toBe("next_scan_at");
+    expect(calledUrl.searchParams.get("filter[provider_type__in]")).toBe(
+      "aws,azure",
+    );
+    // meta is propagated verbatim so the table paginates natively.
+    expect(result?.meta?.pagination?.count).toBe(35);
+  });
+
+  it("normalizes array filter values into a CSV param", async () => {
+    handleApiResponseMock.mockResolvedValue({ data: [], meta: {} });
+
+    await getSchedulesPage({
+      filters: { "filter[provider__in]": ["id-1", "id-2"] },
+    });
+
+    const calledUrl = new URL(fetchMock.mock.calls[0][0] as string);
+    expect(calledUrl.searchParams.get("filter[provider__in]")).toBe(
+      "id-1,id-2",
+    );
+  });
+});

ui/actions/schedules/schedules.ts

@@ -81,6 +81,41 @@ export const getSchedules = async () => {
   }
 };
 
+/** Fetches one page of configured schedules for the Scheduled tab, with native pagination. */
+export const getSchedulesPage = async ({
+  page = 1,
+  pageSize = 10,
+  sort = "",
+  filters = {},
+}: {
+  page?: number;
+  pageSize?: number;
+  sort?: string;
+  filters?: Record<string, string | string[]>;
+} = {}) => {
+  const headers = await getAuthHeaders({ contentType: false });
+  const url = new URL(`${apiBaseUrl}/schedules`);
+
+  url.searchParams.set("filter[configured]", "true");
+  url.searchParams.set("include", "provider");
+  url.searchParams.set("page[number]", String(page));
+  url.searchParams.set("page[size]", String(pageSize));
+  if (sort) url.searchParams.set("sort", sort);
+
+  for (const [key, value] of Object.entries(filters)) {
+    const normalized = Array.isArray(value) ? value.join(",") : value;
+    if (normalized) url.searchParams.set(key, normalized);
+  }
+
+  try {
+    const response = await fetch(url.toString(), { headers });
+
+    return handleApiResponse(response);
+  } catch (error) {
+    return handleApiError(error);
+  }
+};
+
 export const updateSchedule = async (
   providerId: string,
   payload: ScheduleUpdatePayload,

ui/app/(prowler)/_overview/_components/accounts-selector.test.tsx

@@ -2,6 +2,8 @@ import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
+import { FilterType } from "@/types/filters";
+
 import { AccountsSelector } from "./accounts-selector";
 
 const multiSelectContentSpy = vi.fn();
@@ -170,7 +172,10 @@ describe("AccountsSelector", () => {
 
   it("can use provider UID values for pages whose API filters by provider_uid__in", () => {
     render(
-      <AccountsSelector providers={providers} filterKey="provider_uid__in" />,
+      <AccountsSelector
+        providers={providers}
+        filterKey={FilterType.PROVIDER_UID}
+      />,
     );
 
     expect(

ui/app/(prowler)/_overview/_components/accounts-selector.tsx

@@ -17,25 +17,18 @@ import {
   MultiSelectValue,
 } from "@/components/shadcn/select/multiselect";
 import { useUrlFilters } from "@/hooks/use-url-filters";
+import { type AccountFilterKey, FilterType } from "@/types/filters";
 import {
   getProviderDisplayName,
   type ProviderProps,
   type ProviderType,
 } from "@/types/providers";
 
-const ACCOUNT_SELECTOR_FILTER = {
-  PROVIDER_ID: "provider_id__in",
-  PROVIDER_UID: "provider_uid__in",
-} as const;
-
-type AccountSelectorFilter =
-  (typeof ACCOUNT_SELECTOR_FILTER)[keyof typeof ACCOUNT_SELECTOR_FILTER];
-
 /** Common props shared by both batch and instant modes. */
 interface AccountsSelectorBaseProps {
   providers: ProviderProps[];
   search?: MultiSelectSearchProp;
-  filterKey?: AccountSelectorFilter;
+  filterKey?: AccountFilterKey;
   id?: string;
   disabledValues?: string[];
   closeOnSelect?: boolean;
@@ -72,7 +65,7 @@ export function AccountsSelector({
   providers,
   onBatchChange,
   selectedValues,
-  filterKey = ACCOUNT_SELECTOR_FILTER.PROVIDER_ID,
+  filterKey = FilterType.PROVIDER_ID,
   id = "accounts-selector",
   disabledValues = [],
   search = {
@@ -92,7 +85,7 @@ export function AccountsSelector({
 
   const visibleProviders = providers;
   const getProviderValue = (provider: ProviderProps) =>
-    filterKey === ACCOUNT_SELECTOR_FILTER.PROVIDER_UID
+    filterKey === FilterType.PROVIDER_UID
       ? provider.attributes.uid
       : provider.id;
   const disabledValuesSet = new Set(disabledValues);

ui/app/(prowler)/scans/page.test.ts

@@ -21,3 +21,20 @@ describe("scans page onboarding", () => {
     expect(source).toContain("onboardingAction={onboardingAction}");
   });
 });
+
+describe("scans page scheduled tab source", () => {
+  const currentDir = path.dirname(fileURLToPath(import.meta.url));
+  const pagePath = path.join(currentDir, "page.tsx");
+  const source = readFileSync(pagePath, "utf8");
+
+  it("sources the Scheduled tab from /schedules only for the advanced capability", () => {
+    expect(source).toContain("getSchedulesPage");
+    expect(source).toContain("SCAN_SCHEDULE_CAPABILITY.ADVANCED");
+    expect(source).toContain("tab === SCAN_JOBS_TAB.SCHEDULED");
+  });
+
+  it("maps schedule resources to rows and delegates pagination to the endpoint", () => {
+    expect(source).toContain("buildScheduledTabRows");
+    expect(source).toContain("pickScheduleProviderFilters");
+  });
+});

ui/app/(prowler)/scans/page.tsx

@@ -3,15 +3,17 @@ import { Suspense } from "react";
 
 import { getAllProviders } from "@/actions/providers";
 import { getScans } from "@/actions/scans";
-import { getSchedules } from "@/actions/schedules";
+import { getSchedules, getSchedulesPage } from "@/actions/schedules";
 import { auth } from "@/auth.config";
 import { PageReady } from "@/components/onboarding";
 import {
   appendPendingScheduleRowsToPage,
+  buildScheduledTabRows,
   getProviderIdsFromScans,
   getScanJobsTab,
   getScanJobsTabFilters,
   getScanJobsUserFilters,
+  pickScheduleProviderFilters,
 } from "@/components/scans/scans.utils";
 import { ScansPageShell } from "@/components/scans/scans-page-shell";
 import { ScansProvidersEmptyState } from "@/components/scans/scans-providers-empty-state";
@@ -21,35 +23,41 @@ import { ContentLayout } from "@/components/ui";
 import {
   buildProviderScheduleSummary,
   buildSchedulesByProviderId,
+  getScanScheduleCapability,
   isScheduleConfigured,
 } from "@/lib/schedules";
+import { isCloud } from "@/lib/shared/env";
 import {
+  FilterType,
   ProviderProps,
   SCAN_JOBS_TAB,
   SCAN_TRIGGER,
   ScanProps,
   SearchParamsProps,
 } from "@/types";
-import type { ScanScheduleCapability } from "@/types/schedules";
+import {
+  SCAN_SCHEDULE_CAPABILITY,
+  type ScanScheduleCapability,
+} from "@/types/schedules";
 
 const ACTIVE_SCAN_COUNT_PAGE_SIZE = 1;
-// Pending schedule rows are derived from provider schedules, but must honor the
-// same provider filters as real scan rows. Keep these filter keys typed locally
-// without narrowing the global SearchParamsProps shape used by Next pages.
+// Pending schedule rows must honor the same provider filters as real scan rows.
+// The `__in` keys reuse the shared FilterType; the singular variants have no
+// FilterType equivalent, so they stay as literals.
 const PENDING_ROW_PROVIDER_FILTER = {
-  PROVIDER_UID_IN: "provider_uid__in",
-  PROVIDER_UID: "provider_uid",
-  PROVIDER_TYPE_IN: "provider_type__in",
+  PROVIDER_IN: FilterType.PROVIDER,
+  PROVIDER: "provider",
+  PROVIDER_TYPE_IN: FilterType.PROVIDER_TYPE,
   PROVIDER_TYPE: "provider_type",
 } as const;
 
 type PendingRowProviderFilter =
   (typeof PENDING_ROW_PROVIDER_FILTER)[keyof typeof PENDING_ROW_PROVIDER_FILTER];
 type PendingRowProviderFilterParam = `filter[${PendingRowProviderFilter}]`;
 
-const PROVIDER_UID_FILTER_KEYS = [
-  `filter[${PENDING_ROW_PROVIDER_FILTER.PROVIDER_UID_IN}]`,
-  `filter[${PENDING_ROW_PROVIDER_FILTER.PROVIDER_UID}]`,
+const PROVIDER_ID_FILTER_KEYS = [
+  `filter[${PENDING_ROW_PROVIDER_FILTER.PROVIDER_IN}]`,
+  `filter[${PENDING_ROW_PROVIDER_FILTER.PROVIDER}]`,
 ] as const satisfies ReadonlyArray<PendingRowProviderFilterParam>;
 
 const PROVIDER_TYPE_FILTER_KEYS = [
@@ -93,16 +101,16 @@ const filterProvidersForPendingRows = (
   providers: ProviderProps[],
   searchParams: SearchParamsProps,
 ): ProviderProps[] => {
-  const uids = parseCsvParam(
-    getFirstSearchParam(searchParams, PROVIDER_UID_FILTER_KEYS),
+  const ids = parseCsvParam(
+    getFirstSearchParam(searchParams, PROVIDER_ID_FILTER_KEYS),
   );
   const types = parseCsvParam(
     getFirstSearchParam(searchParams, PROVIDER_TYPE_FILTER_KEYS),
   );
 
   return providers.filter(
     (provider) =>
-      (uids.length === 0 || uids.includes(provider.attributes.uid)) &&
+      (ids.length === 0 || ids.includes(provider.id)) &&
       (types.length === 0 || types.includes(provider.attributes.provider)),
   );
 };
@@ -272,6 +280,33 @@ const SSRDataTableScans = async ({
 
   const query = (filters["filter[search]"] as string) || "";
 
+  // Advanced (Cloud) sources the Scheduled tab from /schedules; other envs keep the legacy /scans path.
+  const capability =
+    scanScheduleCapability ?? getScanScheduleCapability(isCloud());
+
+  if (
+    tab === SCAN_JOBS_TAB.SCHEDULED &&
+    capability === SCAN_SCHEDULE_CAPABILITY.ADVANCED
+  ) {
+    const schedulesPage = await getSchedulesPage({
+      page,
+      pageSize,
+      sort,
+      filters: pickScheduleProviderFilters(searchParams),
+    });
+    const { data, meta } = buildScheduledTabRows(schedulesPage, new Date());
+
+    return (
+      <ScanJobsTable
+        data={data}
+        meta={meta}
+        tab={tab}
+        hasFilters={hasUserFilters}
+        scanScheduleCapability={capability}
+      />
+    );
+  }
+
   const scansData = await getScans({
     query,
     page,

ui/components/filters/provider-account-selectors.test.tsx

@@ -1,6 +1,7 @@
 import { render } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+import { FilterType } from "@/types/filters";
 import type { ProviderProps } from "@/types/providers";
 
 import { ProviderAccountSelectors } from "./provider-account-selectors";
@@ -170,7 +171,7 @@ describe("ProviderAccountSelectors", () => {
     render(
       <ProviderAccountSelectors
         providers={providers}
-        accountFilterKey="provider_uid__in"
+        accountFilterKey={FilterType.PROVIDER_UID}
         accountValue="uid"
         paramsToDeleteOnChange={["page", "scanId"]}
       />,
@@ -229,7 +230,7 @@ describe("ProviderAccountSelectors", () => {
       <ProviderAccountSelectors
         providers={providers}
         mode="batch"
-        accountFilterKey="provider_uid__in"
+        accountFilterKey={FilterType.PROVIDER_UID}
         accountValue="uid"
         selectedProviderTypes={["aws"]}
         selectedAccounts={["123456789012", "prowler-project"]}

ui/components/filters/provider-account-selectors.tsx

@@ -5,20 +5,14 @@ import { useSearchParams } from "next/navigation";
 import { AccountsSelector } from "@/app/(prowler)/_overview/_components/accounts-selector";
 import { ProviderTypeSelector } from "@/app/(prowler)/_overview/_components/provider-type-selector";
 import { useUrlFilters } from "@/hooks/use-url-filters";
+import { type AccountFilterKey, FilterType } from "@/types/filters";
 import type { ProviderProps } from "@/types/providers";
 
-const ACCOUNT_FILTER_KEY = {
-  PROVIDER_ID: "provider_id__in",
-  PROVIDER_UID: "provider_uid__in",
-} as const;
-
 const ACCOUNT_VALUE = {
   ID: "id",
   UID: "uid",
 } as const;
 
-type AccountFilterKey =
-  (typeof ACCOUNT_FILTER_KEY)[keyof typeof ACCOUNT_FILTER_KEY];
 type AccountValue = (typeof ACCOUNT_VALUE)[keyof typeof ACCOUNT_VALUE];
 
 interface ProviderAccountSelectorsBaseProps {
@@ -97,7 +91,7 @@ const getCompatibleAccounts = ({
 
 export function ProviderAccountSelectors({
   providers,
-  accountFilterKey = ACCOUNT_FILTER_KEY.PROVIDER_ID,
+  accountFilterKey = FilterType.PROVIDER_ID,
   accountValue = ACCOUNT_VALUE.ID,
   providerSelectorClassName,
   accountSelectorClassName,