diff --git a/package.json b/package.json index 273891ed..ac577a73 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "module", "dependencies": { "@headlessui/react": "^1.7.17", - "@pzh-ui/components": "^0.0.570", + "@pzh-ui/components": "^0.0.572", "@pzh-ui/config": "^0.0.70", "@pzh-ui/css": "^0.0.100", "@pzh-ui/icons": "^0.0.69", diff --git a/src/pages/protected/Modules/ModulesOverview/ModulesOverview.tsx b/src/pages/protected/Modules/ModulesOverview/ModulesOverview.tsx index 3c171ab4..f056e53d 100644 --- a/src/pages/protected/Modules/ModulesOverview/ModulesOverview.tsx +++ b/src/pages/protected/Modules/ModulesOverview/ModulesOverview.tsx @@ -95,7 +95,8 @@ const TabContent = ({ type, activeTab }: TabContentProps) => { (sortBy?.[0]?.id as ModuleSortColumn) || 'Modified_Date', sort_order: sortBy?.[0]?.desc ? 'DESC' : 'ASC', limit: PAGE_LIMIT, - offset: (currPage - 1) * PAGE_LIMIT, + offset: + ((type === 'archive' ? pageIndex : currPage) - 1) * PAGE_LIMIT, }, { query: { @@ -179,7 +180,7 @@ const TabContent = ({ type, activeTab }: TabContentProps) => { {!!modules?.total && !!modules?.limit && modules.total > modules.limit && ( -