Merge branch 'development' of github.com:hotosm/fmtm into feat/pulse-…

…problematic-entity
hotosm · Jan 17, 2025 · 7ec94e8 · 7ec94e8
2 parents 58b52d6 + feae2a2
commit 7ec94e8
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 60 deletions.
diff --git a/src/frontend/src/api/task.ts b/src/frontend/src/api/task.ts
@@ -2,11 +2,14 @@ import { AppDispatch } from '@/store/Store';
 import CoreModules from '@/shared/CoreModules';
 import { TaskActions } from '@/store/slices/TaskSlice';
 
-export const getDownloadProjectSubmission = (url: string, projectName: string) => {
+export const getDownloadProjectSubmission = (
+  url: string,
+  projectName: string,
+  params: { project_id: string; export_json: boolean; submitted_date_range: string | null },
+) => {
   return async (dispatch: AppDispatch) => {
-    const params = new URLSearchParams(url.split('?')[1]);
-    const isExportJson = params.get('export_json');
-    const isJsonOrCsv = isExportJson === 'true' ? 'json' : 'csv';
+    const isExportJson = params.export_json;
+    const isJsonOrCsv = isExportJson ? 'json' : 'csv';
     dispatch(
       TaskActions.GetDownloadProjectSubmissionLoading({
         type: isJsonOrCsv,
@@ -16,12 +19,10 @@ export const getDownloadProjectSubmission = (url: string, projectName: string) =
 
     const getProjectSubmission = async (url: string) => {
       try {
-        const response = await CoreModules.axios.get(url, {
-          responseType: 'blob',
-        });
+        const response = await CoreModules.axios.get(url, { params, responseType: 'blob' });
         var a = document.createElement('a');
         a.href = window.URL.createObjectURL(response.data);
-        a.download = isExportJson === 'true' ? `${projectName}.json` : `${projectName}.zip`;
+        a.download = isExportJson ? `${projectName}.json` : `${projectName}.zip`;
         a.click();
       } catch (error) {
       } finally {

diff --git a/src/frontend/src/components/ProjectSubmissions/ProjectSubmissionsSkeletonLoader.tsx b/src/frontend/src/components/ProjectSubmissions/ProjectSubmissionsSkeletonLoader.tsx
@@ -29,8 +29,8 @@ export const SubmissionsTableSkeletonLoader = () => {
       {Array.from({ length: 10 }).map((_, i) => (
         <div key={i} className={`fmtm-flex fmtm-gap-10 fmtm-py-[6px]`}>
           <CoreModules.Skeleton baseColor={`${i === 0 ? '#cfcfcf' : ''}`} className={`!fmtm-w-[50px]`} />
-          {Array.from({ length: 15 }).map(() => (
-            <CoreModules.Skeleton baseColor={`${i === 0 ? '#cfcfcf' : ''}`} key={i} className={`!fmtm-w-[100px]`} />
+          {Array.from({ length: 15 }).map((_, ind) => (
+            <CoreModules.Skeleton baseColor={`${i === 0 ? '#cfcfcf' : ''}`} key={ind} className={`!fmtm-w-[100px]`} />
           ))}
         </div>
       ))}

diff --git a/src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx b/src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx
@@ -11,7 +11,7 @@ import windowDimention from '@/hooks/WindowDimension';
 import Button from '@/components/common/Button';
 import { Modal } from '@/components/common/Modal';
 import { CustomSelect } from '@/components/common/Select.js';
-import CustomDatePicker from '@/components/common/CustomDatePicker';
+import DateRangePicker from '@/components/common/DateRangePicker';
 import Table, { TableHeader } from '@/components/common/CustomTable';
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/common/Dropdown';
 import { SubmissionsTableSkeletonLoader } from '@/components/ProjectSubmissions/ProjectSubmissionsSkeletonLoader.js';
@@ -40,7 +40,7 @@ const SubmissionsTable = ({ toggleView }) => {
     task_id: searchParams.get('task_id') ? searchParams?.get('task_id') || null : null,
     submitted_by: searchParams.get('submitted_by'),
     review_state: searchParams.get('review_state'),
-    submitted_date: searchParams.get('submitted_date'),
+    submitted_date_range: searchParams.get('submitted_date_range'),
   };
   const [filter, setFilter] = useState<filterType>(initialFilterState);
 
@@ -71,20 +71,25 @@ const SubmissionsTable = ({ toggleView }) => {
   };
   const taskList = projectData[projectIndex]?.taskBoundries;
 
-  const [numberOfFilters, setNumberOfFilters] = useState<number>(0);
   const [paginationPage, setPaginationPage] = useState<number>(1);
   const [submittedBy, setSubmittedBy] = useState<string | null>(null);
+  const [dateRange, setDateRange] = useState<{ start: Date | null; end: Date | null }>({
+    start: initialFilterState?.submitted_date_range
+      ? new Date(initialFilterState.submitted_date_range.split(',')[0])
+      : null,
+    end: initialFilterState?.submitted_date_range
+      ? new Date(initialFilterState.submitted_date_range.split(',')[1])
+      : null,
+  });
 
   useEffect(() => {
-    let count = 0;
-    const filters = Object.keys(filter);
-    filters?.map((fltr) => {
-      if (filter[fltr]) {
-        count = count + 1;
-      }
-    });
-    setNumberOfFilters(count);
-  }, [filter]);
+    if (!dateRange.start || !dateRange.end) return;
+
+    setFilter((prev) => ({
+      ...prev,
+      submitted_date_range: `${format(new Date(dateRange.start as Date), 'yyyy-MM-dd')},${format(new Date(dateRange.end as Date), 'yyyy-MM-dd')}`,
+    }));
+  }, [dateRange]);
 
   const updatedSubmissionFormFields = submissionFormFields
     //filter necessary fields only
@@ -164,7 +169,8 @@ const SubmissionsTable = ({ toggleView }) => {
 
   const clearFilters = () => {
     setSearchParams({ tab: 'table' });
-    setFilter({ task_id: null, submitted_by: null, review_state: null, submitted_date: null });
+    setFilter({ task_id: null, submitted_by: null, review_state: null, submitted_date_range: null });
+    setDateRange({ start: null, end: null });
   };
 
   function getValueByPath(obj: any, path: string) {
@@ -204,21 +210,13 @@ const SubmissionsTable = ({ toggleView }) => {
   };
 
   const handleDownload = (downloadType: 'csv' | 'json') => {
-    if (downloadType === 'csv') {
-      dispatch(
-        getDownloadProjectSubmission(
-          `${import.meta.env.VITE_API_URL}/submission/download?project_id=${projectId}&export_json=false`,
-          projectInfo.name!,
-        ),
-      );
-    } else if (downloadType === 'json') {
-      dispatch(
-        getDownloadProjectSubmission(
-          `${import.meta.env.VITE_API_URL}/submission/download?project_id=${projectId}&export_json=true`,
-          projectInfo.name!,
-        ),
-      );
-    }
+    dispatch(
+      getDownloadProjectSubmission(`${import.meta.env.VITE_API_URL}/submission/download`, projectInfo.name!, {
+        project_id: projectId,
+        submitted_date_range: filter?.submitted_date_range,
+        export_json: downloadType === 'json',
+      }),
+    );
   };
 
   const handleTaskMap = async () => {
@@ -271,7 +269,7 @@ const SubmissionsTable = ({ toggleView }) => {
               >
                 <AssetModules.TuneIcon style={{ fontSize: '20px' }} /> <p>FILTER</p>{' '}
                 <div className="fmtm-text-sm fmtm-bg-primaryRed fmtm-text-white fmtm-rounded-full fmtm-w-4 fmtm-h-4 fmtm-flex fmtm-justify-center fmtm-items-center">
-                  <p>{numberOfFilters}</p>
+                  <p>{Object.values(filter).filter((filterObjValue) => filterObjValue).length}</p>
                 </div>
               </button>
             </DropdownMenuTrigger>
@@ -285,7 +283,7 @@ const SubmissionsTable = ({ toggleView }) => {
                     placeholder="Select"
                     data={taskInfo}
                     dataKey="value"
-                    value={filter?.task_id?.toString() || undefined}
+                    value={filter?.task_id?.toString() || ''}
                     valueKey="task_id"
                     label="task_id"
                     onValueChange={(value) => value && setFilter((prev) => ({ ...prev, task_id: value.toString() }))}
@@ -298,7 +296,7 @@ const SubmissionsTable = ({ toggleView }) => {
                     placeholder="Select"
                     data={reviewStateData}
                     dataKey="value"
-                    value={filter?.review_state || undefined}
+                    value={filter?.review_state || ''}
                     valueKey="value"
                     label="label"
                     onValueChange={(value) =>
@@ -308,13 +306,13 @@ const SubmissionsTable = ({ toggleView }) => {
                     className="fmtm-text-grey-700 fmtm-text-sm !fmtm-mb-0 fmtm-bg-white"
                   />
                 </div>
-                <div className={`${windowSize.width < 500 ? 'fmtm-w-full' : 'fmtm-w-[11rem]'}`}>
-                  <CustomDatePicker
+                <div className={`${windowSize.width < 500 ? 'fmtm-w-full' : 'fmtm-w-[12rem]'}`}>
+                  <DateRangePicker
                     title="Submitted Date"
-                    selectedDate={filter?.submitted_date}
-                    setSelectedDate={(date) =>
-                      setFilter((prev) => ({ ...prev, submitted_date: format(new Date(date), 'yyyy-MM-dd') }))
-                    }
+                    startDate={dateRange?.start}
+                    endDate={dateRange?.end}
+                    setStartDate={(date) => setDateRange((prev) => ({ ...prev, start: date }))}
+                    setEndDate={(date) => setDateRange((prev) => ({ ...prev, end: date }))}
                     className="fmtm-text-grey-700 fmtm-text-sm !fmtm-mb-0 fmtm-w-full"
                   />
                 </div>

diff --git a/...rc/components/common/CustomDatePicker.tsx → ...src/components/common/DateRangePicker.tsx b/...rc/components/common/CustomDatePicker.tsx → ...src/components/common/DateRangePicker.tsx
@@ -2,22 +2,32 @@ import React from 'react';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 
-type CustomDatePickerType = {
+type DateRangePickerType = {
   title: string;
   className: string;
-  selectedDate: string | null;
-  setSelectedDate: (date: Date) => void;
+  setStartDate: (date: Date | null) => void;
+  setEndDate: (date: Date | null) => void;
+  startDate: Date | null;
+  endDate: Date | null;
 };
 
-const CustomDatePicker = ({ title, className, selectedDate, setSelectedDate }: CustomDatePickerType) => {
+const DateRangePicker = ({ title, className, setStartDate, setEndDate, startDate, endDate }: DateRangePickerType) => {
+  const onChange = (dates: [Date | null, Date | null]) => {
+    const [start, end] = dates;
+    setStartDate(start);
+    setEndDate(end);
+  };
   return (
     <div className="fmtm-z-[10000] fmtm-w-full">
       {title && (
         <p className={`fmtm-text-[1rem] fmtm-mb-2 fmtm-font-semibold !fmtm-bg-transparent ${className}`}>{title}</p>
       )}
       <DatePicker
-        selected={selectedDate}
-        onChange={(date) => setSelectedDate(date)}
+        selected={startDate}
+        onChange={onChange}
+        startDate={startDate}
+        endDate={endDate}
+        selectsRange
         className="fmtm-outline-none fmtm-border-[1px] fmtm-border-gray-300 fmtm-h-[2rem] fmtm-w-full fmtm-z-50 fmtm-px-2 fmtm-text-base fmtm-pt-1 hover"
         placeholderText="YYYY/MM/DD"
         dateFormat="yyyy/MM/dd"
@@ -26,4 +36,4 @@ const CustomDatePicker = ({ title, className, selectedDate, setSelectedDate }: C
   );
 };
 
-export default CustomDatePicker;
+export default DateRangePicker;
diff --git a/src/frontend/src/components/common/Select.tsx b/src/frontend/src/components/common/Select.tsx
@@ -97,7 +97,7 @@ interface ICustomSelect {
   placeholder: string;
   data: any;
   dataKey: string;
-  value?: string | undefined;
+  value?: string;
   valueKey: string;
   label: string;
   onValueChange?: (value: string | null | number) => void;

diff --git a/src/frontend/src/index.css b/src/frontend/src/index.css
@@ -247,12 +247,16 @@ button {
 .react-datepicker-popper {
   z-index: 9000;
 }
-.react-datepicker__day--selected {
-  background-color: #d73f3e;
+.react-datepicker__day--selected,
+.react-datepicker__day--in-range {
+  background-color: #d73f3e !important;
+}
+.react-datepicker__day--in-selecting-range {
+  background-color: #df6565 !important;
 }
 .react-datepicker__day--selected:hover {
-  background-color: #bc2c2c;
+  background-color: #bc2c2c !important;
 }
 .react-datepicker__day--keyboard-selected {
-  background-color: #fcc2c2;
+  background-color: #fcc2c2 !important;
 }
diff --git a/src/frontend/src/store/types/ISubmissions.ts b/src/frontend/src/store/types/ISubmissions.ts
@@ -38,7 +38,7 @@ export type filterType = {
   task_id: string | null;
   submitted_by: string | null;
   review_state: string | null;
-  submitted_date: string | null;
+  submitted_date_range: string | null;
 };
 
 type mappedVsValidatedTaskType = {