π₯π₯π₯ 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: public and unlocked views (#4932)
rahulramesha635efeab7b62
diff --git a/packages/types/src/views.d.ts b/packages/types/src/views.d.tsindex 9415f7488f..6ce598168b 100644--- a/packages/types/src/views.d.ts+++ b/packages/types/src/views.d.ts@@ -1,3 +1,4 @@+import { EViewAccess } from "@/constants/views";import { TLogoProps } from "./common";import {IIssueDisplayFilterOptions,@@ -7,7 +8,7 @@ import {export interface IProjectView {id: string;- access: string;+ access: EViewAccess;created_at: Date;updated_at: Date;is_favorite: boolean;@@ -23,4 +24,6 @@ export interface IProjectView {project: string;workspace: string;logo_props: TLogoProps | undefined;+ is_locked: boolean;+ owned_by: string;}diff --git a/packages/types/src/workspace-views.d.ts b/packages/types/src/workspace-views.d.tsindex e270f4f692..5bc9007676 100644--- a/packages/types/src/workspace-views.d.ts+++ b/packages/types/src/workspace-views.d.ts@@ -1,3 +1,4 @@+import { EViewAccess } from "@/constants/views";import {IWorkspaceViewProps,IIssueDisplayFilterOptions,@@ -7,7 +8,7 @@ import {export interface IWorkspaceView {id: string;- access: string;+ access: EViewAccess;created_at: Date;updated_at: Date;is_favorite: boolean;@@ -22,6 +23,8 @@ export interface IWorkspaceView {query_data: IWorkspaceViewProps;project: string;workspace: string;+ is_locked: boolean;+ owned_by: string;workspace_detail?: {id: string;name: string;diff --git a/packages/ui/src/dropdown/common/button.tsx b/packages/ui/src/dropdown/common/button.tsxindex c0a4627e9f..39d9cd5383 100644--- a/packages/ui/src/dropdown/common/button.tsx+++ b/packages/ui/src/dropdown/common/button.tsx@@ -31,7 +31,7 @@ export const DropdownButton: React.FC<IMultiSelectDropdownButton | ISingleSelect)}onClick={handleOnClick}>- {buttonContent ? <>{buttonContent(isOpen)}</> : <span className={cn("", buttonClassName)}>{value}</span>}+ {buttonContent ? <>{buttonContent(isOpen, value)}</> : <span className={cn("", buttonClassName)}>{value}</span>}</button></Combobox.Button>);diff --git a/packages/ui/src/dropdown/common/options.tsx b/packages/ui/src/dropdown/common/options.tsxindex f17a431a14..5448f7b7f1 100644--- a/packages/ui/src/dropdown/common/options.tsx+++ b/packages/ui/src/dropdown/common/options.tsx@@ -22,6 +22,7 @@ export const DropdownOptions: React.FC<IMultiSelectDropdownOptions | ISingleSeledisableSearch,keyExtractor,options,+ handleClose,value,renderItem,loader,@@ -46,7 +47,7 @@ export const DropdownOptions: React.FC<IMultiSelectDropdownOptions | ISingleSeleoptions?.map((option) => (<Combobox.Optionkey={keyExtractor(option)}- value={option.data[option.value]}+ value={keyExtractor(option)}className={({ active, selected }) =>cn("flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5",@@ -58,14 +59,15 @@ export const DropdownOptions: React.FC<IMultiSelectDropdownOptions | ISingleSeleoption.className && option.className({ active, selected }))}+ onClick={handleClose}>{({ selected }) => (<>{renderItem ? (- <>{renderItem({ value: option.data[option.value], selected })}</>+ <>{renderItem({ value: keyExtractor(option), selected })}</>) : (<>- <span className="flex-grow truncate">{value}</span>+ <span className="flex-grow truncate">{option.value}</span>{selected && <Check className="h-3.5 w-3.5 flex-shrink-0" />}</>)}diff --git a/packages/ui/src/dropdown/dropdown.d.ts b/packages/ui/src/dropdown/dropdown.d.tsindex 1f109add6f..8264bda21e 100644--- a/packages/ui/src/dropdown/dropdown.d.ts+++ b/packages/ui/src/dropdown/dropdown.d.ts@@ -10,7 +10,7 @@ export interface IDropdown {disabled?: boolean;// button props- buttonContent?: (isOpen: boolean) => React.ReactNode;+ buttonContent?: (isOpen: boolean, value: string | string[] | undefined) => React.ReactNode;buttonContainerClassName?: string;buttonClassName?: string;@@ -24,8 +24,8 @@ export interface IDropdown {// options propskeyExtractor: (option: TDropdownOption) => string;optionsContainerClassName?: string;- queryArray: string[];- sortByKey: string;+ queryArray?: string[];+ sortByKey?: string;firstItem?: (optionValue: string) => boolean;renderItem?: ({ value, selected }: { value: string; selected: boolean }) => React.ReactNode;loader?: React.ReactNode;@@ -52,7 +52,7 @@ export interface ISingleSelectDropdown extends IDropdown {export interface IDropdownButton {isOpen: boolean;- buttonContent?: (isOpen: boolean) => React.ReactNode;+ buttonContent?: (isOpen: boolean, value: string | string[] | undefined) => React.ReactNode;buttonClassName?: string;buttonContainerClassName?: string;handleOnClick: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;@@ -79,6 +79,8 @@ export interface IDropdownOptions {inputContainerClassName?: string;disableSearch?: boolean;+ handleClose?: () => void;+keyExtractor: (option: TDropdownOption) => string;renderItem: (({ value, selected }: { value: string; selected: boolean }) => React.ReactNode) | undefined;options: TDropdownOption[] | undefined;diff --git a/packages/ui/src/dropdown/multi-select.tsx b/packages/ui/src/dropdown/multi-select.tsxindex 08bc586386..3b51351173 100644--- a/packages/ui/src/dropdown/multi-select.tsx+++ b/packages/ui/src/dropdown/multi-select.tsx@@ -90,10 +90,12 @@ export const MultiSelectDropdown: FC<IMultiSelectDropdown> = (props) => {const sortedOptions = useMemo(() => {if (!options) return undefined;- const filteredOptions = (options || []).filter((options) => {- const queryString = queryArray.map((query) => options.data[query]).join(" ");- return queryString.toLowerCase().includes(query.toLowerCase());- });+ const filteredOptions = queryArray+ ? (options || []).filter((options) => {+ const queryString = queryArray.map((query) => options.data[query]).join(" ");+ return queryString.toLowerCase().includes(query.toLowerCase());+ })+ : options;if (disableSorting) return filteredOptions;diff --git a/packages/ui/src/dropdown/single-select.tsx b/packages/ui/src/dropdown/single-select.tsxindex 045296873f..06987e10ff 100644--- a/packages/ui/src/dropdown/single-select.tsx+++ b/packages/ui/src/dropdown/single-select.tsx@@ -90,12 +90,14 @@ export const Dropdown: FC<ISingleSelectDropdown> = (props) => {const sortedOptions = useMemo(() => {if (!options) return undefined;- const filteredOptions = (options || []).filter((options) => {- const queryString = queryArray.map((query) => options.data[query]).join(" ");- return queryString.toLowerCase().includes(query.toLowerCase());- });+ const filteredOptions = queryArray+ ? (options || []).filter((options) => {+ const queryString = queryArray.map((query) => options.data[query]).join(" ");+ return queryString.toLowerCase().includes(query.toLowerCase());+ })+ : options;- if (disableSorting) return filteredOptions;+ if (disableSorting || !sortByKey) return filteredOptions;return sortBy(filteredOptions, [(option) => firstItem && firstItem(option.data[option.value]),@@ -136,7 +138,7 @@ export const Dropdown: FC<ISingleSelectDropdown> = (props) => {<Combobox.Options className="fixed z-10" static><divclassName={cn(- "my-1 w-48 rounded border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2.5 text-xs shadow-custom-shadow-rg focus:outline-none",+ "my-1 w-48 rounded border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2 text-xs shadow-custom-shadow-rg focus:outline-none",optionsContainerClassName)}ref={setPopperElement}@@ -157,6 +159,7 @@ export const Dropdown: FC<ISingleSelectDropdown> = (props) => {value={value}renderItem={renderItem}loader={loader}+ handleClose={handleClose}/></div></Combobox.Options>diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsxindex 8f2d238201..7629812fd8 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx@@ -4,10 +4,11 @@ import { useCallback } from "react";import { observer } from "mobx-react";import Link from "next/link";import { useParams } from "next/navigation";+import { Earth, Lock } from "lucide-react";// typesimport { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";// ui-import { Breadcrumbs, Button, CustomMenu, PhotoFilterIcon } from "@plane/ui";+import { Breadcrumbs, Button, CustomMenu, PhotoFilterIcon, Tooltip } from "@plane/ui";// componentsimport { BreadcrumbLink, Logo } from "@/components/common";import { DisplayFiltersSelection, FiltersDropdown, FilterSelection, LayoutSelection } from "@/components/issues";@@ -19,6 +20,7 @@ import {ISSUE_DISPLAY_FILTERS_BY_LAYOUT,} from "@/constants/issue";import { EUserProjectRoles } from "@/constants/project";+import { EViewAccess } from "@/constants/views";// helpersimport { calculateTotalFilters } from "@/helpers/filter.helper";import { truncateText } from "@/helpers/string.helper";@@ -205,54 +207,64 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {}/></Breadcrumbs>++ <div className="cursor-default text-custom-text-300">+ <Tooltip tooltipContent={viewDetails?.access === EViewAccess.PUBLIC ? "Public" : "Private"}>+ {viewDetails?.access === EViewAccess.PUBLIC ? <Earth className="h-4 w-4" /> : <Lock className="h-4 w-4" />}+ </Tooltip>+ </div></div><div className="flex items-center gap-2">- <LayoutSelection- layouts={[- EIssueLayoutTypes.LIST,- EIssueLayoutTypes.KANBAN,- EIssueLayoutTypes.CALENDAR,- EIssueLayoutTypes.SPREADSHEET,- EIssueLayoutTypes.GANTT,- ]}- onChange={(layout) => handleLayoutChange(layout)}- selectedLayout={activeLayout}- />+ {!viewDetails?.is_locked && (+ <>+ <LayoutSelection+ layouts={[+ EIssueLayoutTypes.LIST,+ EIssueLayoutTypes.KANBAN,+ EIssueLayoutTypes.CALENDAR,+ EIssueLayoutTypes.SPREADSHEET,+ EIssueLayoutTypes.GANTT,+ ]}+ onChange={(layout) => handleLayoutChange(layout)}+ selectedLayout={activeLayout}+ />- <FiltersDropdown- title="Filters"- placement="bottom-end"- disabled={!canUserCreateIssue}- isFiltersApplied={isFiltersApplied}- >- <FilterSelection- filters={issueFilters?.filters ?? {}}- handleFiltersUpdate={handleFiltersUpdate}- displayFilters={issueFilters?.displayFilters ?? {}}- handleDisplayFiltersUpdate={handleDisplayFilters}- layoutDisplayFiltersOptions={- activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined- }- labels={projectLabels}- memberIds={projectMemberIds ?? undefined}- states={projectStates}- cycleViewDisabled={!currentProjectDetails?.cycle_view}- moduleViewDisabled={!currentProjectDetails?.module_view}- />- </FiltersDropdown>- <FiltersDropdown title="Display" placement="bottom-end">- <DisplayFiltersSelection- layoutDisplayFiltersOptions={- activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined- }- displayFilters={issueFilters?.displayFilters ?? {}}- handleDisplayFiltersUpdate={handleDisplayFilters}- displayProperties={issueFilters?.displayProperties ?? {}}- handleDisplayPropertiesUpdate={handleDisplayProperties}- cycleViewDisabled={!currentProjectDetails?.cycle_view}- moduleViewDisabled={!currentProjectDetails?.module_view}- />- </FiltersDropdown>+ <FiltersDropdown+ title="Filters"+ placement="bottom-end"+ disabled={!canUserCreateIssue}+ isFiltersApplied={isFiltersApplied}+ >+ <FilterSelection+ filters={issueFilters?.filters ?? {}}+ handleFiltersUpdate={handleFiltersUpdate}+ displayFilters={issueFilters?.displayFilters ?? {}}+ handleDisplayFiltersUpdate={handleDisplayFilters}+ layoutDisplayFiltersOptions={+ activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined+ }+ labels={projectLabels}+ memberIds={projectMemberIds ?? undefined}+ states={projectStates}+ cycleViewDisabled={!currentProjectDetails?.cycle_view}+ moduleViewDisabled={!currentProjectDetails?.module_view}+ />+ </FiltersDropdown>+ <FiltersDropdown title="Display" placement="bottom-end">+ <DisplayFiltersSelection+ layoutDisplayFiltersOptions={+ activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined+ }+ displayFilters={issueFilters?.displayFilters ?? {}}+ handleDisplayFiltersUpdate={handleDisplayFilters}+ displayProperties={issueFilters?.displayProperties ?? {}}+ handleDisplayPropertiesUpdate={handleDisplayProperties}+ cycleViewDisabled={!currentProjectDetails?.cycle_view}+ moduleViewDisabled={!currentProjectDetails?.module_view}+ />+ </FiltersDropdown>+ </>+ )}{canUserCreateIssue && (<ButtononClick={() => {diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsxindex 378d0439e3..45c16260a0 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsx@@ -33,15 +33,17 @@ const ProjectViewIssuesPage = observer(() => {);if (error) {- <EmptyState- image={emptyView}- title="View does not exist"- description="The view you are looking for does not exist or has been deleted."- primaryButton={{- text: "View other views",- onClick: () => router.push(`/${workspaceSlug}/projects/${projectId}/views`),- }}- />;+ return (+ <EmptyState+ image={emptyView}+ title="View does not exist"+ description="The view you are looking for does not exist or you don't have permission to view it."+ primaryButton={{+ text: "View other views",+ onClick: () => router.push(`/${workspaceSlug}/projects/${projectId}/views`),+ }}+ />+ );}return (diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsxindex 615bca4930..1d3e95f94c 100644--- a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx@@ -17,7 +17,7 @@ import { EUserWorkspaceRoles } from "@/constants/workspace";// helpersimport { calculateTotalFilters } from "@/helpers/filter.helper";// hooks-import { useLabel, useMember, useUser, useIssues } from "@/hooks/store";+import { useLabel, useMember, useUser, useIssues, useGlobalView } from "@/hooks/store";export const GlobalIssuesHeader = observer(() => {// states@@ -28,6 +28,7 @@ export const GlobalIssuesHeader = observer(() => {const {issuesFilter: { filters, updateFilters },} = useIssues(EIssuesStoreType.GLOBAL);+ const { getViewDetailsById } = useGlobalView();const {membership: { currentWorkspaceRole },} = useUser();@@ -38,6 +39,8 @@ export const GlobalIssuesHeader = observer(() => {const issueFilters = globalViewId ? filters[globalViewId.toString()] : undefined;+ const viewDetails = getViewDetailsById(globalViewId.toString());+const handleFiltersUpdate = useCallback((key: keyof IIssueFilterOptions, value: string | string[]) => {if (!workspaceSlug || !globalViewId) return;@@ -96,6 +99,7 @@ export const GlobalIssuesHeader = observer(() => {const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;+ const isLocked = viewDetails?.is_locked;return (<>@@ -112,28 +116,30 @@ export const GlobalIssuesHeader = observer(() => {</Breadcrumbs></div><div className="flex items-center gap-2">- <>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>- <FilterSelection- layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}- filters={issueFilters?.filters ?? {}}- handleFiltersUpdate={handleFiltersUpdate}- displayFilters={issueFilters?.displayFilters ?? {}}- handleDisplayFiltersUpdate={handleDisplayFilters}- labels={workspaceLabels ?? undefined}- memberIds={workspaceMemberIds ?? undefined}- />- </FiltersDropdown>- <FiltersDropdown title="Display" placement="bottom-end">- <DisplayFiltersSelection- layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}- displayFilters={issueFilters?.displayFilters ?? {}}- handleDisplayFiltersUpdate={handleDisplayFilters}- displayProperties={issueFilters?.displayProperties ?? {}}- handleDisplayPropertiesUpdate={handleDisplayProperties}- />- </FiltersDropdown>- </>+ {!isLocked && (+ <>+ <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FilterSelection+ layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}+ filters={issueFilters?.filters ?? {}}+ handleFiltersUpdate={handleFiltersUpdate}+ displayFilters={issueFilters?.displayFilters ?? {}}+ handleDisplayFiltersUpdate={handleDisplayFilters}+ labels={workspaceLabels ?? undefined}+ memberIds={workspaceMemberIds ?? undefined}+ />+ </FiltersDropdown>+ <FiltersDropdown title="Display" placement="bottom-end">+ <DisplayFiltersSelection+ layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}+ displayFilters={issueFilters?.displayFilters ?? {}}+ handleDisplayFiltersUpdate={handleDisplayFilters}+ displayProperties={issueFilters?.displayProperties ?? {}}+ handleDisplayPropertiesUpdate={handleDisplayProperties}+ />+ </FiltersDropdown>+ </>+ )}{isAuthorizedUser && (<Button variant="primary" size="sm" onClick={() => setCreateViewModal(true)}>Add Viewdiff --git a/web/core/components/core/list/list-item.tsx b/web/core/components/core/list/list-item.tsxindex 894f488e24..5515a1628d 100644--- a/web/core/components/core/list/list-item.tsx+++ b/web/core/components/core/list/list-item.tsx@@ -68,7 +68,7 @@ export const ListItem: FC<IListItemProps> = (props) => {</ControlLink>{actionableItems && (<div className="absolute right-5 bottom-4 flex items-center gap-1.5">- <div className="relative flex items-center gap-4 sm:w-auto sm:flex-shrink-0 sm:justify-end">+ <div className="relative flex items-center gap-4 sm:w-auto sm:flex-shrink-0 sm:justify-end items-center">{actionableItems}</div></div>diff --git a/web/core/components/dropdowns/layout.tsx b/web/core/components/dropdowns/layout.tsxnew file mode 100644index 0000000000..2557e57a2a--- /dev/null+++ b/web/core/components/dropdowns/layout.tsx@@ -0,0 +1,66 @@+import { useCallback, useMemo } from "react";+import { observer } from "mobx-react";+import { Check } from "lucide-react";+// plane packages+import { cn } from "@plane/editor";+import { Dropdown } from "@plane/ui";+// constants+import { EIssueLayoutTypes, ISSUE_LAYOUT_MAP } from "@/constants/issue";++type TLayoutDropDown = {+ onChange: (value: EIssueLayoutTypes) => void;+ value: EIssueLayoutTypes;+};++export const LayoutDropDown = observer((props: TLayoutDropDown) => {+ const { onChange, value = EIssueLayoutTypes.LIST } = props;++ const options = useMemo(+ () =>+ Object.values(ISSUE_LAYOUT_MAP).map((issueLayout) => ({+ data: issueLayout.key,+ value: issueLayout.key,+ })),+ []+ );++ const buttonContent = useCallback((isOpen: boolean, buttonValue: string | string[] | undefined) => {+ const dropdownValue = ISSUE_LAYOUT_MAP[buttonValue as EIssueLayoutTypes];++ return (+ <div className="flex gap-2 items-center text-custom-text-200">+ <dropdownValue.icon strokeWidth={2} className={`size-3.5 text-custom-text-200`} />+ <span className="font-medium text-xs">{dropdownValue.label}</span>+ </div>+ );+ }, []);++ const itemContent = useCallback((props: { value: string; selected: boolean }) => {+ const dropdownValue = ISSUE_LAYOUT_MAP[props.value as EIssueLayoutTypes];++ return (+ <div className={cn("flex gap-2 items-center text-custom-text-200 w-full justify-between")}>+ <div className="flex gap-2 items-center">+ <dropdownValue.icon strokeWidth={2} className={`size-3 text-custom-text-200`} />+ <span className="font-medium text-xs">{dropdownValue.label}</span>+ </div>+ {props.selected && <Check className="h-3.5 w-3.5 flex-shrink-0" />}+ </div>+ );+ }, []);++ const keyExtractor = useCallback((option: any) => option.value, []);++ return (+ <Dropdown+ onChange={onChange as (value: string) => void}+ value={value?.toString()}+ keyExtractor={keyExtractor}+ options={options}+ buttonContainerClassName="bg-custom-background-100 border border-custom-border-200 hover:bg-custom-background-90 focus:text-custom-text-300 focus:bg-custom-background-90 px-2 py-1.5 rounded flex items-center gap-1.5 whitespace-nowrap transition-all justify-center relative"+ buttonContent={buttonContent}+ renderItem={itemContent}+ disableSearch+ />+ );+});diff --git a/web/core/components/dropdowns/member/avatar.tsx b/web/core/components/dropdowns/member/avatar.tsxindex 0e3246fa15..50e3ae5990 100644--- a/web/core/components/dropdowns/member/avatar.tsx+++ b/web/core/components/dropdowns/member/avatar.tsx@@ -38,5 +38,5 @@ export const ButtonAvatars: React.FC<AvatarProps> = observer((props) => {}}- return Icon ? <Icon className="h-3 w-3 flex-shrink-0" /> : <Users className="h-3 w-3 flex-shrink-0" />;+ return Icon ? <Icon className="h-3 w-3 flex-shrink-0" /> : <Users className="h-3 w-3 mx-[4px] flex-shrink-0" />;});diff --git a/web/core/components/icons/locked-component.tsx b/web/core/components/icons/locked-component.tsxnew file mode 100644index 0000000000..653d2b8e7b--- /dev/null+++ b/web/core/components/icons/locked-component.tsx@@ -0,0 +1,18 @@+import { Lock } from "lucide-react";+import { Tooltip } from "@plane/ui";++export const LockedComponent = (props: { toolTipContent?: string }) => {+ const { toolTipContent } = props;+ const lockedComponent = (+ <div className="flex h-7 items-center gap-2 rounded-full bg-custom-background-80 px-3 py-0.5 text-xs font-medium text-custom-text-300">+ <Lock className="h-3 w-3" />+ <span>Locked</span>+ </div>+ );++ return (+ <>+ {toolTipContent ? <Tooltip tooltipContent={toolTipContent}>{lockedComponent}</Tooltip> : <>{lockedComponent}</>}+ </>+ );+};diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsxindex 1d53921bb5..c0d94dcbc6 100644--- a/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx@@ -28,13 +28,22 @@ type Props = {labels?: IIssueLabel[] | undefined;states?: IState[] | undefined;alwaysAllowEditing?: boolean;+ disableEditing?: boolean;};const membersFilters = ["assignees", "mentions", "created_by", "subscriber"];const dateFilters = ["start_date", "target_date"];export const AppliedFiltersList: React.FC<Props> = observer((props) => {- const { appliedFilters, handleClearAllFilters, handleRemoveFilter, labels, states, alwaysAllowEditing } = props;+ const {+ appliedFilters,+ handleClearAllFilters,+ handleRemoveFilter,+ labels,+ states,+ alwaysAllowEditing,+ disableEditing = false,+ } = props;// store hooksconst {membership: { currentProjectRole },@@ -44,7 +53,8 @@ export const AppliedFiltersList: React.FC<Props> = observer((props) => {if (Object.keys(appliedFilters).length === 0) return null;- const isEditingAllowed = alwaysAllowEditing || (currentProjectRole && currentProjectRole >= EUserProjectRoles.MEMBER);+ const isEditingAllowed =+ !disableEditing && (alwaysAllowEditing || (currentProjectRole && currentProjectRole >= EUserProjectRoles.MEMBER));return (<div className="flex flex-wrap items-stretch gap-2 bg-custom-background-100 truncate">diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsxindex 509b7561af..71beecdc54 100644--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx@@ -1,21 +1,25 @@"use client";+import { useState } from "react";+import cloneDeep from "lodash/cloneDeep";import isEmpty from "lodash/isEmpty";-import isEqual from "lodash/isEqual";import { observer } from "mobx-react";import { useParams } from "next/navigation";+// types+import { cn } from "@plane/editor";import { IIssueFilterOptions, TStaticViewTypes } from "@plane/types";-// hooks//ui-import { Button } from "@plane/ui";// componentsimport { AppliedFiltersList } from "@/components/issues";-// types+import { UpdateViewComponent } from "@/components/views/update-view-component";+import { CreateUpdateWorkspaceViewModal } from "@/components/workspace";+// constantsimport { GLOBAL_VIEW_UPDATED } from "@/constants/event-tracker";import { EIssueFilterType, EIssuesStoreType } from "@/constants/issue";import { DEFAULT_GLOBAL_VIEWS_LIST, EUserWorkspaceRoles } from "@/constants/workspace";-// constants+// hooksimport { useEventTracker, useGlobalView, useIssues, useLabel, useUser } from "@/hooks/store";+import { getAreFiltersEqual } from "../../../utils";type Props = {globalViewId: string;@@ -33,11 +37,15 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {const { globalViewMap, updateGlobalView } = useGlobalView();const { captureEvent } = useEventTracker();const {+ data,membership: { currentWorkspaceRole },} = useUser();+ const [isModalOpen, setIsModalOpen] = useState(false);+// derived values- const userFilters = filters?.[globalViewId]?.filters;+ const issueFilters = filters?.[globalViewId];+ const userFilters = issueFilters?.filters;const viewDetails = globalViewMap[globalViewId];// filters whose value not null or empty array@@ -89,14 +97,15 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {);};+ const viewFilters = {+ filters: cloneDeep(appliedFilters ?? {}),+ display_filters: cloneDeep(issueFilters?.displayFilters),+ display_properties: cloneDeep(issueFilters?.displayProperties),+ };const handleUpdateView = () => {if (!workspaceSlug || !globalViewId) return;- updateGlobalView(workspaceSlug.toString(), globalViewId.toString(), {- filters: {- ...(appliedFilters ?? {}),- },- }).then((res) => {+ updateGlobalView(workspaceSlug.toString(), globalViewId.toString(), viewFilters).then((res) => {if (res)captureEvent(GLOBAL_VIEW_UPDATED, {view_id: res.id,@@ -107,34 +116,56 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {});};- const areFiltersEqual = isEqual(appliedFilters ?? {}, viewDetails?.filters ?? {});+ const areFiltersEqual = getAreFiltersEqual(appliedFilters, issueFilters, viewDetails);const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;const isDefaultView = DEFAULT_GLOBAL_VIEWS_LIST.map((view) => view.key).includes(globalViewId as TStaticViewTypes);+ const isLocked = viewDetails?.is_locked;+ const isOwner = viewDetails?.owned_by === data?.id;+ const areAppliedFiltersEmpty = isEmpty(appliedFilters);+// return if no filters are applied- if (isEmpty(appliedFilters) && areFiltersEqual) return null;+ if (areAppliedFiltersEmpty && areFiltersEqual) return null;return (- <div className="flex items-start justify-between gap-4 p-4">- <AppliedFiltersList- labels={workspaceLabels ?? undefined}- appliedFilters={appliedFilters ?? {}}- handleClearAllFilters={handleClearAllFilters}- handleRemoveFilter={handleRemoveFilter}- alwaysAllowEditing+ <>+ <CreateUpdateWorkspaceViewModal+ isOpen={isModalOpen}+ onClose={() => setIsModalOpen(false)}+ preLoadedData={{+ name: `${viewDetails?.name} 2`,+ description: viewDetails?.description,+ ...viewFilters,+ }}/>-- {!isDefaultView && !areFiltersEqual && isAuthorizedUser && (- <>- <div />- <Button variant="primary" onClick={handleUpdateView}>- Update view- </Button>- </>- )}- </div>+ <div+ className={cn("flex items-start justify-between gap-4 p-4", {+ "justify-end": areAppliedFiltersEmpty,+ })}+ >+ <AppliedFiltersList+ labels={workspaceLabels ?? undefined}+ appliedFilters={appliedFilters ?? {}}+ handleClearAllFilters={handleClearAllFilters}+ handleRemoveFilter={handleRemoveFilter}+ disableEditing={isLocked}+ alwaysAllowEditing+ />++ {!isDefaultView && (+ <UpdateViewComponent+ isLocked={isLocked}+ areFiltersEqual={!!areFiltersEqual}+ isOwner={isOwner}+ isAuthorizedUser={isAuthorizedUser}+ setIsModalOpen={setIsModalOpen}+ handleUpdateView={handleUpdateView}+ />+ )}+ </div>+ </>);});diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsxindex 291c031b36..c99343bb71 100644--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx@@ -1,18 +1,22 @@"use client";+import { useState } from "react";+import cloneDeep from "lodash/cloneDeep";import isEmpty from "lodash/isEmpty";import { observer } from "mobx-react";import { useParams } from "next/navigation";+// typesimport { IIssueFilterOptions } from "@plane/types";-// hooks-import { Button } from "@plane/ui";+// componentsimport { AppliedFiltersList } from "@/components/issues";+import { CreateUpdateProjectViewModal } from "@/components/views";+import { UpdateViewComponent } from "@/components/views/update-view-component";+// constantsimport { EIssueFilterType, EIssuesStoreType } from "@/constants/issue";-import { useIssues, useLabel, useProjectState, useProjectView } from "@/hooks/store";+import { EUserWorkspaceRoles } from "@/constants/workspace";+// hooks+import { useIssues, useLabel, useProjectView, useUser } from "@/hooks/store";import { getAreFiltersEqual } from "../../../utils";-// components-// ui-// typesexport const ProjectViewAppliedFiltersRoot: React.FC = observer(() => {// router@@ -22,8 +26,13 @@ export const ProjectViewAppliedFiltersRoot: React.FC = observer(() => {issuesFilter: { issueFilters, updateFilters },} = useIssues(EIssuesStoreType.PROJECT_VIEW);const { projectLabels } = useLabel();- const { projectStates } = useProjectState();const { viewMap, updateView } = useProjectView();+ const {+ data,+ membership: { currentWorkspaceRole },+ } = useUser();++ const [isModalOpen, setIsModalOpen] = useState(false);// derived valuesconst viewDetails = viewId ? viewMap[viewId.toString()] : null;const userFilters = issueFilters?.filters;@@ -81,46 +90,56 @@ export const ProjectViewAppliedFiltersRoot: React.FC = observer(() => {};const areFiltersEqual = getAreFiltersEqual(appliedFilters, issueFilters, viewDetails);-+ const viewFilters = {+ filters: cloneDeep(appliedFilters ?? {}),+ display_filters: cloneDeep(issueFilters?.displayFilters),+ display_properties: cloneDeep(issueFilters?.displayProperties),+ };// return if no filters are appliedif (isEmpty(appliedFilters) && areFiltersEqual) return null;const handleUpdateView = () => {if (!workspaceSlug || !projectId || !viewId || !viewDetails) return;- updateView(workspaceSlug.toString(), projectId.toString(), viewId.toString(), {- filters: {- ...(appliedFilters ?? {}),- },- display_filters: {- ...issueFilters?.displayFilters,- },- display_properties: {- ...issueFilters?.displayProperties,- },- });+ updateView(workspaceSlug.toString(), projectId.toString(), viewId.toString(), viewFilters);};+ const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;++ const isLocked = !!viewDetails?.is_locked;+ const isOwner = viewDetails?.owned_by === data?.id;+return (<div className="flex justify-between gap-4 p-4">+ <CreateUpdateProjectViewModal+ isOpen={isModalOpen}+ onClose={() => setIsModalOpen(false)}+ workspaceSlug={workspaceSlug.toString()}+ projectId={projectId.toString()}+ preLoadedData={{+ name: `${viewDetails?.name} 2`,+ description: viewDetails?.description,+ logo_props: viewDetails?.logo_props,+ ...viewFilters,+ }}+ /><div><AppliedFiltersListappliedFilters={appliedFilters ?? {}}handleClearAllFilters={handleClearAllFilters}handleRemoveFilter={handleRemoveFilter}labels={projectLabels ?? []}- states={projectStates}- alwaysAllowEditing+ disableEditing={isLocked}/></div>-- {!areFiltersEqual && (- <div>- <Button variant="primary" size="sm" className="flex-shrink-0" onClick={handleUpdateView}>- Update view- </Button>- </div>- )}+ <UpdateViewComponent+ isLocked={isLocked}+ areFiltersEqual={!!areFiltersEqual}+ isOwner={isOwner}+ isAuthorizedUser={isAuthorizedUser}+ setIsModalOpen={setIsModalOpen}+ handleUpdateView={handleUpdateView}+ /></div>);});diff --git a/web/core/components/issues/issue-layouts/utils.tsx b/web/core/components/issues/issue-layouts/utils.tsxindex 6314d5beb6..7840bb4621 100644--- a/web/core/components/issues/issue-layouts/utils.tsx+++ b/web/core/components/issues/issue-layouts/utils.tsx@@ -4,6 +4,7 @@ import { extractInstruction } from "@atlaskit/pragmatic-drag-and-drop-hitbox/treimport clone from "lodash/clone";import concat from "lodash/concat";import isEqual from "lodash/isEqual";+import isNil from "lodash/isNil";import pull from "lodash/pull";import uniq from "lodash/uniq";import scrollIntoView from "smooth-scroll-into-view-if-needed";@@ -21,6 +22,7 @@ import {IIssueFilters,IProjectView,TGroupedIssues,+ IWorkspaceView,} from "@plane/types";// uiimport { Avatar, CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";@@ -570,11 +572,24 @@ export const handleGroupDragDrop = async (export const getAreFiltersEqual = (appliedFilters: IIssueFilterOptions | undefined,issueFilters: IIssueFilters | undefined,- viewDetails: IProjectView | null-) =>- isEqual(appliedFilters ?? {}, viewDetails?.filters ?? {}) &&- isEqual(issueFilters?.displayFilters ?? {}, viewDetails?.display_filters ?? {}) &&- isEqual(issueFilters?.displayProperties ?? {}, viewDetails?.display_properties ?? {});+ viewDetails: IProjectView | IWorkspaceView | null+) => {+ if (isNil(appliedFilters) || isNil(issueFilters) || isNil(viewDetails)) return true;++ return (+ isEqual(appliedFilters, viewDetails.filters) &&+ isEqual(issueFilters.displayFilters, viewDetails.display_filters) &&+ isEqual(removeNillKeys(issueFilters.displayProperties), removeNillKeys(viewDetails.display_properties))+ );+};++/**+ * method that removes Null or undefined Keys from object+ * @param obj+ * @returns+ */+export const removeNillKeys = <T,>(obj: T) =>+ Object.fromEntries(Object.entries(obj ?? {}).filter(([key, value]) => key && !isNil(value)));/*** This Method returns if the the grouped values are subGroupeddiff --git a/web/core/components/pages/editor/header/extra-options.tsx b/web/core/components/pages/editor/header/extra-options.tsxindex bd022eed26..06c0579e40 100644--- a/web/core/components/pages/editor/header/extra-options.tsx+++ b/web/core/components/pages/editor/header/extra-options.tsx@@ -2,13 +2,14 @@import { useState } from "react";import { observer } from "mobx-react";-import { Lock, Sparkle } from "lucide-react";+import { Sparkle } from "lucide-react";// editorimport { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";// uiimport { ArchiveIcon } from "@plane/ui";// componentsimport { GptAssistantPopover } from "@/components/core";+import { LockedComponent } from "@/components/icons/locked-component";import { PageInfoPopover, PageOptionsDropdown } from "@/components/pages";// helpersimport { renderFormattedDate } from "@/helpers/date-time.helper";@@ -40,12 +41,7 @@ export const PageExtraOptions: React.FC<Props> = observer((props) => {return (<div className="flex flex-grow items-center justify-end gap-3">- {is_locked && (- <div className="flex h-7 items-center gap-2 rounded-full bg-custom-background-80 px-3 py-0.5 text-xs font-medium text-custom-text-300">- <Lock className="h-3 w-3" />- <span>Locked</span>- </div>- )}+ {is_locked && <LockedComponent />}{archived_at && (<div className="flex h-7 items-center gap-2 rounded-full bg-blue-500/20 px-3 py-0.5 text-xs font-medium text-blue-500"><ArchiveIcon className="h-3 w-3" />diff --git a/web/core/components/views/form.tsx b/web/core/components/views/form.tsxindex 9a43cd2a9c..4371481dfc 100644--- a/web/core/components/views/form.tsx+++ b/web/core/components/views/form.tsx@@ -11,11 +11,12 @@ import { Button, EmojiIconPicker, EmojiIconPickerTypes, Input, PhotoFilterIcon,import { Logo } from "@/components/common";import { AppliedFiltersList, FilterSelection, FiltersDropdown } from "@/components/issues";// constants-import { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";+import { EIssueLayoutTypes, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";// helpersimport { convertHexEmojiToDecimal } from "@/helpers/emoji.helper";// hooksimport { useLabel, useMember, useProject, useProjectState } from "@/hooks/store";+import { LayoutDropDown } from "../dropdowns/layout";type Props = {data?: IProjectView | null;@@ -190,7 +191,7 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {/>)}/>- <span className="text-xs text-red-500">{errors?.name?.message}</span>+ <span className="text-xs text-red-500">{errors?.name?.message?.toString()}</span></div></div><div>@@ -211,7 +212,17 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {)}/></div>- <div>+ <div className="flex gap-2">+ <Controller+ control={control}+ name="display_filters.layout"+ render={({ field: { onChange, value } }) => (+ <LayoutDropDown+ onChange={(selectedValue: EIssueLayoutTypes) => onChange(selectedValue)}+ value={value}+ />+ )}+ /><Controllercontrol={control}name="filters"diff --git a/web/core/components/views/update-view-component.tsx b/web/core/components/views/update-view-component.tsxnew file mode 100644index 0000000000..9e598d528e--- /dev/null+++ b/web/core/components/views/update-view-component.tsx@@ -0,0 +1,70 @@+import { SetStateAction, useEffect, useState } from "react";+import { Button } from "@plane/ui";+import { LockedComponent } from "../icons/locked-component";++type Props = {+ isLocked: boolean;+ areFiltersEqual: boolean;+ isOwner: boolean;+ isAuthorizedUser: boolean;+ setIsModalOpen: (value: SetStateAction<boolean>) => void;+ handleUpdateView: () => void;+ lockedTooltipContent?: string;+};++export const UpdateViewComponent = (props: Props) => {+ const {+ isLocked,+ areFiltersEqual,+ isOwner,+ isAuthorizedUser,+ setIsModalOpen,+ handleUpdateView,+ lockedTooltipContent,+ } = props;++ const [isUpdating, setIsUpdating] = useState(false);++ useEffect(() => {+ if (areFiltersEqual) {+ setIsUpdating(false);+ }+ }, [areFiltersEqual]);++ // Change state while updating view to have a feedback+ const updateButton = isUpdating ? (+ <Button variant="primary" size="sm" className="flex-shrink-0">+ Updating...+ </Button>+ ) : (+ <Button+ variant="primary"+ size="sm"+ className="flex-shrink-0"+ onClick={() => {+ setIsUpdating(true);+ handleUpdateView();+ }}+ >+ Update view+ </Button>+ );++ return (+ <div className="flex gap-2">+ {isLocked ? (+ <LockedComponent toolTipContent={lockedTooltipContent} />+ ) : (+ !areFiltersEqual &&+ isAuthorizedUser && (+ <>+ <Button variant="outline-primary" size="sm" className="flex-shrink-0" onClick={() => setIsModalOpen(true)}>+ Save as+ </Button>+ {isOwner && <>{updateButton}</>}+ </>+ )+ )}+ </div>+ );+};diff --git a/web/core/components/views/view-list-item-action.tsx b/web/core/components/views/view-list-item-action.tsxindex 66f9a0622c..b7d37e3d72 100644--- a/web/core/components/views/view-list-item-action.tsx+++ b/web/core/components/views/view-list-item-action.tsx@@ -1,14 +1,16 @@import React, { FC, useState } from "react";import { observer } from "mobx-react";import { useParams } from "next/navigation";+import { Earth, Lock } from "lucide-react";// typesimport { IProjectView } from "@plane/types";// ui-import { FavoriteStar } from "@plane/ui";+import { Tooltip, FavoriteStar } from "@plane/ui";// componentsimport { DeleteProjectViewModal, CreateUpdateProjectViewModal, ViewQuickActions } from "@/components/views";// constantsimport { EUserProjectRoles } from "@/constants/project";+import { EViewAccess } from "@/constants/views";// helpersimport { calculateTotalFilters } from "@/helpers/filter.helper";// hooks@@ -39,6 +41,8 @@ export const ViewListItemAction: FC<Props> = observer((props) => {const totalFilters = calculateTotalFilters(view.filters ?? {});+ const access = view.access;+// handlersconst handleAddToFavorites = () => {if (!workspaceSlug || !projectId) return;@@ -70,8 +74,14 @@ export const ViewListItemAction: FC<Props> = observer((props) => {{totalFilters} {totalFilters === 1 ? "filter" : "filters"}</p>+ <div className="cursor-default text-custom-text-300">+ <Tooltip tooltipContent={access === EViewAccess.PUBLIC ? "Public" : "Private"}>+ {access === EViewAccess.PUBLIC ? <Earth className="h-4 w-4" /> : <Lock className="h-4 w-4" />}+ </Tooltip>+ </div>+{/* created by */}- {createdByDetails && <ButtonAvatars showTooltip={false} userIds={createdByDetails?.id} />}+ {<ButtonAvatars showTooltip={false} userIds={createdByDetails?.id ?? []} />}{isEditingAllowed && (<FavoriteStardiff --git a/web/core/components/workspace/views/quick-action.tsx b/web/core/components/workspace/views/quick-action.tsxindex 9b2abc0a6a..e0bdab42b4 100644--- a/web/core/components/workspace/views/quick-action.tsx+++ b/web/core/components/workspace/views/quick-action.tsx@@ -3,7 +3,7 @@import { useState } from "react";import { observer } from "mobx-react";import Link from "next/link";-import { ExternalLink, LinkIcon, Pencil, Trash2 } from "lucide-react";+import { ExternalLink, LinkIcon, Pencil, Trash2, Lock } from "lucide-react";// typesimport { IWorkspaceView } from "@plane/types";// ui@@ -12,6 +12,7 @@ import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } fromimport { CreateUpdateWorkspaceViewModal, DeleteGlobalViewModal } from "@/components/workspace";// constantsimport { EUserProjectRoles } from "@/constants/project";+import { EViewAccess } from "@/constants/views";// helpersimport { cn } from "@/helpers/common.helper";import { copyUrlToClipboard } from "@/helpers/string.helper";@@ -78,6 +79,34 @@ export const WorkspaceViewQuickActions: React.FC<Props> = observer((props) => {},];+ const isSelected = viewId === globalViewId;+ const isPrivateView = view.access === EViewAccess.PRIVATE;++ let customButton = (+ <div+ className={`flex gap-1 items-center flex-shrink-0 whitespace-nowrap border-b-2 p-3 text-sm font-medium outline-none ${+ isSelected+ ? "border-custom-primary-100 text-custom-primary-100"+ : "border-transparent hover:border-custom-border-200 hover:text-custom-text-400"+ } ${isPrivateView ? "pr-2" : ""}`}+ >+ <span className={`flex min-w-min flex-shrink-0 whitespace-nowrap text-sm font-medium outline-none`}>+ {view.name}+ </span>+ {isPrivateView && (+ <Lock className={`${isSelected ? "text-custom-primary-100" : "text-custom-text-400"} h-4 w-4`} />+ )}+ </div>+ );++ if (!isSelected) {+ customButton = (+ <Link key={viewId} id={`global-view-${viewId}`} href={`/${workspaceSlug}/workspace-views/${viewId}`}>+ {customButton}+ </Link>+ );+ }+return (<><CreateUpdateWorkspaceViewModal data={view} isOpen={updateViewModal} onClose={() => setUpdateViewModal(false)} />@@ -85,38 +114,7 @@ export const WorkspaceViewQuickActions: React.FC<Props> = observer((props) => {<ContextMenu parentRef={parentRef} items={MENU_ITEMS} />- <CustomMenu- customButton={- <>- {viewId === globalViewId ? (- <span- className={`flex min-w-min flex-shrink-0 whitespace-nowrap border-b-2 p-3 text-sm font-medium outline-none ${- viewId === globalViewId- ? "border-custom-primary-100 text-custom-primary-100"- : "border-transparent hover:border-custom-border-200 hover:text-custom-text-400"- }`}- >- {view.name}- </span>- ) : (- <Link key={viewId} id={`global-view-${viewId}`} href={`/${workspaceSlug}/workspace-views/${viewId}`}>- <span- className={`flex min-w-min flex-shrink-0 whitespace-nowrap border-b-2 p-3 text-sm font-medium outline-none ${- viewId === globalViewId- ? "border-custom-primary-100 text-custom-primary-100"- : "border-transparent hover:border-custom-border-200 hover:text-custom-text-400"- }`}- >- {view.name}- </span>- </Link>- )}- </>- }- placement="bottom-end"- menuItemsClassName="z-20"- closeOnSelect- >+ <CustomMenu customButton={customButton} placement="bottom-end" menuItemsClassName="z-20" closeOnSelect>{MENU_ITEMS.map((item) => {if (item.shouldRender === false) return null;return (diff --git a/web/core/constants/issue.ts b/web/core/constants/issue.tsindex 95a761e544..0e2a04b784 100644--- a/web/core/constants/issue.ts+++ b/web/core/constants/issue.ts@@ -138,17 +138,34 @@ export const ISSUE_EXTRA_OPTIONS: {{ key: "show_empty_groups", title: "Show empty groups" }, // filter on front-end];+export const ISSUE_LAYOUT_MAP = {+ [EIssueLayoutTypes.LIST]: { key: EIssueLayoutTypes.LIST, title: "List Layout", label: "List", icon: List },+ [EIssueLayoutTypes.KANBAN]: { key: EIssueLayoutTypes.KANBAN, title: "Kanban Layout", label: "Kanban", icon: Kanban },+ [EIssueLayoutTypes.CALENDAR]: {+ key: EIssueLayoutTypes.CALENDAR,+ title: "Calendar Layout",+ label: "Calendar",+ icon: Calendar,+ },+ [EIssueLayoutTypes.SPREADSHEET]: {+ key: EIssueLayoutTypes.SPREADSHEET,+ title: "Spreadsheet Layout",+ label: "Spreadsheet",+ icon: Sheet,+ },+ [EIssueLayoutTypes.GANTT]: {+ key: EIssueLayoutTypes.GANTT,+ title: "Gantt Chart Layout",+ label: "Gantt",+ icon: GanttChartSquare,+ },+};+export const ISSUE_LAYOUTS: {key: EIssueLayoutTypes;title: string;icon: any;-}[] = [- { key: EIssueLayoutTypes.LIST, title: "List Layout", icon: List },- { key: EIssueLayoutTypes.KANBAN, title: "Kanban Layout", icon: Kanban },- { key: EIssueLayoutTypes.CALENDAR, title: "Calendar Layout", icon: Calendar },- { key: EIssueLayoutTypes.SPREADSHEET, title: "Spreadsheet Layout", icon: Sheet },- { key: EIssueLayoutTypes.GANTT, title: "Gantt Chart Layout", icon: GanttChartSquare },-];+}[] = Object.values(ISSUE_LAYOUT_MAP);export interface ILayoutDisplayFiltersOptions {filters: (keyof IIssueFilterOptions)[];diff --git a/web/core/constants/views.ts b/web/core/constants/views.tsnew file mode 100644index 0000000000..aab38da3f0--- /dev/null+++ b/web/core/constants/views.ts@@ -0,0 +1,4 @@+export enum EViewAccess {+ PRIVATE,+ PUBLIC,+}diff --git a/web/core/store/issue/project-views/filter.store.ts b/web/core/store/issue/project-views/filter.store.tsindex 40169e89cf..a82bfd8f87 100644--- a/web/core/store/issue/project-views/filter.store.ts+++ b/web/core/store/issue/project-views/filter.store.ts@@ -240,10 +240,6 @@ export class ProjectViewIssuesFilter extends IssueFilterHelperStore implements I);}- await this.issueFilterService.patchView(workspaceSlug, projectId, viewId, {- display_filters: _filters.displayFilters,- });-break;}case EIssueFilterType.DISPLAY_PROPERTIES: {@@ -260,9 +256,6 @@ export class ProjectViewIssuesFilter extends IssueFilterHelperStore implements I});});- await this.issueFilterService.patchView(workspaceSlug, projectId, viewId, {- display_properties: _filters.displayProperties,- });break;}case EIssueFilterType.KANBAN_FILTERS: {diff --git a/web/core/store/issue/workspace/filter.store.ts b/web/core/store/issue/workspace/filter.store.tsindex 7bf2d9cd94..8ac69e7fd5 100644--- a/web/core/store/issue/workspace/filter.store.ts+++ b/web/core/store/issue/workspace/filter.store.ts@@ -249,11 +249,6 @@ export class WorkspaceIssuesFilter extends IssueFilterHelperStore implements IWothis.handleIssuesLocalFilters.set(EIssuesStoreType.GLOBAL, type, workspaceSlug, undefined, viewId, {display_filters: _filters.displayFilters,});- else- await this.issueFilterService.updateView(workspaceSlug, viewId, {- display_filters: _filters.displayFilters,- });-break;}case EIssueFilterType.DISPLAY_PROPERTIES: {@@ -268,15 +263,11 @@ export class WorkspaceIssuesFilter extends IssueFilterHelperStore implements IWoupdatedDisplayProperties[_key as keyof IIssueDisplayProperties]);});+ if (["all-issues", "assigned", "created", "subscribed"].includes(viewId))+ this.handleIssuesLocalFilters.set(EIssuesStoreType.GLOBAL, type, workspaceSlug, undefined, viewId, {+ display_properties: _filters.displayProperties,+ });});- if (["all-issues", "assigned", "created", "subscribed"].includes(viewId))- this.handleIssuesLocalFilters.set(EIssuesStoreType.GLOBAL, type, workspaceSlug, undefined, viewId, {- display_properties: _filters.displayProperties,- });- else- await this.issueFilterService.updateView(workspaceSlug, viewId, {- display_properties: _filters.displayProperties,- });break;}