π₯π₯π₯ 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-2341] feat: Add display filters and display properties to create/update view dialog (#5451)
rahulramesha4598b1b49df9
diff --git a/web/core/components/views/form.tsx b/web/core/components/views/form.tsxindex 93b3fcbc2e..e195099dc1 100644--- a/web/core/components/views/form.tsx+++ b/web/core/components/views/form.tsx@@ -5,12 +5,12 @@ import { observer } from "mobx-react";import { Controller, useForm } from "react-hook-form";import { Layers } from "lucide-react";// types-import { IProjectView, IIssueFilterOptions } from "@plane/types";+import { IProjectView, IIssueFilterOptions, IIssueDisplayProperties, IIssueDisplayFilterOptions } from "@plane/types";// uiimport { Button, EmojiIconPicker, EmojiIconPickerTypes, Input, TextArea } from "@plane/ui";// componentsimport { Logo } from "@/components/common";-import { AppliedFiltersList, FilterSelection, FiltersDropdown } from "@/components/issues";+import { AppliedFiltersList, DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";// constantsimport { EIssueLayoutTypes, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";import { EViewAccess } from "@/constants/views";@@ -34,7 +34,7 @@ const defaultValues: Partial<IProjectView> = {description: "",access: EViewAccess.PUBLIC,display_properties: getComputedDisplayProperties(),- display_filters: getComputedDisplayFilters(),+ display_filters: { ...getComputedDisplayFilters(), group_by: "state" },};export const ProjectViewForm: React.FC<Props> = observer((props) => {@@ -224,46 +224,87 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {<AccessController control={control} /><Controllercontrol={control}- name="display_filters.layout"- render={({ field: { onChange, value } }) => (- <LayoutDropDown- onChange={(selectedValue: EIssueLayoutTypes) => onChange(selectedValue)}- value={value}- />- )}- />- <Controller- control={control}- name="filters"- render={({ field: { onChange, value: filters } }) => (- <FiltersDropdown title="Filters" tabIndex={3}>- <FilterSelection- filters={filters ?? {}}- handleFiltersUpdate={(key, value) => {- const newValues = filters?.[key] ?? [];+ name="display_filters"+ render={({ field: { onChange: onDisplayFiltersChange, value: displayFilters } }) => (+ <>+ {/* layout dropdown */}+ <LayoutDropDown+ onChange={(selectedValue: EIssueLayoutTypes) =>+ onDisplayFiltersChange({+ ...displayFilters,+ layout: selectedValue,+ })+ }+ value={displayFilters.layout}+ />++ {/* filters dropdown */}+ <Controller+ control={control}+ name="filters"+ render={({ field: { onChange, value: filters } }) => (+ <FiltersDropdown title="Filters" tabIndex={3}>+ <FilterSelection+ filters={filters ?? {}}+ handleFiltersUpdate={(key, value) => {+ const newValues = filters?.[key] ?? [];++ if (Array.isArray(value)) {+ value.forEach((val) => {+ if (!newValues.includes(val)) newValues.push(val);+ });+ } else {+ if (filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);+ else newValues.push(value);+ }- if (Array.isArray(value)) {- value.forEach((val) => {- if (!newValues.includes(val)) newValues.push(val);- });- } else {- if (filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);- else newValues.push(value);- }+ onChange({+ ...filters,+ [key]: newValues,+ });+ }}+ layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[displayFilters.layout]}+ labels={projectLabels ?? undefined}+ memberIds={projectMemberIds ?? undefined}+ states={projectStates}+ cycleViewDisabled={!currentProjectDetails?.cycle_view}+ moduleViewDisabled={!currentProjectDetails?.module_view}+ />+ </FiltersDropdown>+ )}+ />- onChange({- ...filters,- [key]: newValues,- });- }}- layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues.list}- labels={projectLabels ?? undefined}- memberIds={projectMemberIds ?? undefined}- states={projectStates}- cycleViewDisabled={!currentProjectDetails?.cycle_view}- moduleViewDisabled={!currentProjectDetails?.module_view}+ {/* display filters dropdown */}+ <Controller+ control={control}+ name="display_properties"+ render={({ field: { onChange: onDisplayPropertiesChange, value: displayProperties } }) => (+ <FiltersDropdown title="Display">+ <DisplayFiltersSelection+ layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[displayFilters.layout]}+ displayFilters={displayFilters ?? {}}+ handleDisplayFiltersUpdate={(updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {+ onDisplayFiltersChange({+ ...displayFilters,+ ...updatedDisplayFilter,+ });+ }}+ displayProperties={displayProperties ?? {}}+ handleDisplayPropertiesUpdate={(+ updatedDisplayProperties: Partial<IIssueDisplayProperties>+ ) => {+ onDisplayPropertiesChange({+ ...displayProperties,+ ...updatedDisplayProperties,+ });+ }}+ cycleViewDisabled={!currentProjectDetails?.cycle_view}+ moduleViewDisabled={!currentProjectDetails?.module_view}+ />+ </FiltersDropdown>+ )}/>- </FiltersDropdown>+ </>)}/></div>diff --git a/web/core/components/workspace/views/form.tsx b/web/core/components/workspace/views/form.tsxindex 9f792df3bc..6fce455a82 100644--- a/web/core/components/workspace/views/form.tsx+++ b/web/core/components/workspace/views/form.tsx@@ -4,11 +4,11 @@ import { useEffect } from "react";import { observer } from "mobx-react";import { Controller, useForm } from "react-hook-form";// types-import { IIssueFilterOptions, IWorkspaceView } from "@plane/types";+import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, IWorkspaceView } from "@plane/types";// uiimport { Button, Input, TextArea } from "@plane/ui";// components-import { AppliedFiltersList, FilterSelection, FiltersDropdown } from "@/components/issues";+import { AppliedFiltersList, DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";// constantsimport { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";import { EViewAccess } from "@/constants/views";@@ -155,6 +155,7 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {</div><div className="flex gap-2"><AccessController control={control} />+ {/* filters dropdown */}<Controllercontrol={control}name="filters"@@ -186,6 +187,39 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {</FiltersDropdown>)}/>++ {/* display filters dropdown */}+ <Controller+ control={control}+ name="display_filters"+ render={({ field: { onChange: onDisplayFiltersChange, value: displayFilters } }) => (+ <Controller+ control={control}+ name="display_properties"+ render={({ field: { onChange: onDisplayPropertiesChange, value: displayProperties } }) => (+ <FiltersDropdown title="Display">+ <DisplayFiltersSelection+ layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}+ displayFilters={displayFilters ?? {}}+ handleDisplayFiltersUpdate={(updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {+ onDisplayFiltersChange({+ ...displayFilters,+ ...updatedDisplayFilter,+ });+ }}+ displayProperties={displayProperties ?? {}}+ handleDisplayPropertiesUpdate={(updatedDisplayProperties: Partial<IIssueDisplayProperties>) => {+ onDisplayPropertiesChange({+ ...displayProperties,+ ...updatedDisplayProperties,+ });+ }}+ />+ </FiltersDropdown>+ )}+ />+ )}+ /></div>{selectedFilters && Object.keys(selectedFilters).length > 0 && (<div>