@openmrs/esm-metadataexport-app 4.4.1-pre.809 → 4.4.1-pre.836

package/src/packages/packages.resource.ts

@@ -1,17 +1,24 @@
 import useSWR from 'swr';
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl, useOpenmrsPagination } from '@openmrs/esm-framework';
 import type { ExportBuildStatus, ExportPackage, ExportPackageRequest, ExportPackageBuild } from '../types';
 
-export function useAllPackages(includeRetired = false) {
+const packagesUrl = `${restBaseUrl}/metadataexport/packages`;
+
+// useOpenmrsPagination keys the SWR cache with absolute URLs, so match on inclusion rather than prefix.
+export const isPackagesCacheKey = (key: unknown) => typeof key === 'string' && key.includes(packagesUrl);
+
+export function usePackages(pageSize: number, includeRetired = false) {
   // entries and latestBuild are only present in the full representation.
   const apiUrl = `${restBaseUrl}/metadataexport/packages?includeAll=${includeRetired}&v=full`;
-  const { data, error, isLoading, isValidating, mutate } = useSWR<
-    FetchResponse<{ results: Array<ExportPackage> }>,
-    Error
-  >(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating, currentPage, currentPageSize, totalCount, goTo, mutate } =
+    useOpenmrsPagination<ExportPackage>(apiUrl, pageSize, { swrConfig: { keepPreviousData: true } });
 
   return {
-    packages: data?.data?.results ?? [],
+    packages: data ?? [],
+    totalCount,
+    currentPage,
+    currentPageSize,
+    goTo,
     isLoading,
     isValidating,
     error,

package/translations/en.json

@@ -28,6 +28,7 @@
   "managePackages": "Manage packages",
   "metadataexport": "Metadata Export",
   "newpackage": "New Package",
+  "nextPage": "Next page",
   "noBuilds": "No builds",
   "noBuildsYet": "No builds yet",
   "notStarted": "Not started",
@@ -44,6 +45,7 @@
   "packageUpdated": "Package updated",
   "packageUpdatedSubtitle": "{{name}} was updated successfully",
   "packageUpdateFailed": "Failed to update package",
+  "previousPage": "Previous page",
   "QUEUED": "Queued",
   "reason": "Reason",
   "reasonPlaceholder": "Enter a reason for deleting this package",

package/translations/ru_RU.json

@@ -19,12 +19,12 @@
   "details": "Подробнее",
   "domains": "Домены",
   "download": "Скачать",
-  "edit": "Edit",
+  "edit": "Изменить",
   "errorLoadingDomains": "Ошибка загрузки",
-  "errorLoadingPackage": "Error loading package",
+  "errorLoadingPackage": "Ошибка при загрузке пакета",
   "FAILED": "Ошибка",
   "loadingBuilds": "Загружаю сборки...",
-  "loadingPackage": "Loading package…",
+  "loadingPackage": "Загружаю пакет...",
   "managePackages": "Управление",
   "metadataexport": "Экспорт Метаданных",
   "newpackage": "Новый",
@@ -41,15 +41,15 @@
   "packageNamePlaceholder": "напр. Основные справочные данные",
   "packages": "Пакеты",
   "packages__lower": "пакеты",
-  "packageUpdated": "Package updated",
-  "packageUpdatedSubtitle": "{{name}} was updated successfully",
-  "packageUpdateFailed": "Failed to update package",
+  "packageUpdated": "Пакет обновлен",
+  "packageUpdatedSubtitle": "{{name}} обновлен",
+  "packageUpdateFailed": "Сбой при обновлении пакета",
   "QUEUED": "Запланировано",
   "reason": "Причина",
   "reasonPlaceholder": "Введите причину удаления пакета",
   "RUNNING": "Выполняется",
-  "saveChanges": "Save changes",
-  "saving": "Saving",
+  "saveChanges": "Сохранить изменения",
+  "saving": "Сохраняю",
   "selectAll": "Все",
   "startedAgo": "Начато {{time}} назад",
   "status": "Состояние",