From b402a0670696c55331f39ce7765dc60e3983c7f0 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Wed, 8 Apr 2026 10:15:33 +0700 Subject: [PATCH 1/2] feat(FE-moment-default-range): Set default date range to current month in Dashboard component --- .../components/pages/dashboard/Dashboard.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/figma-make/components/pages/dashboard/Dashboard.tsx b/src/figma-make/components/pages/dashboard/Dashboard.tsx index f3e4b6d0..ae0d8f22 100644 --- a/src/figma-make/components/pages/dashboard/Dashboard.tsx +++ b/src/figma-make/components/pages/dashboard/Dashboard.tsx @@ -1,6 +1,7 @@ 'use client'; import { useState } from 'react'; +import moment from 'moment'; import { Card, CardContent, @@ -59,10 +60,17 @@ const CATEGORY_LABELS: { [key: string]: string } = { produksi_close: 'Produksi Close', }; +const getThisMonthRange = () => ({ + dateFrom: moment().startOf('month').format('YYYY-MM-DD'), + dateTo: moment().format('YYYY-MM-DD'), +}); + export function Dashboard() { + const defaultDateRange = getThisMonthRange(); + // Filters - const [dateFrom, setDateFrom] = useState(''); - const [dateTo, setDateTo] = useState(''); + const [dateFrom, setDateFrom] = useState(defaultDateRange.dateFrom); + const [dateTo, setDateTo] = useState(defaultDateRange.dateTo); const [kandangFilter, setKandangFilter] = useState('ALL'); const [categoryFilter, setCategoryFilter] = useState('ALL'); From 68b25332b19eb218ecf01f10793500645ef59056 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Wed, 8 Apr 2026 11:29:51 +0700 Subject: [PATCH 2/2] refactor(FE-set-to-end): Fix date range to include the end of the month --- src/figma-make/components/pages/dashboard/Dashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/figma-make/components/pages/dashboard/Dashboard.tsx b/src/figma-make/components/pages/dashboard/Dashboard.tsx index ae0d8f22..36b04cf6 100644 --- a/src/figma-make/components/pages/dashboard/Dashboard.tsx +++ b/src/figma-make/components/pages/dashboard/Dashboard.tsx @@ -62,7 +62,7 @@ const CATEGORY_LABELS: { [key: string]: string } = { const getThisMonthRange = () => ({ dateFrom: moment().startOf('month').format('YYYY-MM-DD'), - dateTo: moment().format('YYYY-MM-DD'), + dateTo: moment().endOf('month').format('YYYY-MM-DD'), }); export function Dashboard() {