π₯π₯π₯ 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
chore: issue filters refactor (#6742)
Vamsi Krishnad4991b9a4861
diff --git a/web/ce/components/issue-types/index.ts b/web/ce/components/issue-types/index.tsdeleted file mode 100644index 11413e4c19..0000000000--- a/web/ce/components/issue-types/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./values";diff --git a/web/ce/components/issue-types/values/index.ts b/web/ce/components/issue-types/values/index.tsdeleted file mode 100644index 635be6440d..0000000000--- a/web/ce/components/issue-types/values/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./update";diff --git a/web/ce/components/issue-types/values/update.tsx b/web/ce/components/issue-types/values/update.tsxdeleted file mode 100644index 2fd6290426..0000000000--- a/web/ce/components/issue-types/values/update.tsx+++ /dev/null@@ -1,12 +0,0 @@-import { TIssueServiceType } from "@plane/types";--export type TIssueAdditionalPropertyValuesUpdateProps = {- issueId: string;- issueTypeId: string;- projectId: string;- workspaceSlug: string;- isDisabled: boolean;- issueServiceType?: TIssueServiceType;-};--export const IssueAdditionalPropertyValuesUpdate: React.FC<TIssueAdditionalPropertyValuesUpdateProps> = () => <></>;diff --git a/web/ce/components/issues/issue-details/additional-properties.tsx b/web/ce/components/issues/issue-details/additional-properties.tsxnew file mode 100644index 0000000000..64b8caa97d--- /dev/null+++ b/web/ce/components/issues/issue-details/additional-properties.tsx@@ -0,0 +1,13 @@+import React, { FC } from "react";+// plane imports++export type TWorkItemAdditionalSidebarProperties = {+ workItemId: string;+ workItemTypeId: string | null;+ projectId: string;+ workspaceSlug: string;+ isEditable: boolean;+ isPeekView?: boolean;+};++export const WorkItemAdditionalSidebarProperties: FC<TWorkItemAdditionalSidebarProperties> = () => <></>;diff --git a/web/ce/helpers/issue-filter.helper.ts b/web/ce/helpers/issue-filter.helper.tsindex e39259cd93..925c4a63ca 100644--- a/web/ce/helpers/issue-filter.helper.ts+++ b/web/ce/helpers/issue-filter.helper.ts@@ -1,5 +1,7 @@// typesimport { IIssueDisplayProperties } from "@plane/types";+// lib+import { store } from "@/lib/store-context";export type TShouldRenderDisplayProperty = {workspaceSlug: string;@@ -16,3 +18,13 @@ export const shouldRenderDisplayProperty = (props: TShouldRenderDisplayProperty)return true;}};++export const shouldRenderColumn = (key: keyof IIssueDisplayProperties): boolean => {+ const isEstimateEnabled: boolean = store.projectRoot.project.currentProjectDetails?.estimate !== null;+ switch (key) {+ case "estimate":+ return isEstimateEnabled;+ default:+ return true;+ }+};diff --git a/web/ce/store/issue/helpers/base-issue.store.ts b/web/ce/store/issue/helpers/base-issue.store.tsnew file mode 100644index 0000000000..b75a4916a1--- /dev/null+++ b/web/ce/store/issue/helpers/base-issue.store.ts@@ -0,0 +1,4 @@+import { TIssue } from "@plane/types";+import { getIssueIds } from "@/store/issue/helpers/base-issues-utils";++export const workItemSortWithOrderByExtended = (array: TIssue[], key?: string) => getIssueIds(array);diff --git a/web/core/components/issues/issue-detail/root.tsx b/web/core/components/issues/issue-detail/root.tsxindex ec9aaf7b26..16abbf5d15 100644--- a/web/core/components/issues/issue-detail/root.tsx+++ b/web/core/components/issues/issue-detail/root.tsx@@ -371,7 +371,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {/></div><div- className="fixed right-0 z-[5] h-full w-full min-w-[300px] overflow-hidden border-l border-custom-border-200 bg-custom-sidebar-background-100 py-5 sm:w-1/2 md:relative md:w-1/3 lg:min-w-80 xl:min-w-96"+ className="fixed right-0 z-[5] h-full w-full min-w-[300px] border-l border-custom-border-200 bg-custom-sidebar-background-100 py-5 sm:w-1/2 md:relative md:w-1/3 lg:min-w-80 xl:min-w-96"style={issueDetailSidebarCollapsed ? { right: `-${window?.innerWidth || 0}px` } : {}}><IssueDetailsSidebardiff --git a/web/core/components/issues/issue-detail/sidebar.tsx b/web/core/components/issues/issue-detail/sidebar.tsxindex 1749ccba49..d132b4e77a 100644--- a/web/core/components/issues/issue-detail/sidebar.tsx+++ b/web/core/components/issues/issue-detail/sidebar.tsx@@ -24,9 +24,9 @@ import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";// hooksimport { useProjectEstimates, useIssueDetail, useProject, useProjectState, useMember } from "@/hooks/store";// plane web components-import { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issue-types/values";import { IssueParentSelectRoot, IssueWorklogProperty } from "@/plane-web/components/issues";// components+import { WorkItemAdditionalSidebarProperties } from "@/plane-web/components/issues/issue-details/additional-properties";import type { TIssueOperations } from "./root";type Props = {@@ -293,15 +293,14 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {disabled={!isEditable}/>- {issue.type_id && (- <IssueAdditionalPropertyValuesUpdate- issueId={issueId}- issueTypeId={issue.type_id}- projectId={projectId}- workspaceSlug={workspaceSlug}- isDisabled={!isEditable}- />- )}+ <WorkItemAdditionalSidebarProperties+ workItemId={issue.id}+ workItemTypeId={issue.type_id}+ projectId={projectId}+ workspaceSlug={workspaceSlug}+ isEditable={isEditable}+ isPeekView+ /></div></div></div>diff --git a/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsxindex 43e65fa026..cf6b4febb9 100644--- a/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx+++ b/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx@@ -7,6 +7,7 @@ import { IIssueDisplayProperties, TIssue } from "@plane/types";import { useEventTracker } from "@/hooks/store";// componentsimport { SPREADSHEET_COLUMNS } from "@/plane-web/components/issues/issue-layouts/utils";+import { shouldRenderColumn } from "@/plane-web/helpers/issue-filter.helper";import { WithDisplayPropertiesHOC } from "../properties/with-display-properties-HOC";// utils@@ -20,13 +21,13 @@ type Props = {};export const IssueColumn = observer((props: Props) => {- const { displayProperties, issueDetail, disableUserActions, property, updateIssue, isEstimateEnabled } = props;+ const { displayProperties, issueDetail, disableUserActions, property, updateIssue } = props;// routerconst pathname = usePathname();const tableCellRef = useRef<HTMLTableCellElement | null>(null);const { captureIssueEvent } = useEventTracker();- const shouldRenderProperty = property === "estimate" ? isEstimateEnabled : true;+ const shouldRenderProperty = shouldRenderColumn(property);const Column = SPREADSHEET_COLUMNS[property];diff --git a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsxindex f75c4ddb31..c6e57df6ce 100644--- a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx+++ b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx@@ -3,6 +3,7 @@ import { useRef } from "react";import { observer } from "mobx-react";import { IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";//components+import { shouldRenderColumn } from "@/plane-web/helpers/issue-filter.helper";import { WithDisplayPropertiesHOC } from "../properties/with-display-properties-HOC";import { HeaderColumn } from "./columns/header-column";@@ -15,19 +16,12 @@ interface Props {isEpic?: boolean;}export const SpreadsheetHeaderColumn = observer((props: Props) => {- const {- displayProperties,- displayFilters,- property,- isEstimateEnabled,- handleDisplayFilterUpdate,- isEpic = false,- } = props;+ const { displayProperties, displayFilters, property, handleDisplayFilterUpdate, isEpic = false } = props;//hooksconst tableHeaderCellRef = useRef<HTMLTableCellElement | null>(null);- const shouldRenderProperty = property === "estimate" ? isEstimateEnabled : true;+ const shouldRenderProperty = shouldRenderColumn(property);return (<WithDisplayPropertiesHOCdiff --git a/web/core/components/issues/peek-overview/properties.tsx b/web/core/components/issues/peek-overview/properties.tsxindex e3e5d51456..8fd7fd58f3 100644--- a/web/core/components/issues/peek-overview/properties.tsx+++ b/web/core/components/issues/peek-overview/properties.tsx@@ -23,8 +23,8 @@ import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper"import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";import { useIssueDetail, useMember, useProject, useProjectState } from "@/hooks/store";// plane web components-import { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issue-types/values";import { IssueParentSelectRoot, IssueWorklogProperty } from "@/plane-web/components/issues";+import { WorkItemAdditionalSidebarProperties } from "@/plane-web/components/issues/issue-details/additional-properties";interface IPeekOverviewProperties {workspaceSlug: string;@@ -291,15 +291,14 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((prodisabled={disabled}/>- {issue.type_id && (- <IssueAdditionalPropertyValuesUpdate- issueId={issueId}- issueTypeId={issue.type_id}- projectId={projectId}- workspaceSlug={workspaceSlug}- isDisabled={disabled}- />- )}+ <WorkItemAdditionalSidebarProperties+ workItemId={issue.id}+ workItemTypeId={issue.type_id}+ projectId={projectId}+ workspaceSlug={workspaceSlug}+ isEditable={!disabled}+ isPeekView+ /></div></div>);diff --git a/web/core/store/issue/helpers/base-issues.store.ts b/web/core/store/issue/helpers/base-issues.store.tsindex be120781dc..d8a7dfa185 100644--- a/web/core/store/issue/helpers/base-issues.store.ts+++ b/web/core/store/issue/helpers/base-issues.store.ts@@ -37,6 +37,7 @@ import { convertToISODateString } from "@/helpers/date-time.helper";// local-dbimport { SPECIAL_ORDER_BY } from "@/local-db/utils/query-constructor";import { updatePersistentLayer } from "@/local-db/utils/utils";+import { workItemSortWithOrderByExtended } from "@/plane-web/store/issue/helpers/base-issue.store";// servicesimport { CycleService } from "@/services/cycle.service";import { IssueArchiveService, IssueDraftService, IssueService } from "@/services/issue";@@ -1991,7 +1992,7 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {);default:- return getIssueIds(array);+ return workItemSortWithOrderByExtended(array, key);}};diff --git a/web/ee/components/issue-types/index.ts b/web/ee/components/issue-types/index.tsdeleted file mode 100644index 11413e4c19..0000000000--- a/web/ee/components/issue-types/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./values";diff --git a/web/ee/components/issue-types/values/index.ts b/web/ee/components/issue-types/values/index.tsdeleted file mode 100644index 635be6440d..0000000000--- a/web/ee/components/issue-types/values/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./update";diff --git a/web/ee/components/issue-types/values/update.tsx b/web/ee/components/issue-types/values/update.tsxdeleted file mode 100644index 0077ac339c..0000000000--- a/web/ee/components/issue-types/values/update.tsx+++ /dev/null@@ -1 +0,0 @@-export * from "ce/components/issue-types/values/update";diff --git a/web/ee/components/issues/issue-details/additional-properties.tsx b/web/ee/components/issues/issue-details/additional-properties.tsxnew file mode 100644index 0000000000..5a15f5b3a6--- /dev/null+++ b/web/ee/components/issues/issue-details/additional-properties.tsx@@ -0,0 +1 @@+export * from "ce/components/issues/issue-details/additional-properties";diff --git a/web/ee/store/issue/helpers/base-issue.store.ts b/web/ee/store/issue/helpers/base-issue.store.tsnew file mode 100644index 0000000000..ee0c73e56c--- /dev/null+++ b/web/ee/store/issue/helpers/base-issue.store.ts@@ -0,0 +1 @@+export * from "ce/store/issue/helpers/base-issue.store";