Skip to content
Merged
18 changes: 10 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@mui/material": "^5.16.14",
"@mui/system": "^5.14.9",
"@mui/x-date-pickers": "^6.13.0",
"@pagopa/interop-fe-commons": "^1.4.6",
"@pagopa/interop-fe-commons": "^1.5.2",
"@pagopa/mui-italia": "^1.8.0",
"@tanstack/react-query": "^5.51.4",
"@tanstack/react-query-devtools": "^5.51.4",
Expand Down
4 changes: 3 additions & 1 deletion src/components/shared/ClientTable/ClientTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ type ClientTableProps = {

export const ClientTable: React.FC<ClientTableProps> = ({ clientKind }) => {
const { t } = useTranslation('client', { keyPrefix: 'list.filters' })
const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const { filtersParams, ...handlers } = useFilters([
{ name: 'q', type: 'freetext', label: t('nameField.label') },
])
Expand All @@ -36,6 +37,7 @@ export const ClientTable: React.FC<ClientTableProps> = ({ clientKind }) => {
</Suspense>
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(clients?.pagination.totalCount)}
/>
</>
Expand Down
4 changes: 3 additions & 1 deletion src/components/shared/KeychainsTable/KeychainsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import { AuthHooks } from '@/api/auth'

export const KeychainsTable: React.FC = () => {
const { t } = useTranslation('keychain', { keyPrefix: 'list.filters' })
const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const { jwt } = AuthHooks.useJwt()

const producerId = jwt?.organizationId as string
Expand Down Expand Up @@ -37,6 +38,7 @@ export const KeychainsTable: React.FC = () => {
</Suspense>
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(keychains?.pagination.totalCount)}
/>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export const ConsumerPurposeTemplateLinkedEServiceTable: React.FC<
})),
})

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const { filtersParams, ...filtersHandlers } = useFilters<
Omit<GetPurposeTemplateEServicesParams, 'limit' | 'offset' | 'purposeTemplateId'>
Expand Down Expand Up @@ -94,6 +95,7 @@ export const ConsumerPurposeTemplateLinkedEServiceTable: React.FC<
</Table>
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(
eserviceDescriptorsPurposeTemplateList!.pagination.totalCount
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ const ConsumerAgreementsListPage: React.FC = () => {
})),
})

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const { filtersParams, ...filtersHandlers } = useFilters<
Omit<GetConsumerAgreementsParams, 'limit' | 'offset'>
>([
Expand Down Expand Up @@ -103,6 +104,7 @@ const ConsumerAgreementsListPage: React.FC = () => {
<ConsumerAgreementsTableWrapper params={params} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(data?.pagination.totalCount)}
/>
</PageContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export const ClientPublicKeys: React.FC<ClientPublicKeysProps> = ({ clientId })
},
])

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const queryParams = {
...filtersParams,
Expand All @@ -59,7 +60,11 @@ export const ClientPublicKeys: React.FC<ClientPublicKeysProps> = ({ clientId })
<Filters {...filtersHandlers} />
<React.Suspense fallback={<ClientPublicKeysTableSkeleton />}>
<ClientPublicKeysWrapper params={queryParams} />
<Pagination {...paginationProps} totalPages={totalPageCount} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPageCount}
/>
</React.Suspense>
</>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ const ConsumerLinkedPurposeTemplatesTab: React.FC = () => {
},
])

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

// Ensure eserviceId is always present in query params
const queryParams: GetCatalogPurposeTemplatesParams = {
Expand Down Expand Up @@ -92,7 +93,11 @@ const ConsumerLinkedPurposeTemplatesTab: React.FC = () => {
>
<Filters {...filtersHandlers} />
<ConsumerLinkedPurposeTemplatesTableWrapper params={queryParams} />
<Pagination {...paginationProps} totalPages={totalPageCount} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPageCount}
/>
</SectionContainer>
</>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ const ConsumerPurposeTemplateListPage: React.FC = () => {
},
])

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const queryParams = { ...paginationParams, ...filtersParams }

const { data } = useQuery({
Expand All @@ -147,6 +148,7 @@ const ConsumerPurposeTemplateListPage: React.FC = () => {
<PurposeTemplateTableWrapper data={data} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(data?.pagination.totalCount)}
/>
</PageContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ const ConsumerPurposesListPage: React.FC = () => {
})),
})

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const { filtersParams, ...filtersHandlers } = useFilters<
Omit<GetConsumerPurposesParams, 'limit' | 'offset'>
>([
Expand Down Expand Up @@ -137,7 +138,11 @@ const ConsumerPurposesListPage: React.FC = () => {
>
<Filters {...filtersHandlers} />
<PurposesTableWrapper params={params} />
<Pagination {...paginationProps} totalPages={totalPages} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPages}
/>
</PageContainer>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export const DelegationsGrantedTab: React.FC = () => {
const { isAdmin, jwt } = AuthHooks.useJwt()
const currentUserOrganizationId = jwt?.organizationId

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const defaultParams: Pick<GetDelegationsParams, 'delegatorIds'> = {
delegatorIds: [currentUserOrganizationId as string],
Expand Down Expand Up @@ -53,7 +54,11 @@ export const DelegationsGrantedTab: React.FC = () => {
<React.Suspense fallback={<DelegationsTableSkeleton delegationType="DELEGATION_GRANTED" />}>
<DelegationsTable delegationType="DELEGATION_GRANTED" params={queryParams} />
</React.Suspense>
<Pagination {...paginationProps} totalPages={totalPageCount} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPageCount}
/>
</>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { DelegationQueries } from '@/api/delegation'

export const DelegationsReceivedTab: React.FC = () => {
const { jwt } = AuthHooks.useJwt()
const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const params: GetDelegationsParams = {
...paginationParams,
Expand All @@ -32,7 +33,11 @@ export const DelegationsReceivedTab: React.FC = () => {
>
<DelegationsTable params={params} delegationType={'DELEGATION_RECEIVED'} />
</React.Suspense>
<Pagination {...paginationProps} totalPages={totalPageCount} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPageCount}
/>
</>
)
}
9 changes: 7 additions & 2 deletions src/pages/NotificationsPage/Notifications.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ const NotificationsPage: React.FC = () => {
},
])

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const queryParams = { ...paginationParams, ...filtersParams }

const { data: totalPageCount = 0, isLoading } = useQuery({
Expand Down Expand Up @@ -96,7 +97,11 @@ const NotificationsPage: React.FC = () => {
<>
<Filters {...filtersHandlers} />
<NotificationsTableWrapper params={params} />
<Pagination {...paginationProps} totalPages={totalPageCount} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPageCount}
/>
</>
))
.with({ isLoading: false, hasData: false }, () => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const ProviderAgreementsListPage: React.FC = () => {
})),
})

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()
const { filtersParams, ...filtersHandlers } = useFilters<
Omit<GetProducerAgreementsParams, 'limit' | 'offset'>
>([
Expand Down Expand Up @@ -97,6 +98,7 @@ const ProviderAgreementsListPage: React.FC = () => {
<ProviderAgreementsTableWrapper params={params} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(data?.pagination.totalCount)}
/>
</PageContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ type ProviderEServiceKeychainsTableProps = {
export const ProviderEServiceKeychainsTable: React.FC<ProviderEServiceKeychainsTableProps> = ({
eserviceId,
}) => {
const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const params: GetProducerKeychainsParams = {
eserviceId: eserviceId,
Expand All @@ -35,6 +36,7 @@ export const ProviderEServiceKeychainsTable: React.FC<ProviderEServiceKeychainsT
</React.Suspense>
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(associatedKeychainsTotalCount)}
/>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ const ProviderEServiceListPage: React.FC = () => {
})),
})

const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const { filtersParams, ...filtersHandlers } = useFilters<
Omit<GetProducerEServicesParams, 'limit' | 'offset'>
>([
Expand Down Expand Up @@ -85,7 +87,12 @@ const ProviderEServiceListPage: React.FC = () => {
>
<Filters {...filtersHandlers} />
<EServiceTableWrapper params={queryParams} />
<Pagination {...paginationProps} totalPages={totalPageCount} />
<Pagination
pageNum={paginationProps.pageNum}
onPageChange={paginationProps.onPageChange}
rowPerPageOptions={rowPerPageOptions}
totalPages={totalPageCount}
/>
<ProviderEServiceImportVersionDrawer isOpen={isOpen} onClose={closeDrawer} />
</PageContainer>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ type ProviderEServiceTemplateUsingTenantsTableProps = {
export const ProviderEServiceTemplateUsingTenantsTable: React.FC<
ProviderEServiceTemplateUsingTenantsTableProps
> = ({ eserviceTemplateId, eserviceTemplateVersions }) => {
const { paginationParams, paginationProps, getTotalPageCount } = usePagination({ limit: 10 })
const { paginationParams, paginationProps, getTotalPageCount, rowPerPageOptions } =
usePagination()

const { t: tTemplate } = useTranslation('eserviceTemplate', { keyPrefix: 'list.filters' })

Expand Down Expand Up @@ -68,7 +69,11 @@ export const ProviderEServiceTemplateUsingTenantsTable: React.FC<
noTableData={isDataEmpty && areFiltersEmpty}
/>
</React.Suspense>
<Pagination {...paginationProps} totalPages={getTotalPageCount(templateInstancesCount)} />
<Pagination
{...paginationProps}
rowPerPageOptions={rowPerPageOptions}
totalPages={getTotalPageCount(templateInstancesCount)}
/>
</>
)
}
Expand Down
Loading
Loading