diff --git a/apps/st/src/components/statistics/verification/detail/Indicators.tsx b/apps/st/src/components/statistics/verification/detail/Indicators.tsx index f311e1667..30cc56552 100644 --- a/apps/st/src/components/statistics/verification/detail/Indicators.tsx +++ b/apps/st/src/components/statistics/verification/detail/Indicators.tsx @@ -65,21 +65,15 @@ const Indicators: React.FC = ({ anlsSn, vrfcTrgtSn }) => { return (
- + + + - - - - + +
diff --git a/apps/st/src/components/statistics/verification/detail/RegionalGrid.tsx b/apps/st/src/components/statistics/verification/detail/RegionalGrid.tsx index 8f5c420da..eeea43b3a 100644 --- a/apps/st/src/components/statistics/verification/detail/RegionalGrid.tsx +++ b/apps/st/src/components/statistics/verification/detail/RegionalGrid.tsx @@ -46,11 +46,6 @@ const RegionalGrid: React.FC = ({ selectedRowId, appliedFilter, }) => { - const [selectedSido, setSelectedSido] = useState(""); - const [selectedGugun, setSelectedGugun] = useState(""); - const [selectedStatus, setSelectedStatus] = useState(""); - const [showAllOnEmptyFilter, setShowAllOnEmptyFilter] = - useState(true); const [isDownloading, setIsDownloading] = useState(false); const [gridRowData, setGridRowData] = useState< @@ -58,7 +53,7 @@ const RegionalGrid: React.FC = ({ >([]); const { data: sidoData } = useStAnlsSidoCombo(); - const { data: gugunData } = useStAnlsSigunguCombo(selectedSido); + const { data: gugunData } = useStAnlsSigunguCombo(appliedFilter.sido ?? ""); const sidoOptions = sidoData ?? EMPTY_ADST_LIST; const gugunOptions = gugunData ?? EMPTY_ADST_LIST; @@ -69,14 +64,7 @@ const RegionalGrid: React.FC = ({ const rowData = useMemo(() => { let data = (resultData?.content ?? []) as StAnlsRsltResponse[]; - - if ( - !appliedFilter.sido && - !appliedFilter.gugun && - !appliedFilter.status - ) { - data = showAllOnEmptyFilter ? data : []; - } else { + { const sidoCd = appliedFilter.sido; if (sidoCd) { data = data.filter((item) => @@ -116,32 +104,18 @@ const RegionalGrid: React.FC = ({ })); return mappedData; - }, [resultData, appliedFilter, showAllOnEmptyFilter]); + }, [resultData, appliedFilter]); const handleSidoChange = (val: string) => { - setSelectedSido(val); - setSelectedGugun(""); - }; - - const handleSearch = () => { - onFilterChange({ - sido: selectedSido, - gugun: selectedGugun, - status: selectedStatus, - }); - setShowAllOnEmptyFilter(false); + onFilterChange({ ...appliedFilter, sido: val, gugun: "" }); }; const handleReset = () => { - setSelectedSido(""); - setSelectedGugun(""); - setSelectedStatus(""); onFilterChange({ sido: "", gugun: "", status: "", }); - setShowAllOnEmptyFilter(true); }; const handleDownload = async () => { @@ -182,7 +156,7 @@ const RegionalGrid: React.FC = ({