Fix page index reset on refetch

jellyfin · Feb 13, 2025 · 626f337 · 626f337
1 parent a15943a
commit 626f337
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/apps/dashboard/routes/devices/index.tsx b/src/apps/dashboard/routes/devices/index.tsx
@@ -36,7 +36,10 @@ const getUserCell = (users: UsersRecords) => function UserCell({ renderedCellVal
 
 export const Component = () => {
     const { api } = useApi();
-    const { data: devices, isLoading: isDevicesLoading } = useDevices({});
+    const { data, isLoading: isDevicesLoading, isRefetching } = useDevices({});
+    const devices = useMemo(() => (
+        data?.Items || []
+    ), [ data ]);
     const { usersById: users, names: userNames, isLoading: isUsersLoading } = useUsersDetails();
 
     const [ isDeleteConfirmOpen, setIsDeleteConfirmOpen ] = useState(false);
@@ -78,9 +81,9 @@ export const Component = () => {
     }, []);
 
     const onConfirmDeleteAll = useCallback(() => {
-        if (devices?.Items) {
+        if (devices) {
             Promise
-                .all(devices.Items.map(item => {
+                .all(devices.map(item => {
                     if (api && item.Id && api.deviceInfo.id === item.Id) {
                         return deleteDevice.mutateAsync({ id: item.Id });
                     }
@@ -93,7 +96,7 @@ export const Component = () => {
                     onCloseDeleteAllConfirmDialog();
                 });
         }
-    }, [ api, deleteDevice, devices?.Items, onCloseDeleteAllConfirmDialog ]);
+    }, [ api, deleteDevice, devices, onCloseDeleteAllConfirmDialog ]);
 
     const UserCell = getUserCell(users);
 
@@ -138,7 +141,7 @@ export const Component = () => {
         ...DEFAULT_TABLE_OPTIONS,
 
         columns,
-        data: devices?.Items || [],
+        data: devices,
 
         // State
         initialState: {
@@ -152,6 +155,9 @@ export const Component = () => {
             isLoading
         },
 
+        // Do not reset the page index when refetching data
+        autoResetPageIndex: !isRefetching,
+
         // Editing device name
         enableEditing: true,
         onEditingRowSave: ({ table, row, values }) => {