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:
Rivaldi A N S
2026-02-05 06:00:35 +00:00
3 changed files with 6 additions and 3 deletions
@@ -49,7 +49,7 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
color={expenseStatusBadgeColor}
text={isLatestApprovalRejected ? 'Ditolak' : (approval?.step_name ?? '')}
className={{
badge: 'w-fit',
badge: 'whitespace-nowrap max-w-max w-fit',
}}
/>
);
@@ -29,7 +29,7 @@ const RealizationStatusBadge = ({ approval }: RealizationStatusBadgeProps) => {
color={realizationStatusBadgeColor}
text={isLatestApprovalRejected ? 'Ditolak' : realizationStatus}
className={{
badge: 'w-fit',
badge: 'whitespace-nowrap max-w-max w-fit',
}}
/>
);
@@ -623,7 +623,10 @@ const MarketingTable = () => {
data={allData}
columns={columns}
pageSize={tableFilterState.pageSize}
page={tableFilterState.page}
page={isResponseSuccess(marketing) ? marketing?.meta?.page : 1}
totalItems={
isResponseSuccess(marketing) ? marketing?.meta?.total_results : 0
}
isLoading={isLoadingMarketing}
className={{
containerClassName: cn('p-3', {