π₯π₯π₯ 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-1255] chore: necessary changes for advanced views (#4955)
rahulramesha1f9f8215439f
diff --git a/packages/types/src/views.d.ts b/packages/types/src/views.d.tsindex 29db479ed9..1c61ab69c6 100644--- a/packages/types/src/views.d.ts+++ b/packages/types/src/views.d.ts@@ -36,7 +36,7 @@ export type TViewFilterProps = {created_at?: string[] | null;owned_by?: string[] | null;favorites?: boolean;- accessTypes?: EViewAccess[];+ view_type?: EViewAccess[];};export type TViewFilters = {diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsxindex fd192cc60a..fae58221a8 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx@@ -9,9 +9,10 @@ import { Breadcrumbs, PhotoFilterIcon, Button } from "@plane/ui";// componentsimport { BreadcrumbLink, Logo } from "@/components/common";import { ViewListHeader } from "@/components/views";-import { ViewAppliedFiltersList } from "@/components/views/filters/applied-filters";+import { ViewAppliedFiltersList } from "@/components/views/applied-filters";// constantsimport { EUserProjectRoles } from "@/constants/project";+import { EViewAccess } from "@/constants/views";// helpersimport { calculateTotalFilters } from "@/helpers/filter.helper";// hooks@@ -29,7 +30,7 @@ export const ProjectViewsHeader = observer(() => {const { filters, updateFilters, clearAllFilters } = useProjectView();const handleRemoveFilter = useCallback(- (key: keyof TViewFilterProps, value: string | null) => {+ (key: keyof TViewFilterProps, value: string | EViewAccess | null) => {let newValues = filters.filters?.[key];if (key === "favorites") {diff --git a/web/core/components/views/applied-filters/access.tsx b/web/core/components/views/applied-filters/access.tsxnew file mode 100644index 0000000000..6587e76f5f--- /dev/null+++ b/web/core/components/views/applied-filters/access.tsx@@ -0,0 +1,46 @@+import { observer } from "mobx-react";+// icons+import { X } from "lucide-react";+// constants+import { EViewAccess, VIEW_ACCESS_SPECIFIERS } from "@/constants/views";+// helpers++type Props = {+ editable: boolean | undefined;+ handleRemove: (val: EViewAccess) => void;+ values: EViewAccess[];+};++export const AppliedAccessFilters: React.FC<Props> = observer((props) => {+ const { editable, handleRemove, values } = props;++ const getAccessLabel = (val: EViewAccess) => {+ const value = VIEW_ACCESS_SPECIFIERS.find((option) => option.key === val);+ return value?.label;+ };++ return (+ <>+ {values.map((access) => {+ const label = getAccessLabel(access);++ if (!label) return null;++ return (+ <div key={access} className="flex items-center gap-1 rounded bg-custom-background-80 p-1 text-xs">+ <span className="normal-case">{label}</span>+ {editable && (+ <button+ type="button"+ className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"+ onClick={() => handleRemove(access)}+ >+ <X size={10} strokeWidth={2} />+ </button>+ )}+ </div>+ );+ })}+ </>+ );+});diff --git a/web/core/components/views/applied-filters/index.tsx b/web/core/components/views/applied-filters/index.tsxnew file mode 100644index 0000000000..1efe34c51e--- /dev/null+++ b/web/core/components/views/applied-filters/index.tsx@@ -0,0 +1 @@+export * from "./root";diff --git a/web/core/components/views/filters/applied-filters.tsx b/web/core/components/views/applied-filters/root.tsxsimilarity index 85%rename from web/core/components/views/filters/applied-filters.tsxrename to web/core/components/views/applied-filters/root.tsxindex d532ff61db..aeb8db96bc 100644--- a/web/core/components/views/filters/applied-filters.tsx+++ b/web/core/components/views/applied-filters/root.tsx@@ -2,19 +2,23 @@ import { X } from "lucide-react";import { TViewFilterProps } from "@plane/types";// componentsimport { AppliedDateFilters, AppliedMembersFilters } from "@/components/common/applied-filters";+// constants+import { EViewAccess } from "@/constants/views";// helpersimport { replaceUnderscoreIfSnakeCase } from "@/helpers/string.helper";+import { AppliedAccessFilters } from "./access";// typestype Props = {appliedFilters: TViewFilterProps;handleClearAllFilters: () => void;- handleRemoveFilter: (key: keyof TViewFilterProps, value: string | null) => void;+ handleRemoveFilter: (key: keyof TViewFilterProps, value: string | EViewAccess | null) => void;alwaysAllowEditing?: boolean;};const MEMBERS_FILTERS = ["owned_by"];const DATE_FILTERS = ["created_at"];+const VIEW_ACCESS_FILTERS = ["view_type"];export const ViewAppliedFiltersList: React.FC<Props> = (props) => {const { appliedFilters, handleClearAllFilters, handleRemoveFilter, alwaysAllowEditing } = props;@@ -39,6 +43,13 @@ export const ViewAppliedFiltersList: React.FC<Props> = (props) => {><div className="flex flex-wrap items-center gap-1.5"><span className="text-xs text-custom-text-300">{replaceUnderscoreIfSnakeCase(filterKey)}</span>+ {VIEW_ACCESS_FILTERS.includes(filterKey) && (+ <AppliedAccessFilters+ editable={isEditingAllowed}+ handleRemove={(val) => handleRemoveFilter(filterKey, val)}+ values={Array.isArray(value) ? (value as EViewAccess[]) : []}+ />+ )}{DATE_FILTERS.includes(filterKey) && (<AppliedDateFilterseditable={isEditingAllowed}diff --git a/web/core/store/global-view.store.ts b/web/core/store/global-view.store.tsindex 8fd883e1c7..e0d0d7a7b9 100644--- a/web/core/store/global-view.store.ts+++ b/web/core/store/global-view.store.ts@@ -277,7 +277,6 @@ export class GlobalViewStore implements IGlobalViewStore {const currentView = this.getViewDetailsById(viewId);const currentAccess = currentView?.access;try {- if (currentAccess === access) return;runInAction(() => {set(this.globalViewMap, [viewId, "access"], access);});diff --git a/web/core/store/project-view.store.ts b/web/core/store/project-view.store.tsindex 13c366a14e..f006e59080 100644--- a/web/core/store/project-view.store.ts+++ b/web/core/store/project-view.store.ts@@ -313,7 +313,6 @@ export class ProjectViewStore implements IProjectViewStore {const currentView = this.getViewById(viewId);const currentAccess = currentView?.access;try {- if (currentAccess === access) return;runInAction(() => {set(this.viewMap, [viewId, "access"], access);});diff --git a/web/helpers/project-views.helpers.ts b/web/helpers/project-views.helpers.tsindex a8fe269be8..51ff4d63b2 100644--- a/web/helpers/project-views.helpers.ts+++ b/web/helpers/project-views.helpers.ts@@ -54,8 +54,8 @@ export const shouldFilterView = (view: IProjectView, filters: TViewFilterProps |});}- if (filterKey === "accessTypes" && filters?.accessTypes && filters?.accessTypes?.length > 0) {- fallsInFilters = filters.accessTypes.includes(view.access);+ if (filterKey === "view_type" && filters?.view_type && filters?.view_type?.length > 0) {+ fallsInFilters = filters.view_type.includes(view.access);}});