π₯π₯π₯ 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-4531]chore: refactor for timeline chart (#7440)
Vamsi Krishna4c3af7f8a14c
diff --git a/apps/web/core/components/gantt-chart/blocks/block-row-list.tsx b/apps/web/ce/components/gantt-chart/blocks/block-row-list.tsxsimilarity index 93%rename from apps/web/core/components/gantt-chart/blocks/block-row-list.tsxrename to apps/web/ce/components/gantt-chart/blocks/block-row-list.tsxindex 0be3bead71..ec7e52fd12 100644--- a/apps/web/core/components/gantt-chart/blocks/block-row-list.tsx+++ b/apps/web/ce/components/gantt-chart/blocks/block-row-list.tsx@@ -3,10 +3,10 @@ import { FC } from "react";import type { IBlockUpdateData, IGanttBlock } from "@plane/types";import RenderIfVisible from "@/components/core/render-if-visible-HOC";// hooks+import { BlockRow } from "@/components/gantt-chart/blocks/block-row";+import { BLOCK_HEIGHT } from "@/components/gantt-chart/constants";import { TSelectionHelper } from "@/hooks/use-multiple-select";// types-import { BLOCK_HEIGHT } from "../constants";-import { BlockRow } from "./block-row";export type GanttChartBlocksProps = {blockIds: string[];diff --git a/apps/web/core/components/gantt-chart/blocks/blocks-list.tsx b/apps/web/ce/components/gantt-chart/blocks/blocks-list.tsxsimilarity index 96%rename from apps/web/core/components/gantt-chart/blocks/blocks-list.tsxrename to apps/web/ce/components/gantt-chart/blocks/blocks-list.tsxindex 154a72d9f5..0c8f2a7c0b 100644--- a/apps/web/core/components/gantt-chart/blocks/blocks-list.tsx+++ b/apps/web/ce/components/gantt-chart/blocks/blocks-list.tsx@@ -1,7 +1,7 @@import { FC } from "react";//import type { IBlockUpdateDependencyData } from "@plane/types";-import { GanttChartBlock } from "./block";+import { GanttChartBlock } from "@/components/gantt-chart/blocks/block";export type GanttChartBlocksProps = {blockIds: string[];diff --git a/apps/web/ce/store/timeline/base-timeline.store.ts b/apps/web/ce/store/timeline/base-timeline.store.tsindex c021fa93ea..517a5700fb 100644--- a/apps/web/ce/store/timeline/base-timeline.store.ts+++ b/apps/web/ce/store/timeline/base-timeline.store.ts@@ -3,7 +3,13 @@ import set from "lodash/set";import { action, makeObservable, observable, runInAction } from "mobx";import { computedFn } from "mobx-utils";// components-import type { ChartDataType, IBlockUpdateDependencyData, IGanttBlock, TGanttViews } from "@plane/types";+import type {+ ChartDataType,+ IBlockUpdateDependencyData,+ IGanttBlock,+ TGanttViews,+ EGanttBlockType,+} from "@plane/types";import { renderFormattedPayloadDate } from "@plane/utils";import { currentViewDataWithView } from "@/components/gantt-chart/data";import {@@ -177,7 +183,7 @@ export class BaseTimeLineStore implements IBaseTimelineStore {* @param getDataById* @returns*/- updateBlocks(getDataById: (id: string) => BlockData | undefined | null) {+ updateBlocks(getDataById: (id: string) => BlockData | undefined | null, type?: EGanttBlockType, index?: number) {if (!this.blockIds || !Array.isArray(this.blockIds) || this.isDragging) return true;const updatedBlockMaps: { path: string[]; value: any }[] = [];@@ -195,7 +201,11 @@ export class BaseTimeLineStore implements IBaseTimelineStore {sort_order: blockData?.sort_order ?? undefined,start_date: blockData?.start_date ?? undefined,target_date: blockData?.target_date ?? undefined,- project_id: blockData?.project_id ?? undefined,+ meta: {+ type,+ index,+ project_id: blockData?.project_id,+ },};if (this.currentViewData && (this.currentViewData?.data?.startDate || this.currentViewData?.data?.dayWidth)) {block.position = getItemPositionWidth(this.currentViewData, block);@@ -285,7 +295,7 @@ export class BaseTimeLineStore implements IBaseTimelineStore {if (!currBlock?.position || !this.currentViewData) return [];- const updatePayload: IBlockUpdateDependencyData = { id };+ const updatePayload: IBlockUpdateDependencyData = { id, meta: currBlock.meta };// If shouldUpdateHalfBlock or the start date is available then update start dateif (shouldUpdateHalfBlock || currBlock.start_date) {diff --git a/apps/web/ce/store/timeline/index.ts b/apps/web/ce/store/timeline/index.tsindex 2353f760a9..5f423f4b72 100644--- a/apps/web/ce/store/timeline/index.ts+++ b/apps/web/ce/store/timeline/index.ts@@ -7,17 +7,20 @@ export interface ITimelineStore {issuesTimeLineStore: IIssuesTimeLineStore;modulesTimeLineStore: IModulesTimeLineStore;projectTimeLineStore: IBaseTimelineStore;+ groupedTimeLineStore: IBaseTimelineStore;}export class TimeLineStore implements ITimelineStore {issuesTimeLineStore: IIssuesTimeLineStore;modulesTimeLineStore: IModulesTimeLineStore;projectTimeLineStore: IBaseTimelineStore;+ groupedTimeLineStore: IBaseTimelineStore;constructor(rootStore: RootStore) {this.issuesTimeLineStore = new IssuesTimeLineStore(rootStore);this.modulesTimeLineStore = new ModulesTimeLineStore(rootStore);// Dummy storethis.projectTimeLineStore = new BaseTimeLineStore(rootStore);+ this.groupedTimeLineStore = new BaseTimeLineStore(rootStore);}}diff --git a/apps/web/core/components/gantt-chart/blocks/index.ts b/apps/web/core/components/gantt-chart/blocks/index.tsdeleted file mode 100644index c99f8af329..0000000000--- a/apps/web/core/components/gantt-chart/blocks/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./blocks-list";diff --git a/apps/web/core/components/gantt-chart/chart/main-content.tsx b/apps/web/core/components/gantt-chart/chart/main-content.tsxindex 5f9fb00435..278994b0b3 100644--- a/apps/web/core/components/gantt-chart/chart/main-content.tsx+++ b/apps/web/core/components/gantt-chart/chart/main-content.tsx@@ -6,23 +6,18 @@ import { ChartDataType, IBlockUpdateData, IBlockUpdateDependencyData, IGanttBlocimport { cn, getDate } from "@plane/utils";// componentsimport { MultipleSelectGroup } from "@/components/core";-import {- GanttChartBlocksList,- GanttChartSidebar,- MonthChartView,- QuarterChartView,- WeekChartView,-} from "@/components/gantt-chart";+import { GanttChartSidebar, MonthChartView, QuarterChartView, WeekChartView } from "@/components/gantt-chart";// helpers// hooksimport { useTimeLineChartStore } from "@/hooks/use-timeline-chart";// plane web componentsimport { TimelineDependencyPaths, TimelineDraggablePath } from "@/plane-web/components/gantt-chart";+import { GanttChartRowList } from "@/plane-web/components/gantt-chart/blocks/block-row-list";+import { GanttChartBlocksList } from "@/plane-web/components/gantt-chart/blocks/blocks-list";import { IssueBulkOperationsRoot } from "@/plane-web/components/issues";// plane web hooksimport { useBulkOperationStatus } from "@/plane-web/hooks/use-bulk-operation-status";//-import { GanttChartRowList } from "../blocks/block-row-list";import { DEFAULT_BLOCK_WIDTH, GANTT_SELECT_GROUP, HEADER_HEIGHT } from "../constants";import { getItemPositionWidth } from "../views";import { TimelineDragHelper } from "./timeline-drag-helper";diff --git a/apps/web/core/components/gantt-chart/contexts/index.tsx b/apps/web/core/components/gantt-chart/contexts/index.tsxindex 7a7c63f832..6d268be7e5 100644--- a/apps/web/core/components/gantt-chart/contexts/index.tsx+++ b/apps/web/core/components/gantt-chart/contexts/index.tsx@@ -4,6 +4,7 @@ export enum ETimeLineTypeType {ISSUE = "ISSUE",MODULE = "MODULE",PROJECT = "PROJECT",+ GROUPED = "GROUPED",}export const TimeLineTypeContext = createContext<ETimeLineTypeType | undefined>(undefined);diff --git a/apps/web/core/components/gantt-chart/helpers/add-block.tsx b/apps/web/core/components/gantt-chart/helpers/add-block.tsxindex fed218f911..742591a26b 100644--- a/apps/web/core/components/gantt-chart/helpers/add-block.tsx+++ b/apps/web/core/components/gantt-chart/helpers/add-block.tsx@@ -48,6 +48,7 @@ export const ChartAddBlock: React.FC<Props> = observer((props) => {blockUpdateHandler(block.data, {start_date: renderFormattedPayloadDate(startDate) ?? undefined,target_date: renderFormattedPayloadDate(endDate) ?? undefined,+ meta: block.meta,});};diff --git a/apps/web/core/components/gantt-chart/helpers/draggable.tsx b/apps/web/core/components/gantt-chart/helpers/draggable.tsxindex 6031f3efd9..98eda46c40 100644--- a/apps/web/core/components/gantt-chart/helpers/draggable.tsx+++ b/apps/web/core/components/gantt-chart/helpers/draggable.tsx@@ -53,7 +53,7 @@ export const ChartDraggable: React.FC<Props> = observer((props) => {})}onMouseDown={(e) => enableBlockMove && handleBlockDrag(e, "move")}>- {blockToRender(block.data)}+ {blockToRender({ ...block.data, meta: block.meta })}</div>{/* right resize drag handle */}<RightResizablediff --git a/apps/web/core/components/gantt-chart/index.ts b/apps/web/core/components/gantt-chart/index.tsindex 2d3055c2c2..49aaf6eeae 100644--- a/apps/web/core/components/gantt-chart/index.ts+++ b/apps/web/core/components/gantt-chart/index.ts@@ -1,4 +1,3 @@-export * from "./blocks";export * from "./chart";export * from "./helpers";export * from "./root";diff --git a/apps/web/core/components/gantt-chart/sidebar/root.tsx b/apps/web/core/components/gantt-chart/sidebar/root.tsxindex e4f2f8d0c7..fb5562b03a 100644--- a/apps/web/core/components/gantt-chart/sidebar/root.tsx+++ b/apps/web/core/components/gantt-chart/sidebar/root.tsx@@ -2,7 +2,7 @@ import { RefObject } from "react";import { observer } from "mobx-react";import { useTranslation } from "@plane/i18n";// components-import type { ChartDataType, IBlockUpdateData, IGanttBlock } from "@plane/types";+import type { IBlockUpdateData } from "@plane/types";import { Row, ERowVariant } from "@plane/ui";import { cn } from "@plane/utils";import { MultipleSelectGroupAction } from "@/components/core";@@ -82,7 +82,7 @@ export const GanttChartSidebar: React.FC<Props> = observer((props) => {<h6>{t("common.duration")}</h6></Row>- <Row variant={ERowVariant.HUGGING} className="min-h-full h-max bg-custom-background-100 overflow-hidden">+ <Row variant={ERowVariant.HUGGING} className="min-h-full h-max bg-custom-background-100">{sidebarToRender &&sidebarToRender({title,diff --git a/apps/web/core/hooks/use-timeline-chart.ts b/apps/web/core/hooks/use-timeline-chart.tsindex 79862f2045..7d0564f3c4 100644--- a/apps/web/core/hooks/use-timeline-chart.ts+++ b/apps/web/core/hooks/use-timeline-chart.ts@@ -17,6 +17,8 @@ export const useTimeLineChart = (timeLineType: ETimeLineTypeType): IBaseTimelinereturn context.timelineStore.modulesTimeLineStore as IBaseTimelineStore;case ETimeLineTypeType.PROJECT:return context.timelineStore.projectTimeLineStore as IBaseTimelineStore;+ case ETimeLineTypeType.GROUPED:+ return context.timelineStore.groupedTimeLineStore as IBaseTimelineStore;}};diff --git a/apps/web/ee/components/gantt-chart/blocks/block-row-list.tsx b/apps/web/ee/components/gantt-chart/blocks/block-row-list.tsxnew file mode 100644index 0000000000..2d50f5e5ea--- /dev/null+++ b/apps/web/ee/components/gantt-chart/blocks/block-row-list.tsx@@ -0,0 +1 @@+export * from "ce/components/gantt-chart/blocks/block-row-list";diff --git a/apps/web/ee/components/gantt-chart/blocks/blocks-list.tsx b/apps/web/ee/components/gantt-chart/blocks/blocks-list.tsxnew file mode 100644index 0000000000..ced4c0ed2c--- /dev/null+++ b/apps/web/ee/components/gantt-chart/blocks/blocks-list.tsx@@ -0,0 +1 @@+export * from "ce/components/gantt-chart/blocks/blocks-list";diff --git a/packages/types/src/layout/gantt.ts b/packages/types/src/layout/gantt.tsindex 990ae3fc3f..0fb54615c9 100644--- a/packages/types/src/layout/gantt.ts+++ b/packages/types/src/layout/gantt.ts@@ -1,3 +1,8 @@+export enum EGanttBlockType {+ EPIC = "epic",+ PROJECT = "project",+ ISSUE = "issue",+}export interface IGanttBlock {data: any;id: string;@@ -9,7 +14,7 @@ export interface IGanttBlock {sort_order: number | undefined;start_date: string | undefined;target_date: string | undefined;- project_id: string | undefined;+ meta?: Record<string, any>;}export interface IBlockUpdateData {@@ -20,13 +25,14 @@ export interface IBlockUpdateData {};start_date?: string;target_date?: string;+ meta?: Record<string, any>;}export interface IBlockUpdateDependencyData {id: string;start_date?: string;target_date?: string;- project_id?: string;+ meta?: Record<string, any>;}export type TGanttViews = "week" | "month" | "quarter";diff --git a/packages/utils/src/work-item/base.ts b/packages/utils/src/work-item/base.tsindex 50ee3a66b7..6cef74175a 100644--- a/packages/utils/src/work-item/base.ts+++ b/packages/utils/src/work-item/base.ts@@ -190,7 +190,9 @@ export const getIssueBlocksStructure = (block: TIssue): IGanttBlock => ({sort_order: block?.sort_order,start_date: block?.start_date ?? undefined,target_date: block?.target_date ?? undefined,- project_id: block?.project_id ?? undefined,+ meta: {+ project_id: block?.project_id ?? undefined,+ },});export const formatTextList = (TextArray: string[]): string => {