@flightctl/ui-components 0.0.5 → 0.0.10

package/dist/src/components/Device/DevicesPage/EnrollmentRequestList.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnrollmentRequestTable = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_table_1 = require("@patternfly/react-table");
@@ -14,9 +13,8 @@ const useFetch_1 = require("../../../hooks/useFetch");
 const useTranslation_1 = require("../../../hooks/useTranslation");
 const useFetchPeriodically_1 = require("../../../hooks/useFetchPeriodically");
 const useTableSelect_1 = require("../../../hooks/useTableSelect");
-const useTableSort_1 = require("../../../hooks/useTableSort");
+const useApiTableSort_1 = require("../../../hooks/useApiTableSort");
 const useTableTextSearch_1 = require("../../../hooks/useTableTextSearch");
-const generic_1 = require("../../../utils/sort/generic");
 const ApproveDeviceModal_1 = tslib_1.__importDefault(require("../../modals/ApproveDeviceModal/ApproveDeviceModal"));
 const MassDeleteDeviceModal_1 = tslib_1.__importDefault(require("../../modals/massModals/MassDeleteDeviceModal/MassDeleteDeviceModal"));
 const MassApproveDeviceModal_1 = tslib_1.__importDefault(require("../../modals/massModals/MassApproveDeviceModal/MassApproveDeviceModal"));
@@ -25,80 +23,73 @@ const EnrollmentRequestTableToolbar_1 = tslib_1.__importDefault(require("./Enrol
 const getEnrollmentColumns = (t) => [
     {
         name: t('Name'),
-        onSort: generic_1.sortByName,
+        sortableField: 'metadata.name',
+        defaultSort: true,
     },
     {
         name: t('Created'),
-        onSort: generic_1.sortByCreationDate,
+        sortableField: 'metadata.creationTimestamp',
     },
 ];
 const getSearchText = (er) => [er.metadata.name];
-const EnrollmentRequestTable = ({ pendingEnrollments, approveRefetch, deleteRefetch, }) => {
+const EnrollmentRequestList = ({ refetchDevices }) => {
     const { t } = (0, useTranslation_1.useTranslation)();
     const { remove } = (0, useFetch_1.useFetch)();
+    const enrollmentColumns = React.useMemo(() => getEnrollmentColumns(t), [t]);
+    const { getSortParams, sortField, direction } = (0, useApiTableSort_1.useApiTableSort)(enrollmentColumns);
+    const [erList, isLoading, error, refetch] = (0, useFetchPeriodically_1.useFetchPeriodically)({
+        endpoint: `enrollmentrequests?fieldSelector=!status.approval.approved${sortField ? `&sortBy=${sortField}&sortOrder=${direction}` : ''}`,
+    });
+    const pendingEnrollments = (erList === null || erList === void 0 ? void 0 : erList.items) || [];
+    const refetchWithDevices = () => {
+        refetch();
+        refetchDevices();
+    };
     const [approvingErId, setApprovingErId] = React.useState();
     const [isMassDeleteModalOpen, setIsMassDeleteModalOpen] = React.useState(false);
     const [isMassApproveModalOpen, setIsMassApproveModalOpen] = React.useState(false);
-    const enrollmentColumns = React.useMemo(() => getEnrollmentColumns(t), [t]);
     const { search, setSearch, filteredData } = (0, useTableTextSearch_1.useTableTextSearch)(pendingEnrollments, getSearchText);
-    const { getSortParams, sortedData } = (0, useTableSort_1.useTableSort)(filteredData, enrollmentColumns);
     const { onRowSelect, hasSelectedRows, isAllSelected, isRowSelected, setAllSelected } = (0, useTableSelect_1.useTableSelect)();
     const { deleteAction, deleteModal } = (0, ListPageActions_1.useDeleteListAction)({
         resourceType: 'EnrollmentRequest',
         onDelete: (enrollmentId) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
             yield remove(`enrollmentrequests/${enrollmentId}`);
-            deleteRefetch();
+            refetch();
         }),
     });
-    const currentEnrollmentRequest = pendingEnrollments.find((er) => er.metadata.name === approvingErId);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(EnrollmentRequestTableToolbar_1.default, { search: search, setSearch: setSearch, enrollments: pendingEnrollments },
-            React.createElement(react_core_1.ToolbarItem, null,
-                React.createElement(TableActions_1.default, { isDisabled: !hasSelectedRows },
-                    React.createElement(react_core_1.SelectList, null,
-                        React.createElement(react_core_1.SelectOption, { onClick: () => setIsMassApproveModalOpen(true) }, t('Approve')),
-                        React.createElement(react_core_1.SelectOption, { onClick: () => setIsMassDeleteModalOpen(true) }, t('Delete')))))),
-        React.createElement(Table_1.default, { "aria-label": t('Table for devices pending approval'), columns: enrollmentColumns, emptyFilters: filteredData.length === 0, emptyData: false, getSortParams: getSortParams, isAllSelected: isAllSelected, onSelectAll: setAllSelected },
-            React.createElement(react_table_1.Tbody, null, sortedData.map((er, index) => (React.createElement(EnrollmentRequestTableRow_1.default, { key: er.metadata.name || '', er: er, deleteAction: deleteAction, onRowSelect: onRowSelect, isRowSelected: isRowSelected, rowIndex: index, onApprove: () => {
-                    setApprovingErId(er.metadata.name);
-                } }))))),
-        deleteModal,
-        currentEnrollmentRequest && (React.createElement(ApproveDeviceModal_1.default, { enrollmentRequest: currentEnrollmentRequest, onClose: (updateList) => {
-                setApprovingErId(undefined);
-                updateList && approveRefetch();
-            } })),
-        isMassDeleteModalOpen && (React.createElement(MassDeleteDeviceModal_1.default, { onClose: () => setIsMassDeleteModalOpen(false), resources: filteredData.filter(isRowSelected), onDeleteSuccess: () => {
-                setIsMassDeleteModalOpen(false);
-                deleteRefetch();
-            } })),
-        isMassApproveModalOpen && (React.createElement(MassApproveDeviceModal_1.default, { onClose: () => setIsMassApproveModalOpen(false), pendingEnrollments: filteredData.filter(isRowSelected), onApproveSuccess: () => {
-                setAllSelected(false);
-                setIsMassApproveModalOpen(false);
-                approveRefetch();
-            } }))));
-};
-exports.EnrollmentRequestTable = EnrollmentRequestTable;
-const EnrollmentRequestList = ({ refetchDevices }) => {
-    const { t } = (0, useTranslation_1.useTranslation)();
-    const [erList, isLoading, error, refetch] = (0, useFetchPeriodically_1.useFetchPeriodically)({
-        endpoint: 'enrollmentrequests',
-    });
     if (isLoading) {
         return React.createElement(react_core_1.Spinner, { size: "md" });
     }
-    // The content only appears if there are pending enrollment requests
-    // TODO move the filter as part of the query once it's available via the API
-    const pendingEnrollments = ((erList === null || erList === void 0 ? void 0 : erList.items) || []).filter((er) => { var _a, _b; return ((_b = (_a = er.status) === null || _a === void 0 ? void 0 : _a.approval) === null || _b === void 0 ? void 0 : _b.approved) !== true; });
     if (pendingEnrollments.length === 0) {
         return null;
     }
-    const approveRefetch = () => {
-        refetch();
-        refetchDevices();
-    };
+    const currentEnrollmentRequest = pendingEnrollments.find((er) => er.metadata.name === approvingErId);
     return (React.createElement(ListPage_1.default, { title: t('Devices pending approval'), headingLevel: "h2" },
-        React.createElement(ListPageBody_1.default, { error: error, loading: false },
-            React.createElement(exports.EnrollmentRequestTable, { pendingEnrollments: pendingEnrollments, approveRefetch: approveRefetch, deleteRefetch: refetch }))));
+        React.createElement(ListPageBody_1.default, { error: error, loading: isLoading },
+            React.createElement(EnrollmentRequestTableToolbar_1.default, { search: search, setSearch: setSearch, enrollments: pendingEnrollments },
+                React.createElement(react_core_1.ToolbarItem, null,
+                    React.createElement(TableActions_1.default, { isDisabled: !hasSelectedRows },
+                        React.createElement(react_core_1.SelectList, null,
+                            React.createElement(react_core_1.SelectOption, { onClick: () => setIsMassApproveModalOpen(true) }, t('Approve')),
+                            React.createElement(react_core_1.SelectOption, { onClick: () => setIsMassDeleteModalOpen(true) }, t('Delete')))))),
+            React.createElement(Table_1.default, { "aria-label": t('Table for devices pending approval'), loading: isLoading, columns: enrollmentColumns, emptyFilters: filteredData.length === 0, emptyData: false, getSortParams: getSortParams, isAllSelected: isAllSelected, onSelectAll: setAllSelected },
+                React.createElement(react_table_1.Tbody, null, pendingEnrollments.map((er, index) => (React.createElement(EnrollmentRequestTableRow_1.default, { key: er.metadata.name || '', er: er, deleteAction: deleteAction, onRowSelect: onRowSelect, isRowSelected: isRowSelected, rowIndex: index, onApprove: () => {
+                        setApprovingErId(er.metadata.name);
+                    } }))))),
+            deleteModal,
+            currentEnrollmentRequest && (React.createElement(ApproveDeviceModal_1.default, { enrollmentRequest: currentEnrollmentRequest, onClose: (updateList) => {
+                    setApprovingErId(undefined);
+                    updateList && refetchWithDevices();
+                } })),
+            isMassDeleteModalOpen && (React.createElement(MassDeleteDeviceModal_1.default, { onClose: () => setIsMassDeleteModalOpen(false), resources: filteredData.filter(isRowSelected), onDeleteSuccess: () => {
+                    setIsMassDeleteModalOpen(false);
+                    refetch();
+                } })),
+            isMassApproveModalOpen && (React.createElement(MassApproveDeviceModal_1.default, { onClose: () => setIsMassApproveModalOpen(false), pendingEnrollments: filteredData.filter(isRowSelected), onApproveSuccess: () => {
+                    setAllSelected(false);
+                    setIsMassApproveModalOpen(false);
+                    refetchWithDevices();
+                } })))));
 };
 exports.default = EnrollmentRequestList;
 //# sourceMappingURL=EnrollmentRequestList.js.map

package/dist/src/components/Device/DevicesPage/EnrollmentRequestList.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnrollmentRequestList.js","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/EnrollmentRequestList.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"EnrollmentRequestList.js","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/EnrollmentRequestList.tsx"],"names":[],"mappings":"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"}

package/dist/src/components/Device/DevicesPage/useDeviceBackendFilters.d.ts

@@ -1,6 +1,8 @@
 import { FilterStatusMap } from './types';
 import { FlightCtlLabel } from '../../../types/extraTypes';
 export declare const useDeviceBackendFilters: () => {
+    nameOrAlias: string | undefined;
+    setNameOrAlias: (nameOrAlias: string) => void;
     activeStatuses: FilterStatusMap;
     setActiveStatuses: (activeStatuses: FilterStatusMap) => void;
     ownerFleets: string[];

package/dist/src/components/Device/DevicesPage/useDeviceBackendFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDeviceBackendFilters.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDeviceBackendFilters.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAkB3D,eAAO,MAAM,uBAAuB;;wCAoEf,eAAe;;kCAPlB,MAAM,EAAE;;gCAcb,cAAc,EAAE;;CAkB5B,CAAC"}
+{"version":3,"file":"useDeviceBackendFilters.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDeviceBackendFilters.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAiB3D,eAAO,MAAM,uBAAuB;;kCAmFlB,MAAM;;wCAdH,eAAe;;kCAPlB,MAAM,EAAE;;gCAcb,cAAc,EAAE;;CA8B5B,CAAC"}

package/dist/src/components/Device/DevicesPage/useDeviceBackendFilters.js

@@ -6,12 +6,10 @@ const React = tslib_1.__importStar(require("react"));
 const types_1 = require("@flightctl/types");
 const devices_1 = require("../../../utils/status/devices");
 const useAppContext_1 = require("../../../hooks/useAppContext");
-const enrollmentRequest_1 = require("../../../utils/status/enrollmentRequest");
 const labels_1 = require("../../../utils/labels");
 const validAppStatuses = Object.values(types_1.ApplicationsSummaryStatusType);
 const validUpdatedStatuses = Object.values(types_1.DeviceUpdatedStatusType);
 const validDeviceStatuses = Object.values(types_1.DeviceSummaryStatusType);
-validDeviceStatuses.push(enrollmentRequest_1.EnrollmentRequestStatus.Pending);
 const getNewParams = (currentParams, newValues) => {
     let newParams = [...currentParams.entries()];
     const keys = Object.keys(newValues);
@@ -26,6 +24,7 @@ const useDeviceBackendFilters = () => {
     const [searchParams, setSearchParams] = useSearchParams();
     const paramsRef = React.useRef(searchParams);
     const ownerFleets = searchParams.getAll(devices_1.FilterSearchParams.Fleet) || undefined;
+    const nameOrAlias = searchParams.get(devices_1.FilterSearchParams.NameOrAlias) || undefined;
     const updateSearchParams = React.useCallback((params) => {
         const urlParams = new URLSearchParams(params);
         paramsRef.current = urlParams;
@@ -79,8 +78,16 @@ const useDeviceBackendFilters = () => {
     const setSelectedLabels = React.useCallback((labels) => {
         updateSearchParams(getNewParams(paramsRef.current, { [devices_1.FilterSearchParams.Label]: labels.map(labels_1.labelToString) }));
     }, [updateSearchParams]);
-    const hasFiltersEnabled = !!selectedLabels.length || !!ownerFleets.length || Object.values(activeStatuses).some((s) => !!s.length);
+    const setNameOrAlias = React.useCallback((nameOrAlias) => {
+        updateSearchParams(getNewParams(paramsRef.current, { [devices_1.FilterSearchParams.NameOrAlias]: [nameOrAlias] }));
+    }, [updateSearchParams]);
+    const hasFiltersEnabled = !!nameOrAlias ||
+        !!selectedLabels.length ||
+        !!ownerFleets.length ||
+        Object.values(activeStatuses).some((s) => !!s.length);
     return {
+        nameOrAlias,
+        setNameOrAlias,
         activeStatuses,
         setActiveStatuses,
         ownerFleets,

package/dist/src/components/Device/DevicesPage/useDeviceBackendFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDeviceBackendFilters.js","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDeviceBackendFilters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDeviceBackendFilters.js","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDeviceBackendFilters.ts"],"names":[],"mappings":"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"}

package/dist/src/components/Device/DevicesPage/useDevices.d.ts

@@ -2,9 +2,12 @@ import { Device, DevicesSummary } from '@flightctl/types';
 import { FlightCtlLabel } from '../../../types/extraTypes';
 import { FilterStatusMap } from './types';
 type DevicesEndpointArgs = {
+    nameOrAlias?: string;
     ownerFleets?: string[];
     activeStatuses?: FilterStatusMap;
     labels?: FlightCtlLabel[];
+    sortField?: string;
+    direction?: string;
     summaryOnly?: boolean;
 };
 export declare const useDevicesEndpoint: (args: DevicesEndpointArgs) => [string, boolean];
@@ -12,10 +15,13 @@ export declare const useDevicesSummary: ({ ownerFleets, labels, }: {
     ownerFleets?: string[] | undefined;
     labels?: FlightCtlLabel[] | undefined;
 }) => [DevicesSummary | undefined, boolean];
-export declare const useDevices: ({ ownerFleets, activeStatuses, labels, }: {
-    ownerFleets?: string[] | undefined;
-    activeStatuses?: FilterStatusMap | undefined;
-    labels?: FlightCtlLabel[] | undefined;
+export declare const useDevices: (args: {
+    nameOrAlias?: string;
+    ownerFleets?: string[];
+    activeStatuses?: FilterStatusMap;
+    labels?: FlightCtlLabel[];
+    sortField?: string;
+    direction?: string;
 }) => [Device[], boolean, unknown, boolean, VoidFunction, FlightCtlLabel[]];
 export {};
 //# sourceMappingURL=useDevices.d.ts.map

package/dist/src/components/Device/DevicesPage/useDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDevices.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDevices.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAc,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkB1C,KAAK,mBAAmB,GAAG;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAuBF,eAAO,MAAM,kBAAkB,SAAU,mBAAmB,KAAG,CAAC,MAAM,EAAE,OAAO,CAI9E,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;MAM1B,CAAC,cAAc,GAAG,SAAS,EAAE,OAAO,CAOvC,CAAC;AAEF,eAAO,MAAM,UAAU;;;;MAQnB,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,CA6BvE,CAAC"}
+{"version":3,"file":"useDevices.d.ts","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDevices.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAc,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAKjF,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,KAAK,mBAAmB,GAAG;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AA8CF,eAAO,MAAM,kBAAkB,SAAU,mBAAmB,KAAG,CAAC,MAAM,EAAE,OAAO,CAI9E,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;MAM1B,CAAC,cAAc,GAAG,SAAS,EAAE,OAAO,CAOvC,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,KAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,CA6BvE,CAAC"}

package/dist/src/components/Device/DevicesPage/useDevices.js

@@ -2,40 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDevices = exports.useDevicesSummary = exports.useDevicesEndpoint = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
+const React = tslib_1.__importStar(require("react"));
 const use_debounce_1 = require("use-debounce");
+const types_1 = require("@flightctl/types");
 const devices_1 = require("../../../utils/status/devices");
-const useFetchPeriodically_1 = require("../../../hooks/useFetchPeriodically");
+const queryUtils = tslib_1.__importStar(require("../../../utils/query"));
 const labels_1 = require("../../../utils/labels");
-const setLabelParams = (params, labels) => {
-    if (labels === null || labels === void 0 ? void 0 : labels.length) {
-        const labelSelector = labels.reduce((acc, curr) => {
-            if (!acc) {
-                acc = `${curr.key}=${curr.value || ''}`;
-            }
-            else {
-                acc += `,${curr.key}=${curr.value || ''}`;
-            }
-            return acc;
-        }, '');
-        params.append('labelSelector', labelSelector);
-    }
-};
-const getDevicesEndpoint = ({ ownerFleets, activeStatuses, labels, summaryOnly }) => {
+const useFetchPeriodically_1 = require("../../../hooks/useFetchPeriodically");
+const getDevicesEndpoint = ({ nameOrAlias, ownerFleets, activeStatuses, labels, sortField, direction, summaryOnly, }) => {
     const filterByAppStatus = activeStatuses === null || activeStatuses === void 0 ? void 0 : activeStatuses[devices_1.FilterSearchParams.AppStatus];
     const filterByDevStatus = activeStatuses === null || activeStatuses === void 0 ? void 0 : activeStatuses[devices_1.FilterSearchParams.DeviceStatus];
     const filterByUpdateStatus = activeStatuses === null || activeStatuses === void 0 ? void 0 : activeStatuses[devices_1.FilterSearchParams.UpdatedStatus];
-    const params = new URLSearchParams();
+    const fieldSelectors = [];
+    queryUtils.addQueryConditions(fieldSelectors, 'status.applicationsSummary.status', filterByAppStatus);
+    queryUtils.addQueryConditions(fieldSelectors, 'status.summary.status', filterByDevStatus);
+    queryUtils.addQueryConditions(fieldSelectors, 'status.updated.status', filterByUpdateStatus);
+    if (nameOrAlias) {
+        queryUtils.addTextContainsCondition(fieldSelectors, 'metadata.nameoralias', nameOrAlias);
+    }
     if (ownerFleets === null || ownerFleets === void 0 ? void 0 : ownerFleets.length) {
-        params.set('owner', ownerFleets.map((fleet) => `Fleet/${fleet}`).join(','));
+        queryUtils.addQueryConditions(fieldSelectors, 'metadata.owner', ownerFleets.map((fleet) => `Fleet/${fleet}`));
+    }
+    const params = new URLSearchParams();
+    if (fieldSelectors.length > 0) {
+        params.set('fieldSelector', fieldSelectors.join(','));
     }
-    filterByAppStatus === null || filterByAppStatus === void 0 ? void 0 : filterByAppStatus.forEach((appSt) => params.append('statusFilter', `applications.summary.status=${appSt}`));
-    filterByDevStatus === null || filterByDevStatus === void 0 ? void 0 : filterByDevStatus.forEach((devSt) => params.append('statusFilter', `summary.status=${devSt}`));
-    filterByUpdateStatus === null || filterByUpdateStatus === void 0 ? void 0 : filterByUpdateStatus.forEach((updSt) => params.append('statusFilter', `updated.status=${updSt}`));
-    setLabelParams(params, labels);
+    queryUtils.setLabelParams(params, labels);
     if (summaryOnly) {
         params.set('summaryOnly', 'true');
     }
+    if (sortField) {
+        params.set('sortBy', sortField);
+        params.set('sortOrder', direction || types_1.SortOrder.ASC);
+    }
     return params.size ? `devices?${params.toString()}` : 'devices';
 };
 const useDevicesEndpoint = (args) => {
@@ -52,15 +51,15 @@ const useDevicesSummary = ({ ownerFleets, labels, }) => {
     return [deviceList === null || deviceList === void 0 ? void 0 : deviceList.summary, listLoading];
 };
 exports.useDevicesSummary = useDevicesSummary;
-const useDevices = ({ ownerFleets, activeStatuses, labels, }) => {
+const useDevices = (args) => {
     const [deviceLabelList] = (0, useFetchPeriodically_1.useFetchPeriodically)({
         endpoint: 'devices',
     });
-    const [devicesEndpoint, devicesDebouncing] = (0, exports.useDevicesEndpoint)({ ownerFleets, activeStatuses, labels });
+    const [devicesEndpoint, devicesDebouncing] = (0, exports.useDevicesEndpoint)(args);
     const [devicesList, devicesLoading, devicesError, devicesRefetch, updating] = (0, useFetchPeriodically_1.useFetchPeriodically)({
         endpoint: devicesEndpoint,
     });
-    const allLabels = react_1.default.useMemo(() => {
+    const allLabels = React.useMemo(() => {
         const labelsSet = new Set();
         deviceLabelList === null || deviceLabelList === void 0 ? void 0 : deviceLabelList.items.forEach((device) => {
             const deviceLabels = (0, labels_1.fromAPILabel)(device.metadata.labels || {}).filter((label) => label.key !== 'alias');

package/dist/src/components/Device/DevicesPage/useDevices.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDevices.js","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDevices.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDevices.js","sourceRoot":"","sources":["../../../../../src/components/Device/DevicesPage/useDevices.ts"],"names":[],"mappings":"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"}

package/dist/src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.css

@@ -0,0 +1,10 @@
+
+/* The default color is too light */
+.fctl-pendingdevices-badge {
+  --pf-v5-c-badge--m-unread--BackgroundColor: var(--pf-v5-global--active-color--100)
+}
+
+/* For the dark theme, we need to put it back to the correct value */
+.pf-v5-theme-dark .fctl-pendingdevices-badge {
+  --pf-v5-c-badge--m-unread--BackgroundColor: var(--pf-v5-global--active-color--300)
+}

package/dist/src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import './PendingEnrollmentRequestsBadge.css';
+declare const PendingEnrollmentRequestsBadge: () => React.JSX.Element | null;
+export default PendingEnrollmentRequestsBadge;
+//# sourceMappingURL=PendingEnrollmentRequestsBadge.d.ts.map

package/dist/src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PendingEnrollmentRequestsBadge.d.ts","sourceRoot":"","sources":["../../../../src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,sCAAsC,CAAC;AAE9C,QAAA,MAAM,8BAA8B,gCAenC,CAAC;AAEF,eAAe,8BAA8B,CAAC"}

package/dist/src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_core_1 = require("@patternfly/react-core");
+const useTranslation_1 = require("../../hooks/useTranslation");
+const usePendingEnrollmentRequestsCount_1 = require("../../hooks/usePendingEnrollmentRequestsCount");
+const WithTooltip_1 = tslib_1.__importDefault(require("../common/WithTooltip"));
+require("./PendingEnrollmentRequestsBadge.css");
+const PendingEnrollmentRequestsBadge = () => {
+    const { t } = (0, useTranslation_1.useTranslation)();
+    const [count] = (0, usePendingEnrollmentRequestsCount_1.usePendingEnrollmentRequestsCount)();
+    if (count === 0) {
+        return null;
+    }
+    const text = t('{{ count }} devices pending approval', { count });
+    return (React.createElement(react_core_1.Badge, { className: "fctl-pending-ers-badge pf-v5-u-ml-lg", screenReaderText: text },
+        React.createElement(WithTooltip_1.default, { showTooltip: true, content: text },
+            React.createElement("span", null, count))));
+};
+exports.default = PendingEnrollmentRequestsBadge;
+//# sourceMappingURL=PendingEnrollmentRequestsBadge.js.map

package/dist/src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PendingEnrollmentRequestsBadge.js","sourceRoot":"","sources":["../../../../src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAA+C;AAE/C,+DAA4D;AAC5D,qGAAkG;AAClG,gFAAgD;AAEhD,gDAA8C;AAE9C,MAAM,8BAA8B,GAAG,GAAG,EAAE;IAC1C,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,qEAAiC,GAAE,CAAC;IACpD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,CAAC,sCAAsC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAClE,OAAO,CACL,oBAAC,kBAAK,IAAC,SAAS,EAAC,sCAAsC,EAAC,gBAAgB,EAAE,IAAI;QAC5E,oBAAC,qBAAW,IAAC,WAAW,QAAC,OAAO,EAAE,IAAI;YACpC,kCAAO,KAAK,CAAQ,CACR,CACR,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,8BAA8B,CAAC"}

package/dist/src/components/Fleet/FleetDetails/FleetDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FleetDevices.d.ts","sourceRoot":"","sources":["../../../../../src/components/Fleet/FleetDetails/FleetDevices.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAalD,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;CAChC;AAyED,QAAA,MAAM,YAAY,gCAAiC,iBAAiB,sBAoBnE,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"FleetDevices.d.ts","sourceRoot":"","sources":["../../../../../src/components/Fleet/FleetDetails/FleetDevices.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAalD,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;CAChC;AAyED,QAAA,MAAM,YAAY,gCAAiC,iBAAiB,sBAcnE,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/src/components/Fleet/FleetDetails/FleetDevices.js

@@ -34,13 +34,13 @@ const DevicesByDeviceStatusChart = ({ fleetId, deviceStatus, }) => {
     return React.createElement(DonutChart_1.default, { title: t('Device status'), data: deviceStatusData, helperText: (0, utils_1.getDeviceStatusHelperText)(t) });
 };
 const FleetDevices = ({ devicesSummary, fleetId }) => {
-    return (React.createElement(react_core_1.Grid, { hasGutter: true },
-        devicesSummary.applicationStatus && (React.createElement(react_core_1.GridItem, { md: 6 },
-            React.createElement(DevicesByAppStatusChart, { fleetId: fleetId, applicationStatus: devicesSummary.applicationStatus }))),
-        devicesSummary.summaryStatus && (React.createElement(react_core_1.GridItem, { md: 6 },
-            React.createElement(DevicesByDeviceStatusChart, { fleetId: fleetId, deviceStatus: devicesSummary.summaryStatus }))),
-        devicesSummary.updateStatus && (React.createElement(react_core_1.GridItem, { md: 6 },
-            React.createElement(DevicesByUpdateStatusChart, { fleetId: fleetId, updateStatus: devicesSummary.updateStatus })))));
+    return (React.createElement(react_core_1.Flex, { justifyContent: { default: 'justifyContentSpaceAround' } },
+        React.createElement(react_core_1.FlexItem, null,
+            React.createElement(DevicesByAppStatusChart, { fleetId: fleetId, applicationStatus: devicesSummary.applicationStatus })),
+        React.createElement(react_core_1.FlexItem, null,
+            React.createElement(DevicesByDeviceStatusChart, { fleetId: fleetId, deviceStatus: devicesSummary.summaryStatus })),
+        React.createElement(react_core_1.FlexItem, null,
+            React.createElement(DevicesByUpdateStatusChart, { fleetId: fleetId, updateStatus: devicesSummary.updateStatus }))));
 };
 exports.default = FleetDevices;
 //# sourceMappingURL=FleetDevices.js.map

package/dist/src/components/Fleet/FleetDetails/FleetDevices.js.map

@@ -1 +1 @@
-{"version":3,"file":"FleetDevices.js","sourceRoot":"","sources":["../../../../../src/components/Fleet/FleetDetails/FleetDevices.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FleetDevices.js","sourceRoot":"","sources":["../../../../../src/components/Fleet/FleetDetails/FleetDevices.tsx"],"names":[],"mappings":"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"}

package/dist/src/components/Fleet/FleetsPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FleetsPage.d.ts","sourceRoot":"","sources":["../../../../src/components/Fleet/FleetsPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA0L/B,QAAA,MAAM,UAAU,yBAef,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"FleetsPage.d.ts","sourceRoot":"","sources":["../../../../src/components/Fleet/FleetsPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA2L/B,QAAA,MAAM,UAAU,yBAyBf,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/src/components/Fleet/FleetsPage.js

@@ -6,15 +6,10 @@ const react_core_1 = require("@patternfly/react-core");
 const react_table_1 = require("@patternfly/react-table");
 const topology_icon_1 = require("@patternfly/react-icons/dist/js/icons/topology-icon");
 const react_i18next_1 = require("react-i18next");
-const useFetchPeriodically_1 = require("../../hooks/useFetchPeriodically");
 const ListPage_1 = tslib_1.__importDefault(require("../ListPage/ListPage"));
 const ListPageBody_1 = tslib_1.__importDefault(require("../ListPage/ListPageBody"));
-const generic_1 = require("../../utils/sort/generic");
-const fleet_1 = require("../../utils/sort/fleet");
 const TableTextSearch_1 = tslib_1.__importDefault(require("../Table/TableTextSearch"));
 const Table_1 = tslib_1.__importDefault(require("../Table/Table"));
-const useTableTextSearch_1 = require("../../hooks/useTableTextSearch");
-const useTableSort_1 = require("../../hooks/useTableSort");
 const useTableSelect_1 = require("../../hooks/useTableSelect");
 const TableActions_1 = tslib_1.__importDefault(require("../Table/TableActions"));
 const resource_1 = require("../../utils/resource");
@@ -25,6 +20,8 @@ const useTranslation_1 = require("../../hooks/useTranslation");
 const useNavigate_1 = require("../../hooks/useNavigate");
 const DeleteFleetModal_1 = tslib_1.__importDefault(require("./DeleteFleetModal/DeleteFleetModal"));
 const FleetResourceSyncs_1 = tslib_1.__importDefault(require("./FleetResourceSyncs"));
+const useApiTableSort_1 = require("../../hooks/useApiTableSort");
+const useFleets_1 = require("./useFleets");
 const FleetPageActions = ({ createText }) => {
     const { t } = (0, useTranslation_1.useTranslation)();
     const navigate = (0, useNavigate_1.useNavigate)();
@@ -49,45 +46,40 @@ const FleetEmptyState = () => {
 const getColumns = (t) => [
     {
         name: t('Name'),
-        onSort: generic_1.sortByName,
+        sortableField: 'metadata.name',
+        defaultSort: true,
     },
     {
         name: t('System image'),
-        onSort: fleet_1.sortFleetsByOSImg,
+        sortableField: 'spec.template.spec.os.image',
     },
     {
         name: t('Devices'),
     },
     {
         name: t('Status'),
-        onSort: fleet_1.sortByStatus,
     },
 ];
-const getSearchText = (fleet) => [fleet.metadata.name];
-const FleetTable = ({ fleetLoad }) => {
+const FleetTable = ({ name, setName, hasFiltersEnabled, getSortParams, fleetColumns, fleetLoad }) => {
     const { t } = (0, useTranslation_1.useTranslation)();
     const [isMassDeleteModalOpen, setIsMassDeleteModalOpen] = React.useState(false);
     const [fleetToDeleteId, setFleetToDeleteId] = React.useState();
-    const [fleetList, loading, error, refetch] = fleetLoad;
-    const columns = React.useMemo(() => getColumns(t), [t]);
-    const fleets = (fleetList === null || fleetList === void 0 ? void 0 : fleetList.items) || [];
-    const { search, setSearch, filteredData } = (0, useTableTextSearch_1.useTableTextSearch)(fleets, getSearchText);
-    const { getSortParams, sortedData: sortedFleets } = (0, useTableSort_1.useTableSort)(filteredData, columns);
+    const [fleets, loading, error, isFilterUpdating, refetch] = fleetLoad;
     const { onRowSelect, isAllSelected, hasSelectedRows, isRowSelected, setAllSelected } = (0, useTableSelect_1.useTableSelect)();
     return (React.createElement(ListPageBody_1.default, { error: error, loading: loading },
         React.createElement(react_core_1.Toolbar, { inset: { default: 'insetNone' } },
             React.createElement(react_core_1.ToolbarContent, null,
                 React.createElement(react_core_1.ToolbarGroup, null,
                     React.createElement(react_core_1.ToolbarItem, { variant: "search-filter" },
-                        React.createElement(TableTextSearch_1.default, { value: search, setValue: setSearch, placeholder: t('Search by name') }))),
+                        React.createElement(TableTextSearch_1.default, { value: name, setValue: setName, placeholder: t('Search by name') }))),
                 React.createElement(react_core_1.ToolbarItem, null,
                     React.createElement(FleetPageActions, { createText: t('Create fleet') })),
                 React.createElement(react_core_1.ToolbarItem, null,
                     React.createElement(TableActions_1.default, { isDisabled: !hasSelectedRows },
                         React.createElement(react_core_1.SelectList, null,
                             React.createElement(react_core_1.SelectOption, { onClick: () => setIsMassDeleteModalOpen(true) }, t('Delete'))))))),
-        React.createElement(Table_1.default, { "aria-label": t('Fleets table'), columns: columns, emptyFilters: filteredData.length === 0, emptyData: fleets.length === 0, getSortParams: getSortParams, isAllSelected: isAllSelected, onSelectAll: setAllSelected },
-            React.createElement(react_table_1.Tbody, null, sortedFleets.map((fleet, rowIndex) => (React.createElement(FleetRow_1.default, { key: (0, resource_1.getResourceId)(fleet), fleet: fleet, rowIndex: rowIndex, onDeleteClick: () => {
+        React.createElement(Table_1.default, { "aria-label": t('Fleets table'), loading: isFilterUpdating, columns: fleetColumns, emptyFilters: !hasFiltersEnabled, emptyData: fleets.length === 0, getSortParams: getSortParams, isAllSelected: isAllSelected, onSelectAll: setAllSelected },
+            React.createElement(react_table_1.Tbody, null, fleets.map((fleet, rowIndex) => (React.createElement(FleetRow_1.default, { key: (0, resource_1.getResourceId)(fleet), fleet: fleet, rowIndex: rowIndex, onDeleteClick: () => {
                     setFleetToDeleteId(fleet.metadata.name || '');
                 }, isRowSelected: isRowSelected, onRowSelect: onRowSelect }))))),
         fleets.length === 0 && React.createElement(FleetEmptyState, null),
@@ -97,20 +89,22 @@ const FleetTable = ({ fleetLoad }) => {
                 }
                 setFleetToDeleteId(undefined);
             } })),
-        isMassDeleteModalOpen && (React.createElement(MassDeleteFleetModal_1.default, { onClose: () => setIsMassDeleteModalOpen(false), fleets: sortedFleets.filter(isRowSelected), onDeleteSuccess: () => {
+        isMassDeleteModalOpen && (React.createElement(MassDeleteFleetModal_1.default, { onClose: () => setIsMassDeleteModalOpen(false), fleets: fleets.filter(isRowSelected), onDeleteSuccess: () => {
                 setIsMassDeleteModalOpen(false);
                 refetch();
             } }))));
 };
 const FleetsPage = () => {
-    var _a;
     const { t } = (0, useTranslation_1.useTranslation)();
     // TODO move the fetch down to FleetTable when the API includes the filter for pending / errored resource syncs
-    const fleetLoad = (0, useFetchPeriodically_1.useFetchPeriodically)({ endpoint: 'fleets?addDevicesCount=true' });
+    const columns = React.useMemo(() => getColumns(t), [t]);
+    const { name, setName, hasFiltersEnabled } = (0, useFleets_1.useFleetBackendFilters)();
+    const { getSortParams, sortField, direction } = (0, useApiTableSort_1.useApiTableSort)(columns);
+    const fleetLoad = (0, useFleets_1.useFleets)({ name, addDevicesCount: true, sortField, direction });
     return (React.createElement(React.Fragment, null,
-        React.createElement(FleetResourceSyncs_1.default, { fleets: ((_a = fleetLoad[0]) === null || _a === void 0 ? void 0 : _a.items) || [] }),
+        React.createElement(FleetResourceSyncs_1.default, { fleets: fleetLoad[0] || [] }),
         React.createElement(ListPage_1.default, { title: t('Fleets') },
-            React.createElement(FleetTable, { fleetLoad: fleetLoad }))));
+            React.createElement(FleetTable, { name: name, setName: setName, hasFiltersEnabled: hasFiltersEnabled, getSortParams: getSortParams, fleetLoad: fleetLoad, fleetColumns: columns }))));
 };
 exports.default = FleetsPage;
 //# sourceMappingURL=FleetsPage.js.map