mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-25 15:55:48 +00:00
Merge branch 'dev/hotfix/restu' into 'development'
[HOTFIX/FE] Fix Meta Page on Penjualan Table Fetching See merge request mbugroup/lti-web-client!312
This commit is contained in:
@@ -49,7 +49,7 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
|
|||||||
color={expenseStatusBadgeColor}
|
color={expenseStatusBadgeColor}
|
||||||
text={isLatestApprovalRejected ? 'Ditolak' : (approval?.step_name ?? '')}
|
text={isLatestApprovalRejected ? 'Ditolak' : (approval?.step_name ?? '')}
|
||||||
className={{
|
className={{
|
||||||
badge: 'w-fit',
|
badge: 'whitespace-nowrap max-w-max w-fit',
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ const RealizationStatusBadge = ({ approval }: RealizationStatusBadgeProps) => {
|
|||||||
color={realizationStatusBadgeColor}
|
color={realizationStatusBadgeColor}
|
||||||
text={isLatestApprovalRejected ? 'Ditolak' : realizationStatus}
|
text={isLatestApprovalRejected ? 'Ditolak' : realizationStatus}
|
||||||
className={{
|
className={{
|
||||||
badge: 'w-fit',
|
badge: 'whitespace-nowrap max-w-max w-fit',
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -623,7 +623,10 @@ const MarketingTable = () => {
|
|||||||
data={allData}
|
data={allData}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
pageSize={tableFilterState.pageSize}
|
pageSize={tableFilterState.pageSize}
|
||||||
page={tableFilterState.page}
|
page={isResponseSuccess(marketing) ? marketing?.meta?.page : 1}
|
||||||
|
totalItems={
|
||||||
|
isResponseSuccess(marketing) ? marketing?.meta?.total_results : 0
|
||||||
|
}
|
||||||
isLoading={isLoadingMarketing}
|
isLoading={isLoadingMarketing}
|
||||||
className={{
|
className={{
|
||||||
containerClassName: cn('p-3', {
|
containerClassName: cn('p-3', {
|
||||||
|
|||||||
Reference in New Issue
Block a user