π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-830] chore: project filter dropdown custom date select option improvement (#4069)
Anmol Singh Bhatiae7fc942514e8
diff --git a/web/components/headers/projects.tsx b/web/components/headers/projects.tsxindex 2f502bce59..64c370d17f 100644--- a/web/components/headers/projects.tsx+++ b/web/components/headers/projects.tsx@@ -57,6 +57,7 @@ export const ProjectsHeader = observer(() => {if (Array.isArray(value))value.forEach((val) => {if (!newValues.includes(val)) newValues.push(val);+ else newValues.splice(newValues.indexOf(val), 1);});else {if (filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);diff --git a/web/components/project/dropdowns/filters/created-at.tsx b/web/components/project/dropdowns/filters/created-at.tsxindex 5a1b75c00b..8992814216 100644--- a/web/components/project/dropdowns/filters/created-at.tsx+++ b/web/components/project/dropdowns/filters/created-at.tsx@@ -5,6 +5,8 @@ import { DateFilterModal } from "@/components/core";import { FilterHeader, FilterOption } from "@/components/issues";// constantsimport { DATE_BEFORE_FILTER_OPTIONS } from "@/constants/filters";+// helpers+import { isDate } from "@/helpers/date-time.helper";type Props = {appliedFilters: string[] | null;@@ -24,6 +26,17 @@ export const FilterCreatedDate: React.FC<Props> = observer((props) => {d.name.toLowerCase().includes(searchQuery.toLowerCase()));+ const isCustomDateSelected = () => {+ const isValidDateSelected = appliedFilters?.filter((f) => isDate(f.split(";")[0])) || [];+ return isValidDateSelected.length > 0 ? true : false;+ };+ const handleCustomDate = () => {+ if (isCustomDateSelected()) {+ const updateAppliedFilters = appliedFilters?.filter((f) => f.includes("-")) || [];+ handleUpdate(updateAppliedFilters);+ } else setIsDateFilterModalOpen(true);+ };+return (<>{isDateFilterModalOpen && (@@ -52,7 +65,7 @@ export const FilterCreatedDate: React.FC<Props> = observer((props) => {multiple/>))}- <FilterOption isChecked={false} onClick={() => setIsDateFilterModalOpen(true)} title="Custom" multiple />+ <FilterOption isChecked={isCustomDateSelected()} onClick={handleCustomDate} title="Custom" multiple /></>) : (<p className="text-xs italic text-custom-text-400">No matches found</p>diff --git a/web/helpers/date-time.helper.ts b/web/helpers/date-time.helper.tsindex 7ca4d49fb1..ba594e6b16 100644--- a/web/helpers/date-time.helper.ts+++ b/web/helpers/date-time.helper.ts@@ -224,3 +224,7 @@ export const getDate = (date: string | Date | undefined | null): Date | undefinereturn undefined;}};+export const isDate = (date: string) => {+ const datePattern = /^\d{4}-\d{2}-\d{2}$/;+ return datePattern.test(date);+};