diff --git a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx index 991c6546..4dee73f8 100644 --- a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx +++ b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx @@ -110,7 +110,7 @@ const HppPerKandangTab = ({ tabId }: HppPerKandangTabProps) => { weight_max: null, period: null, sort_by: null, - show_unrecorded: null, + show_unrecorded: false, }, validationSchema: HppPerKandangFilterSchema, onSubmit: (values, { setSubmitting }) => { @@ -122,8 +122,7 @@ const HppPerKandangTab = ({ tabId }: HppPerKandangTabProps) => { weight_max: values.weight_max || undefined, period: values.period || undefined, sort_by: values.sort_by || undefined, - show_unrecorded: - values.show_unrecorded !== null ? values.show_unrecorded : undefined, + show_unrecorded: values.show_unrecorded ?? undefined, }); filterModal.closeModal(); setIsSubmitted(true); @@ -1026,7 +1025,11 @@ const HppPerKandangTab = ({ tabId }: HppPerKandangTabProps) => { if (!Array.isArray(val)) { formik.setFieldValue( 'show_unrecorded', - val?.value === 'true' || null + val?.value === 'true' + ? true + : val?.value === 'false' + ? false + : null ); } }} diff --git a/src/services/api/report/marketing-sale.ts b/src/services/api/report/marketing-sale.ts index 92c59b2c..f474adb7 100644 --- a/src/services/api/report/marketing-sale.ts +++ b/src/services/api/report/marketing-sale.ts @@ -35,7 +35,7 @@ export class MarketingSaleReportService extends BaseApiService< weight_max: weight_max, period: period, sort_by: sort_by, - show_unrecorded: show_unrecorded, + show_unrecorded: show_unrecorded ?? false, page: page, limit: limit, },