π₯π₯π₯ 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
code refactor and improvement (#6203)
Anmol Singh Bhatia438cc33046be
diff --git a/packages/constants/src/issue.ts b/packages/constants/src/issue.tsindex 9f6a1a2e2e..9aa65d13e3 100644--- a/packages/constants/src/issue.ts+++ b/packages/constants/src/issue.ts@@ -39,3 +39,8 @@ export enum EServerGroupByToFilterOptions {"project_id" = "project","created_by" = "created_by",}++export enum EIssueServiceType {+ ISSUES = "issues",+ EPICS = "epics",+}diff --git a/packages/types/src/issues/issue.d.ts b/packages/types/src/issues/issue.d.tsindex b9366cccba..6fd160e77f 100644--- a/packages/types/src/issues/issue.d.ts+++ b/packages/types/src/issues/issue.d.ts@@ -1,3 +1,4 @@+import { EIssueServiceType } from "@plane/constants";import { TIssuePriorities } from "../issues";import { TIssueAttachment } from "./issue_attachment";import { TIssueLink } from "./issue_link";@@ -39,6 +40,7 @@ export type TBaseIssue = {updated_by: string;is_draft: boolean;+ is_epic?: boolean;};export type IssueRelation = {@@ -121,3 +123,7 @@ export type TIssueDetailWidget =| "relations"| "links"| "attachments";++export type TIssueServiceType =+ | EIssueServiceType.ISSUES+ | EIssueServiceType.EPICS;diff --git a/packages/types/src/project/projects.d.ts b/packages/types/src/project/projects.d.tsindex d48342cebb..f878266b75 100644--- a/packages/types/src/project/projects.d.ts+++ b/packages/types/src/project/projects.d.ts@@ -136,6 +136,7 @@ export type TProjectIssuesSearchParams = {issue_id?: string;workspace_search: boolean;target_date?: string;+ epic?: boolean;};export interface ISearchIssueResponse {diff --git a/web/ce/components/epics/epic-modal/index.ts b/web/ce/components/epics/epic-modal/index.tsnew file mode 100644index 0000000000..031608e25f--- /dev/null+++ b/web/ce/components/epics/epic-modal/index.ts@@ -0,0 +1 @@+export * from "./modal";diff --git a/web/ce/components/epics/epic-modal/modal.tsx b/web/ce/components/epics/epic-modal/modal.tsxnew file mode 100644index 0000000000..9c76b7bdab--- /dev/null+++ b/web/ce/components/epics/epic-modal/modal.tsx@@ -0,0 +1,19 @@+"use client";+import React, { FC } from "react";+import { TIssue } from "@plane/types";++export interface EpicModalProps {+ data?: Partial<TIssue>;+ isOpen: boolean;+ onClose: () => void;+ beforeFormSubmit?: () => Promise<void>;+ onSubmit?: (res: TIssue) => Promise<void>;+ fetchIssueDetails?: boolean;+ primaryButtonText?: {+ default: string;+ loading: string;+ };+ isProjectSelectionDisabled?: boolean;+}++export const CreateUpdateEpicModal: FC<EpicModalProps> = (props) => <></>;diff --git a/web/ce/components/epics/index.ts b/web/ce/components/epics/index.tsnew file mode 100644index 0000000000..29da0cc8ac--- /dev/null+++ b/web/ce/components/epics/index.ts@@ -0,0 +1 @@+export * from "./epic-modal";diff --git a/web/ce/components/gantt-chart/dependency/dependency-paths.tsx b/web/ce/components/gantt-chart/dependency/dependency-paths.tsxindex f049875f11..6feb208a8b 100644--- a/web/ce/components/gantt-chart/dependency/dependency-paths.tsx+++ b/web/ce/components/gantt-chart/dependency/dependency-paths.tsx@@ -1 +1,9 @@-export const TimelineDependencyPaths = () => <></>;+import { FC } from "react";++type Props = {+ isEpic?: boolean;+};+export const TimelineDependencyPaths: FC<Props> = (props) => {+ const { isEpic = false } = props;+ return <></>;+};diff --git a/web/ce/components/issue-types/values/update.tsx b/web/ce/components/issue-types/values/update.tsxindex cff391d9ea..2fd6290426 100644--- a/web/ce/components/issue-types/values/update.tsx+++ b/web/ce/components/issue-types/values/update.tsx@@ -1,9 +1,12 @@+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/hooks/use-debounced-duplicate-issues.tsx b/web/ce/hooks/use-debounced-duplicate-issues.tsxindex f0325bc128..8028a61910 100644--- a/web/ce/hooks/use-debounced-duplicate-issues.tsx+++ b/web/ce/hooks/use-debounced-duplicate-issues.tsx@@ -1,6 +1,7 @@import { TDeDupeIssue } from "@plane/types";export const useDebouncedDuplicateIssues = (+ workspaceSlug: string | undefined,workspaceId: string | undefined,projectId: string | undefined,formData: { name: string | undefined; description_html?: string | undefined; issueId?: string | undefined }diff --git a/web/ce/store/issue/epic/filter.store.ts b/web/ce/store/issue/epic/filter.store.tsnew file mode 100644index 0000000000..a4733c60a5--- /dev/null+++ b/web/ce/store/issue/epic/filter.store.ts@@ -0,0 +1,15 @@+import { IProjectIssuesFilter, ProjectIssuesFilter } from "@/store/issue/project";+import { IIssueRootStore } from "@/store/issue/root.store";++// @ts-nocheck - This class will never be used, extending similar class to avoid type errors+export type IProjectEpicsFilter = IProjectIssuesFilter;++// @ts-nocheck - This class will never be used, extending similar class to avoid type errors+export class ProjectEpicsFilter extends ProjectIssuesFilter implements IProjectEpicsFilter {+ constructor(_rootStore: IIssueRootStore) {+ super(_rootStore);++ // root store+ this.rootIssueStore = _rootStore;+ }+}diff --git a/web/ce/store/issue/epic/index.ts b/web/ce/store/issue/epic/index.tsnew file mode 100644index 0000000000..0fe6c946b0--- /dev/null+++ b/web/ce/store/issue/epic/index.ts@@ -0,0 +1,2 @@+export * from "./filter.store";+export * from "./issue.store";diff --git a/web/ce/store/issue/epic/issue.store.ts b/web/ce/store/issue/epic/issue.store.tsnew file mode 100644index 0000000000..90ccee84da--- /dev/null+++ b/web/ce/store/issue/epic/issue.store.ts@@ -0,0 +1,14 @@+import { IProjectIssues, ProjectIssues } from "@/store/issue/project";+import { IIssueRootStore } from "@/store/issue/root.store";+import { IProjectEpicsFilter } from "./filter.store";++// @ts-nocheck - This class will never be used, extending similar class to avoid type errors++export type IProjectEpics = IProjectIssues;++// @ts-nocheck - This class will never be used, extending similar class to avoid type errors+export class ProjectEpics extends ProjectIssues implements IProjectEpics {+ constructor(_rootStore: IIssueRootStore, issueFilterStore: IProjectEpicsFilter) {+ super(_rootStore, issueFilterStore);+ }+}diff --git a/web/ce/store/issue/issue-details/activity.store.ts b/web/ce/store/issue/issue-details/activity.store.tsindex 6c0029c4f8..de84fb87d9 100644--- a/web/ce/store/issue/issue-details/activity.store.ts+++ b/web/ce/store/issue/issue-details/activity.store.ts@@ -7,7 +7,14 @@ import uniq from "lodash/uniq";import update from "lodash/update";import { action, makeObservable, observable, runInAction } from "mobx";import { computedFn } from "mobx-utils";-import { TIssueActivityComment, TIssueActivity, TIssueActivityMap, TIssueActivityIdMap } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import {+ TIssueActivityComment,+ TIssueActivity,+ TIssueActivityMap,+ TIssueActivityIdMap,+ TIssueServiceType,+} from "@plane/types";// plane web constantsimport { EActivityFilterType } from "@/plane-web/constants/issues";// services@@ -29,7 +36,7 @@ export interface IIssueActivityStoreActions {export interface IIssueActivityStore extends IIssueActivityStoreActions {// observables- sortOrder: 'asc' | 'desc'+ sortOrder: "asc" | "desc";loader: TActivityLoader;activities: TIssueActivityIdMap;activityMap: TIssueActivityMap;@@ -37,20 +44,24 @@ export interface IIssueActivityStore extends IIssueActivityStoreActions {getActivitiesByIssueId: (issueId: string) => string[] | undefined;getActivityById: (activityId: string) => TIssueActivity | undefined;getActivityCommentByIssueId: (issueId: string) => TIssueActivityComment[] | undefined;- toggleSortOrder: ()=>void;+ toggleSortOrder: () => void;}export class IssueActivityStore implements IIssueActivityStore {// observables- sortOrder: "asc" | "desc" = 'asc';+ sortOrder: "asc" | "desc" = "asc";loader: TActivityLoader = "fetch";activities: TIssueActivityIdMap = {};activityMap: TIssueActivityMap = {};// services+ serviceType;issueActivityService;- constructor(protected store: CoreRootStore) {+ constructor(+ protected store: CoreRootStore,+ serviceType: TIssueServiceType = EIssueServiceType.ISSUES+ ) {makeObservable(this, {// observablessortOrder: observable.ref,@@ -59,10 +70,11 @@ export class IssueActivityStore implements IIssueActivityStore {activityMap: observable,// actionsfetchActivities: action,- toggleSortOrder: action+ toggleSortOrder: action,});+ this.serviceType = serviceType;// services- this.issueActivityService = new IssueActivityService();+ this.issueActivityService = new IssueActivityService(this.serviceType);}// helper methods@@ -81,8 +93,10 @@ export class IssueActivityStore implements IIssueActivityStore {let activityComments: TIssueActivityComment[] = [];+ const currentStore = this.serviceType === EIssueServiceType.EPICS ? this.store.epic : this.store.issue;+const activities = this.getActivitiesByIssueId(issueId) || [];- const comments = this.store.issue.issueDetail.comment.getCommentsByIssueId(issueId) || [];+ const comments = currentStore.issueDetail.comment.getCommentsByIssueId(issueId) || [];activities.forEach((activityId) => {const activity = this.getActivityById(activityId);@@ -95,7 +109,7 @@ export class IssueActivityStore implements IIssueActivityStore {});comments.forEach((commentId) => {- const comment = this.store.issue.issueDetail.comment.getCommentById(commentId);+ const comment = currentStore.issueDetail.comment.getCommentById(commentId);if (!comment) return;activityComments.push({id: comment.id,@@ -104,14 +118,14 @@ export class IssueActivityStore implements IIssueActivityStore {});});- activityComments = orderBy(activityComments, (e)=>new Date(e.created_at || 0), this.sortOrder);+ activityComments = orderBy(activityComments, (e) => new Date(e.created_at || 0), this.sortOrder);return activityComments;});- toggleSortOrder = ()=>{- this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';- }+ toggleSortOrder = () => {+ this.sortOrder = this.sortOrder === "asc" ? "desc" : "asc";+ };// actionspublic async fetchActivities(diff --git a/web/core/components/editor/lite-text-editor/lite-text-editor.tsx b/web/core/components/editor/lite-text-editor/lite-text-editor.tsxindex 0fe75904d8..b77106a195 100644--- a/web/core/components/editor/lite-text-editor/lite-text-editor.tsx+++ b/web/core/components/editor/lite-text-editor/lite-text-editor.tsx@@ -1,4 +1,4 @@-import React from "react";+import React, { useState } from "react";// editorimport { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef } from "@plane/editor";// types@@ -27,6 +27,7 @@ interface LiteTextEditorWrapperPropsshowAccessSpecifier?: boolean;showSubmitButton?: boolean;isSubmitting?: boolean;+ showToolbarInitially?: boolean;uploadFile: (file: File) => Promise<string>;}@@ -41,10 +42,13 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrappshowAccessSpecifier = false,showSubmitButton = true,isSubmitting = false,+ showToolbarInitially = true,placeholder = "Add comment...",uploadFile,...rest} = props;+ // states+ const [isFocused, setIsFocused] = useState(showToolbarInitially);// store hooksconst { data: currentUser } = useUser();const {@@ -73,7 +77,11 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrappconst editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;return (- <div className="border border-custom-border-200 rounded p-3 space-y-3">+ <div+ className={cn("relative border border-custom-border-200 rounded p-3")}+ onFocus={() => !showToolbarInitially && setIsFocused(true)}+ onBlur={() => !showToolbarInitially && setIsFocused(false)}+ ><LiteTextEditorWithRefref={ref}disabledExtensions={disabledExtensions}@@ -92,24 +100,31 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrappcontainerClassName={cn(containerClassName, "relative")}{...rest}/>- <IssueCommentToolbar- accessSpecifier={accessSpecifier}- executeCommand={(item) => {- // TODO: update this while toolbar homogenization- // @ts-expect-error type mismatch here- editorRef?.executeMenuItemCommand({- itemKey: item.itemKey,- ...item.extraProps,- });- }}- handleAccessChange={handleAccessChange}- handleSubmit={(e) => rest.onEnterKeyPress?.(e)}- isCommentEmpty={isEmpty}- isSubmitting={isSubmitting}- showAccessSpecifier={showAccessSpecifier}- editorRef={editorRef}- showSubmitButton={showSubmitButton}- />+ <div+ className={cn(+ "transition-all duration-300 ease-out origin-top overflow-hidden",+ isFocused ? "max-h-[200px] opacity-100 scale-y-100 mt-3" : "max-h-0 opacity-0 scale-y-0 invisible"+ )}+ >+ <IssueCommentToolbar+ accessSpecifier={accessSpecifier}+ executeCommand={(item) => {+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch here+ editorRef?.executeMenuItemCommand({+ itemKey: item.itemKey,+ ...item.extraProps,+ });+ }}+ handleAccessChange={handleAccessChange}+ handleSubmit={(e) => rest.onEnterKeyPress?.(e)}+ isCommentEmpty={isEmpty}+ isSubmitting={isSubmitting}+ showAccessSpecifier={showAccessSpecifier}+ editorRef={editorRef}+ showSubmitButton={showSubmitButton}+ />+ </div></div>);});diff --git a/web/core/components/gantt-chart/chart/main-content.tsx b/web/core/components/gantt-chart/chart/main-content.tsxindex b9582d21ce..63e01c54ea 100644--- a/web/core/components/gantt-chart/chart/main-content.tsx+++ b/web/core/components/gantt-chart/chart/main-content.tsx@@ -56,6 +56,7 @@ type Props = {targetDate?: Date) => ChartDataType | undefined;quickAdd?: React.JSX.Element | undefined;+ isEpic?: boolean;};export const GanttChartMainContent: React.FC<Props> = observer((props) => {@@ -79,6 +80,7 @@ export const GanttChartMainContent: React.FC<Props> = observer((props) => {updateCurrentViewRenderPayload,quickAdd,updateBlockDates,+ isEpic = false,} = props;// refsconst ganttContainerRef = useRef<HTMLDivElement>(null);@@ -159,7 +161,7 @@ export const GanttChartMainContent: React.FC<Props> = observer((props) => {entities={{[GANTT_SELECT_GROUP]: blockIds ?? [],}}- disabled={!isBulkOperationsEnabled}+ disabled={!isBulkOperationsEnabled || isEpic}>{(helpers) => (<>@@ -187,6 +189,7 @@ export const GanttChartMainContent: React.FC<Props> = observer((props) => {title={title}quickAdd={quickAdd}selectionHelpers={helpers}+ isEpic={isEpic}/><div className="relative min-h-full h-max flex-shrink-0 flex-grow"><ActiveChartView />@@ -208,7 +211,7 @@ export const GanttChartMainContent: React.FC<Props> = observer((props) => {selectionHelpers={helpers}ganttContainerRef={ganttContainerRef}/>- <TimelineDependencyPaths />+ <TimelineDependencyPaths isEpic={isEpic} /><TimelineDraggablePath /><GanttChartBlocksListblockIds={blockIds}diff --git a/web/core/components/gantt-chart/chart/root.tsx b/web/core/components/gantt-chart/chart/root.tsxindex fa525f13a8..03e63e7a5b 100644--- a/web/core/components/gantt-chart/chart/root.tsx+++ b/web/core/components/gantt-chart/chart/root.tsx@@ -41,6 +41,7 @@ type ChartViewRootProps = {canLoadMoreBlocks?: boolean;quickAdd?: React.JSX.Element | undefined;showToday: boolean;+ isEpic?: boolean;};const timelineViewHelpers = {@@ -71,6 +72,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = observer((props) => {quickAdd,showToday,updateBlockDates,+ isEpic = false,} = props;// statesconst [itemsContainerWidth, setItemsContainerWidth] = useState(0);@@ -204,6 +206,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = observer((props) => {updateCurrentViewRenderPayload={updateCurrentViewRenderPayload}quickAdd={quickAdd}updateBlockDates={updateBlockDates}+ isEpic={isEpic}/></div>);diff --git a/web/core/components/gantt-chart/root.tsx b/web/core/components/gantt-chart/root.tsxindex 81f064e2fb..3ed21d1440 100644--- a/web/core/components/gantt-chart/root.tsx+++ b/web/core/components/gantt-chart/root.tsx@@ -26,6 +26,7 @@ type GanttChartRootProps = {bottomSpacing?: boolean;showAllBlocks?: boolean;showToday?: boolean;+ isEpic?: boolean;};export const GanttChartRoot: FC<GanttChartRootProps> = observer((props) => {@@ -50,6 +51,7 @@ export const GanttChartRoot: FC<GanttChartRootProps> = observer((props) => {showToday = true,quickAdd,updateBlockDates,+ isEpic = false,} = props;const { setBlockIds } = useTimeLineChartStore();@@ -81,6 +83,7 @@ export const GanttChartRoot: FC<GanttChartRootProps> = observer((props) => {quickAdd={quickAdd}showToday={showToday}updateBlockDates={updateBlockDates}+ isEpic={isEpic}/>);});diff --git a/web/core/components/gantt-chart/sidebar/issues/block.tsx b/web/core/components/gantt-chart/sidebar/issues/block.tsxindex bb286c2800..c0218aceb1 100644--- a/web/core/components/gantt-chart/sidebar/issues/block.tsx+++ b/web/core/components/gantt-chart/sidebar/issues/block.tsx@@ -19,10 +19,11 @@ type Props = {enableSelection: boolean;isDragging: boolean;selectionHelpers?: TSelectionHelper;+ isEpic?: boolean;};export const IssuesSidebarBlock = observer((props: Props) => {- const { block, enableSelection, isDragging, selectionHelpers } = props;+ const { block, enableSelection, isDragging, selectionHelpers, isEpic = false } = props;// store hooksconst { updateActiveBlockId, isBlockActive, getNumberOfDaysFromPosition } = useTimeLineChartStore();const { getIsIssuePeeked } = useIssueDetail();@@ -73,7 +74,7 @@ export const IssuesSidebarBlock = observer((props: Props) => {)}<div className="flex h-full flex-grow items-center justify-between gap-2 truncate"><div className="flex-grow truncate">- <IssueGanttSidebarBlock issueId={block.data.id} />+ <IssueGanttSidebarBlock issueId={block.data.id} isEpic={isEpic} /></div>{duration && (<div className="flex-shrink-0 text-sm text-custom-text-200">diff --git a/web/core/components/gantt-chart/sidebar/issues/sidebar.tsx b/web/core/components/gantt-chart/sidebar/issues/sidebar.tsxindex b2f6b87928..d2e5557ff8 100644--- a/web/core/components/gantt-chart/sidebar/issues/sidebar.tsx+++ b/web/core/components/gantt-chart/sidebar/issues/sidebar.tsx@@ -29,6 +29,7 @@ type Props = {enableSelection: boolean;showAllBlocks?: boolean;selectionHelpers?: TSelectionHelper;+ isEpic?: boolean;};export const IssueGanttSidebar: React.FC<Props> = observer((props) => {@@ -42,6 +43,7 @@ export const IssueGanttSidebar: React.FC<Props> = observer((props) => {ganttContainerRef,showAllBlocks = false,selectionHelpers,+ isEpic = false,} = props;const { getBlockById } = useTimeLineChart(ETimeLineTypeType.ISSUE);@@ -101,6 +103,7 @@ export const IssueGanttSidebar: React.FC<Props> = observer((props) => {enableSelection={enableSelection}isDragging={isDragging}selectionHelpers={selectionHelpers}+ isEpic={isEpic}/>)}</GanttDnDHOC>diff --git a/web/core/components/gantt-chart/sidebar/root.tsx b/web/core/components/gantt-chart/sidebar/root.tsxindex 31c9137cc5..7202efc55d 100644--- a/web/core/components/gantt-chart/sidebar/root.tsx+++ b/web/core/components/gantt-chart/sidebar/root.tsx@@ -23,6 +23,7 @@ type Props = {title: string;quickAdd?: React.JSX.Element | undefined;selectionHelpers: TSelectionHelper;+ isEpic?: boolean;};export const GanttChartSidebar: React.FC<Props> = observer((props) => {@@ -38,6 +39,7 @@ export const GanttChartSidebar: React.FC<Props> = observer((props) => {title,quickAdd,selectionHelpers,+ isEpic = false,} = props;const isGroupSelectionEmpty = selectionHelpers.isGroupSelected(GANTT_SELECT_GROUP) === "empty";@@ -90,6 +92,7 @@ export const GanttChartSidebar: React.FC<Props> = observer((props) => {ganttContainerRef,loadMoreBlocks,selectionHelpers,+ isEpic,})}</Row>{quickAdd ? quickAdd : null}diff --git a/web/core/components/inbox/content/issue-root.tsx b/web/core/components/inbox/content/issue-root.tsxindex b154bd2056..258a1c50b0 100644--- a/web/core/components/inbox/content/issue-root.tsx+++ b/web/core/components/inbox/content/issue-root.tsx@@ -65,11 +65,16 @@ export const InboxIssueMainContent: React.FC<Props> = observer((props) => {const projectDetails = issue?.project_id ? getProjectById(issue?.project_id) : undefined;// debounced duplicate issues swr- const { duplicateIssues } = useDebouncedDuplicateIssues(projectDetails?.workspace.toString(), projectId, {- name: issue?.name,- description_html: getTextContent(issue?.description_html),- issueId: issue?.id,- });+ const { duplicateIssues } = useDebouncedDuplicateIssues(+ workspaceSlug,+ projectDetails?.workspace.toString(),+ projectId,+ {+ name: issue?.name,+ description_html: getTextContent(issue?.description_html),+ issueId: issue?.id,+ }+ );if (!issue) return <></>;diff --git a/web/core/components/inbox/modals/create-modal/create-root.tsx b/web/core/components/inbox/modals/create-modal/create-root.tsxindex 4f7bbd4b45..34c17e15b3 100644--- a/web/core/components/inbox/modals/create-modal/create-root.tsx+++ b/web/core/components/inbox/modals/create-modal/create-root.tsx@@ -87,10 +87,15 @@ export const InboxIssueCreateRoot: FC<TInboxIssueCreateRoot> = observer((props)const { getIndex } = getTabIndex(ETabIndices.INTAKE_ISSUE_FORM, isMobile);// debounced duplicate issues swr- const { duplicateIssues } = useDebouncedDuplicateIssues(projectDetails?.workspace.toString(), projectId, {- name: formData?.name,- description_html: formData?.description_html,- });+ const { duplicateIssues } = useDebouncedDuplicateIssues(+ workspaceSlug,+ projectDetails?.workspace.toString(),+ projectId,+ {+ name: formData?.name,+ description_html: formData?.description_html,+ }+ );const handleEscKeyDown = (event: KeyboardEvent) => {if (descriptionEditorRef.current?.isEditorReadyToDiscard()) {diff --git a/web/core/components/issues/attachment/attachment-item-list.tsx b/web/core/components/issues/attachment/attachment-item-list.tsxindex d377bd90a1..ca3c0ef9f1 100644--- a/web/core/components/issues/attachment/attachment-item-list.tsx+++ b/web/core/components/issues/attachment/attachment-item-list.tsx@@ -2,6 +2,8 @@ import { FC, useCallback, useState } from "react";import { observer } from "mobx-react";import { FileRejection, useDropzone } from "react-dropzone";import { UploadCloud } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// hooksimport { TOAST_TYPE, setToast } from "@plane/ui";import { useIssueDetail } from "@/hooks/store";@@ -21,10 +23,18 @@ type TIssueAttachmentItemList = {issueId: string;attachmentHelpers: TAttachmentHelpers;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueAttachmentItemList: FC<TIssueAttachmentItemList> = observer((props) => {- const { workspaceSlug, projectId, issueId, attachmentHelpers, disabled } = props;+ const {+ workspaceSlug,+ projectId,+ issueId,+ attachmentHelpers,+ disabled,+ issueServiceType = EIssueServiceType.ISSUES,+ } = props;// statesconst [isUploading, setIsUploading] = useState(false);// store hooks@@ -33,7 +43,7 @@ export const IssueAttachmentItemList: FC<TIssueAttachmentItemList> = observer((pattachmentDeleteModalId,toggleDeleteAttachmentModal,fetchActivities,- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const { operations: attachmentOperations, snapshot: attachmentSnapshot } = attachmentHelpers;const { create: createAttachment } = attachmentOperations;const { uploadStatus } = attachmentSnapshot;@@ -104,6 +114,7 @@ export const IssueAttachmentItemList: FC<TIssueAttachmentItemList> = observer((ponClose={() => toggleDeleteAttachmentModal(null)}attachmentOperations={attachmentOperations}attachmentId={attachmentDeleteModalId}+ issueServiceType={issueServiceType}/>)}<div@@ -122,7 +133,12 @@ export const IssueAttachmentItemList: FC<TIssueAttachmentItemList> = observer((p</div>)}{issueAttachments?.map((attachmentId) => (- <IssueAttachmentsListItem key={attachmentId} attachmentId={attachmentId} disabled={disabled} />+ <IssueAttachmentsListItem+ key={attachmentId}+ attachmentId={attachmentId}+ disabled={disabled}+ issueServiceType={issueServiceType}+ />))}</div></>diff --git a/web/core/components/issues/attachment/attachment-list-item.tsx b/web/core/components/issues/attachment/attachment-list-item.tsxindex e3adc5f828..dfdbde0741 100644--- a/web/core/components/issues/attachment/attachment-list-item.tsx+++ b/web/core/components/issues/attachment/attachment-list-item.tsx@@ -3,6 +3,8 @@import { FC } from "react";import { observer } from "mobx-react";import { Trash } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// uiimport { CustomMenu, Tooltip } from "@plane/ui";// components@@ -19,17 +21,18 @@ import { usePlatformOS } from "@/hooks/use-platform-os";type TIssueAttachmentsListItem = {attachmentId: string;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueAttachmentsListItem: FC<TIssueAttachmentsListItem> = observer((props) => {// props- const { attachmentId, disabled } = props;+ const { attachmentId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooksconst { getUserDetails } = useMember();const {attachment: { getAttachmentById },toggleDeleteAttachmentModal,- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// derived valuesconst attachment = attachmentId ? getAttachmentById(attachmentId) : undefined;const fileName = getFileName(attachment?.attributes.name ?? "");diff --git a/web/core/components/issues/attachment/delete-attachment-modal.tsx b/web/core/components/issues/attachment/delete-attachment-modal.tsxindex 925ff21c0c..32c9d961c7 100644--- a/web/core/components/issues/attachment/delete-attachment-modal.tsx+++ b/web/core/components/issues/attachment/delete-attachment-modal.tsx@@ -1,6 +1,9 @@import { FC, useState } from "react";import { observer } from "mobx-react";+// constants+import { EIssueServiceType } from "@plane/constants";// types+import { TIssueServiceType } from "@plane/types";// uiimport { AlertModalCore } from "@plane/ui";// helper@@ -17,17 +20,18 @@ type Props = {onClose: () => void;attachmentId: string;attachmentOperations: TAttachmentOperationsRemoveModal;+ issueServiceType?: TIssueServiceType;};export const IssueAttachmentDeleteModal: FC<Props> = observer((props) => {- const { isOpen, onClose, attachmentId, attachmentOperations } = props;+ const { isOpen, onClose, attachmentId, attachmentOperations, issueServiceType = EIssueServiceType.ISSUES } = props;// statesconst [loader, setLoader] = useState(false);// store hooksconst {attachment: { getAttachmentById },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// derived valuesconst attachment = attachmentId ? getAttachmentById(attachmentId) : undefined;diff --git a/web/core/components/issues/filters.tsx b/web/core/components/issues/filters.tsxindex 4b80ba12f1..54b6f50157 100644--- a/web/core/components/issues/filters.tsx+++ b/web/core/components/issues/filters.tsx@@ -4,24 +4,17 @@ import { useCallback, useState } from "react";import { observer } from "mobx-react";// typesimport { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";-// uiimport { Button } from "@plane/ui";-+// componentsimport { DisplayFiltersSelection, FiltersDropdown, FilterSelection, LayoutSelection } from "@/components/issues";// constants-import {- EIssueFilterType,- EIssuesStoreType,- EIssueLayoutTypes,- ISSUE_DISPLAY_FILTERS_BY_LAYOUT,-} from "@/constants/issue";+import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_STORE_TO_FILTERS_MAP } from "@/constants/issue";// helpersimport { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useLabel, useProjectState, useMember, useIssues } from "@/hooks/store";// plane web typesimport { TProject } from "@/plane-web/types";-// local componentsimport { ProjectAnalyticsModal } from "../analytics";type Props = {@@ -29,8 +22,16 @@ type Props = {projectId: string;workspaceSlug: string;canUserCreateIssue: boolean | undefined;+ storeType?: EIssuesStoreType.PROJECT | EIssuesStoreType.EPIC;};-const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlug, canUserCreateIssue }: Props) => {+const HeaderFilters = observer((props: Props) => {+ const {+ currentProjectDetails,+ projectId,+ workspaceSlug,+ canUserCreateIssue,+ storeType = EIssuesStoreType.PROJECT,+ } = props;// statesconst [analyticsModal, setAnalyticsModal] = useState(false);// store hooks@@ -39,11 +40,12 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlu} = useMember();const {issuesFilter: { issueFilters, updateFilters },- } = useIssues(EIssuesStoreType.PROJECT);-+ } = useIssues(storeType);const { projectStates } = useProjectState();const { projectLabels } = useLabel();+ // derived valuesconst activeLayout = issueFilters?.displayFilters?.layout;+ const layoutDisplayFiltersOptions = ISSUE_STORE_TO_FILTERS_MAP[storeType]?.[activeLayout];const handleFiltersUpdate = useCallback((key: keyof IIssueFilterOptions, value: string | string[]) => {@@ -113,7 +115,7 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSluhandleFiltersUpdate={handleFiltersUpdate}displayFilters={issueFilters?.displayFilters ?? {}}handleDisplayFiltersUpdate={handleDisplayFilters}- layoutDisplayFiltersOptions={activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined}+ layoutDisplayFiltersOptions={layoutDisplayFiltersOptions}labels={projectLabels}memberIds={projectMemberIds ?? undefined}states={projectStates}@@ -123,7 +125,7 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlu</FiltersDropdown><FiltersDropdown title="Display" placement="bottom-end"><DisplayFiltersSelection- layoutDisplayFiltersOptions={activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined}+ layoutDisplayFiltersOptions={layoutDisplayFiltersOptions}displayFilters={issueFilters?.displayFilters ?? {}}handleDisplayFiltersUpdate={handleDisplayFilters}displayProperties={issueFilters?.displayProperties ?? {}}diff --git a/web/core/components/issues/issue-detail-widgets/attachments/content.tsx b/web/core/components/issues/issue-detail-widgets/attachments/content.tsxindex 9c5b2a4915..7441ad42f2 100644--- a/web/core/components/issues/issue-detail-widgets/attachments/content.tsx+++ b/web/core/components/issues/issue-detail-widgets/attachments/content.tsx@@ -1,6 +1,8 @@"use client";import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// componentsimport { IssueAttachmentItemList } from "@/components/issues/attachment";// helper@@ -11,12 +13,13 @@ type Props = {projectId: string;issueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueAttachmentsCollapsibleContent: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled } = props;+ const { workspaceSlug, projectId, issueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// helper- const attachmentHelpers = useAttachmentOperations(workspaceSlug, projectId, issueId);+ const attachmentHelpers = useAttachmentOperations(workspaceSlug, projectId, issueId, issueServiceType);return (<IssueAttachmentItemListworkspaceSlug={workspaceSlug}@@ -24,6 +27,7 @@ export const IssueAttachmentsCollapsibleContent: FC<Props> = observer((props) =>issueId={issueId}disabled={disabled}attachmentHelpers={attachmentHelpers}+ issueServiceType={issueServiceType}/>);});diff --git a/web/core/components/issues/issue-detail-widgets/attachments/helper.tsx b/web/core/components/issues/issue-detail-widgets/attachments/helper.tsxindex 43b4812e6a..28684ac998 100644--- a/web/core/components/issues/issue-detail-widgets/attachments/helper.tsx+++ b/web/core/components/issues/issue-detail-widgets/attachments/helper.tsx@@ -1,5 +1,7 @@"use client";import { useMemo } from "react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// plane uiimport { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";// hooks@@ -24,11 +26,12 @@ export type TAttachmentHelpers = {export const useAttachmentOperations = (workspaceSlug: string,projectId: string,- issueId: string+ issueId: string,+ issueServiceType: TIssueServiceType = EIssueServiceType.ISSUES): TAttachmentHelpers => {const {attachment: { createAttachment, removeAttachment, getAttachmentsUploadStatusByIssueId },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const { captureIssueEvent } = useEventTracker();const attachmentOperations: TAttachmentOperations = useMemo(diff --git a/web/core/components/issues/issue-detail-widgets/attachments/quick-action-button.tsx b/web/core/components/issues/issue-detail-widgets/attachments/quick-action-button.tsxindex c2d88a9541..fb0b5b2c6f 100644--- a/web/core/components/issues/issue-detail-widgets/attachments/quick-action-button.tsx+++ b/web/core/components/issues/issue-detail-widgets/attachments/quick-action-button.tsx@@ -4,6 +4,8 @@ import React, { FC, useCallback, useState } from "react";import { observer } from "mobx-react";import { FileRejection, useDropzone } from "react-dropzone";import { Plus } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// plane uiimport { TOAST_TYPE, setToast } from "@plane/ui";// hooks@@ -19,18 +21,31 @@ type Props = {issueId: string;customButton?: React.ReactNode;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueAttachmentActionButton: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, customButton, disabled = false } = props;+ const {+ workspaceSlug,+ projectId,+ issueId,+ customButton,+ disabled = false,+ issueServiceType = EIssueServiceType.ISSUES,+ } = props;// stateconst [isLoading, setIsLoading] = useState(false);// store hooks- const { setLastWidgetAction, fetchActivities } = useIssueDetail();+ const { setLastWidgetAction, fetchActivities } = useIssueDetail(issueServiceType);// file sizeconst { maxFileSize } = useFileSize();// operations- const { operations: attachmentOperations } = useAttachmentOperations(workspaceSlug, projectId, issueId);+ const { operations: attachmentOperations } = useAttachmentOperations(+ workspaceSlug,+ projectId,+ issueId,+ issueServiceType+ );// handlersconst handleFetchPropertyActivities = useCallback(() => {fetchActivities(workspaceSlug, projectId, issueId);diff --git a/web/core/components/issues/issue-detail-widgets/attachments/root.tsx b/web/core/components/issues/issue-detail-widgets/attachments/root.tsxindex 1f80275905..7b4788a1a6 100644--- a/web/core/components/issues/issue-detail-widgets/attachments/root.tsx+++ b/web/core/components/issues/issue-detail-widgets/attachments/root.tsx@@ -1,6 +1,8 @@"use client";import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { Collapsible } from "@plane/ui";// componentsimport {@@ -15,12 +17,13 @@ type Props = {projectId: string;issueId: string;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const AttachmentsCollapsible: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled = false } = props;+ const { workspaceSlug, projectId, issueId, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooks- const { openWidgets, toggleOpenWidget } = useIssueDetail();+ const { openWidgets, toggleOpenWidget } = useIssueDetail(issueServiceType);// derived valuesconst isCollapsibleOpen = openWidgets.includes("attachments");@@ -36,6 +39,7 @@ export const AttachmentsCollapsible: FC<Props> = observer((props) => {projectId={projectId}issueId={issueId}disabled={disabled}+ issueServiceType={issueServiceType}/>}buttonClassName="w-full"@@ -45,6 +49,7 @@ export const AttachmentsCollapsible: FC<Props> = observer((props) => {projectId={projectId}issueId={issueId}disabled={disabled}+ issueServiceType={issueServiceType}/></Collapsible>);diff --git a/web/core/components/issues/issue-detail-widgets/attachments/title.tsx b/web/core/components/issues/issue-detail-widgets/attachments/title.tsxindex ce83f6826d..f2d0cd670c 100644--- a/web/core/components/issues/issue-detail-widgets/attachments/title.tsx+++ b/web/core/components/issues/issue-detail-widgets/attachments/title.tsx@@ -1,6 +1,8 @@"use client";import React, { FC, useMemo } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { CollapsibleButton } from "@plane/ui";// componentsimport { IssueAttachmentActionButton } from "@/components/issues/issue-detail-widgets";@@ -13,14 +15,15 @@ type Props = {projectId: string;issueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueAttachmentsCollapsibleTitle: FC<Props> = observer((props) => {- const { isOpen, workspaceSlug, projectId, issueId, disabled } = props;+ const { isOpen, workspaceSlug, projectId, issueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooksconst {issue: { getIssueById },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// derived valuesconst issue = getIssueById(issueId);@@ -48,6 +51,7 @@ export const IssueAttachmentsCollapsibleTitle: FC<Props> = observer((props) => {projectId={projectId}issueId={issueId}disabled={disabled}+ issueServiceType={issueServiceType}/>)}diff --git a/web/core/components/issues/issue-detail-widgets/links/content.tsx b/web/core/components/issues/issue-detail-widgets/links/content.tsxindex 2d85270b02..fefc7938fd 100644--- a/web/core/components/issues/issue-detail-widgets/links/content.tsx+++ b/web/core/components/issues/issue-detail-widgets/links/content.tsx@@ -1,5 +1,7 @@"use client";import React, { FC } from "react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// componentsimport { LinkList } from "../../issue-detail/links";// helper@@ -10,13 +12,21 @@ type Props = {projectId: string;issueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueLinksCollapsibleContent: FC<Props> = (props) => {- const { workspaceSlug, projectId, issueId, disabled } = props;+ const { workspaceSlug, projectId, issueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// helper- const handleLinkOperations = useLinkOperations(workspaceSlug, projectId, issueId);+ const handleLinkOperations = useLinkOperations(workspaceSlug, projectId, issueId, issueServiceType);- return <LinkList issueId={issueId} linkOperations={handleLinkOperations} disabled={disabled} />;+ return (+ <LinkList+ issueId={issueId}+ linkOperations={handleLinkOperations}+ disabled={disabled}+ issueServiceType={issueServiceType}+ />+ );};diff --git a/web/core/components/issues/issue-detail-widgets/links/helper.tsx b/web/core/components/issues/issue-detail-widgets/links/helper.tsxindex 4669528cd3..ae915beb89 100644--- a/web/core/components/issues/issue-detail-widgets/links/helper.tsx+++ b/web/core/components/issues/issue-detail-widgets/links/helper.tsx@@ -1,14 +1,20 @@"use client";import { useMemo } from "react";-import { TIssueLink } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssueLink, TIssueServiceType } from "@plane/types";import { TOAST_TYPE, setToast } from "@plane/ui";// hooksimport { useIssueDetail } from "@/hooks/store";// typesimport { TLinkOperations } from "../../issue-detail/links";-export const useLinkOperations = (workspaceSlug: string, projectId: string, issueId: string): TLinkOperations => {- const { createLink, updateLink, removeLink } = useIssueDetail();+export const useLinkOperations = (+ workspaceSlug: string,+ projectId: string,+ issueId: string,+ issueServiceType: TIssueServiceType = EIssueServiceType.ISSUES+): TLinkOperations => {+ const { createLink, updateLink, removeLink } = useIssueDetail(issueServiceType);const handleLinkOperations: TLinkOperations = useMemo(() => ({diff --git a/web/core/components/issues/issue-detail-widgets/links/quick-action-button.tsx b/web/core/components/issues/issue-detail-widgets/links/quick-action-button.tsxindex f9a59dd3a7..775e2f9d77 100644--- a/web/core/components/issues/issue-detail-widgets/links/quick-action-button.tsx+++ b/web/core/components/issues/issue-detail-widgets/links/quick-action-button.tsx@@ -2,18 +2,21 @@import React, { FC } from "react";import { observer } from "mobx-react";import { Plus } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// hooksimport { useIssueDetail } from "@/hooks/store";type Props = {customButton?: React.ReactNode;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueLinksActionButton: FC<Props> = observer((props) => {- const { customButton, disabled = false } = props;+ const { customButton, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooks- const { toggleIssueLinkModal } = useIssueDetail();+ const { toggleIssueLinkModal } = useIssueDetail(issueServiceType);// handlersconst handleOnClick = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {diff --git a/web/core/components/issues/issue-detail-widgets/links/root.tsx b/web/core/components/issues/issue-detail-widgets/links/root.tsxindex 5b8c11b028..655f23e085 100644--- a/web/core/components/issues/issue-detail-widgets/links/root.tsx+++ b/web/core/components/issues/issue-detail-widgets/links/root.tsx@@ -1,6 +1,8 @@"use client";import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { Collapsible } from "@plane/ui";// componentsimport { IssueLinksCollapsibleContent, IssueLinksCollapsibleTitle } from "@/components/issues/issue-detail-widgets";@@ -12,12 +14,13 @@ type Props = {projectId: string;issueId: string;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const LinksCollapsible: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled = false } = props;+ const { workspaceSlug, projectId, issueId, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooks- const { openWidgets, toggleOpenWidget } = useIssueDetail();+ const { openWidgets, toggleOpenWidget } = useIssueDetail(issueServiceType);// derived valuesconst isCollapsibleOpen = openWidgets.includes("links");@@ -26,7 +29,14 @@ export const LinksCollapsible: FC<Props> = observer((props) => {<CollapsibleisOpen={isCollapsibleOpen}onToggle={() => toggleOpenWidget("links")}- title={<IssueLinksCollapsibleTitle isOpen={isCollapsibleOpen} issueId={issueId} disabled={disabled} />}+ title={+ <IssueLinksCollapsibleTitle+ isOpen={isCollapsibleOpen}+ issueId={issueId}+ disabled={disabled}+ issueServiceType={issueServiceType}+ />+ }buttonClassName="w-full"><IssueLinksCollapsibleContent@@ -34,6 +44,7 @@ export const LinksCollapsible: FC<Props> = observer((props) => {projectId={projectId}issueId={issueId}disabled={disabled}+ issueServiceType={issueServiceType}/></Collapsible>);diff --git a/web/core/components/issues/issue-detail-widgets/links/title.tsx b/web/core/components/issues/issue-detail-widgets/links/title.tsxindex 1e01ee1988..19929df255 100644--- a/web/core/components/issues/issue-detail-widgets/links/title.tsx+++ b/web/core/components/issues/issue-detail-widgets/links/title.tsx@@ -1,6 +1,8 @@"use client";import React, { FC, useMemo } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { CollapsibleButton } from "@plane/ui";// componentsimport { IssueLinksActionButton } from "@/components/issues/issue-detail-widgets";@@ -11,14 +13,15 @@ type Props = {isOpen: boolean;issueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueLinksCollapsibleTitle: FC<Props> = observer((props) => {- const { isOpen, issueId, disabled } = props;+ const { isOpen, issueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooksconst {issue: { getIssueById },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// derived valuesconst issue = getIssueById(issueId);@@ -40,7 +43,9 @@ export const IssueLinksCollapsibleTitle: FC<Props> = observer((props) => {isOpen={isOpen}title="Links"indicatorElement={indicatorElement}- actionItemElement={!disabled && <IssueLinksActionButton disabled={disabled} />}+ actionItemElement={+ !disabled && <IssueLinksActionButton issueServiceType={issueServiceType} disabled={disabled} />+ }/>);});diff --git a/web/core/components/issues/issue-detail-widgets/relations/content.tsx b/web/core/components/issues/issue-detail-widgets/relations/content.tsxindex 79be48e4f0..10b3b6585e 100644--- a/web/core/components/issues/issue-detail-widgets/relations/content.tsx+++ b/web/core/components/issues/issue-detail-widgets/relations/content.tsx@@ -1,7 +1,8 @@"use client";import { FC, useState } from "react";import { observer } from "mobx-react";-import { TIssue, TIssueRelationIdMap } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueRelationIdMap, TIssueServiceType } from "@plane/types";import { Collapsible } from "@plane/ui";// componentsimport { RelationIssueList } from "@/components/issues";@@ -20,6 +21,7 @@ type Props = {projectId: string;issueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};type TIssueCrudState = { toggle: boolean; issueId: string | undefined; issue: TIssue | undefined };@@ -33,7 +35,7 @@ export type TRelationObject = {};export const RelationsCollapsibleContent: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled = false } = props;+ const { workspaceSlug, projectId, issueId, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// stateconst [issueCrudState, setIssueCrudState] = useState<{update: TIssueCrudState;@@ -56,7 +58,7 @@ export const RelationsCollapsibleContent: FC<Props> = observer((props) => {relation: { getRelationsByIssueId },toggleDeleteIssueModal,toggleCreateIssueModal,- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// helperconst issueOperations = useRelationOperations();@@ -129,6 +131,7 @@ export const RelationsCollapsibleContent: FC<Props> = observer((props) => {disabled={disabled}issueOperations={issueOperations}handleIssueCrudState={handleIssueCrudState}+ issueServiceType={issueServiceType}/></Collapsible></div>diff --git a/web/core/components/issues/issue-detail-widgets/relations/helper.tsx b/web/core/components/issues/issue-detail-widgets/relations/helper.tsxindex ac8b0f6636..4267e9e1a9 100644--- a/web/core/components/issues/issue-detail-widgets/relations/helper.tsx+++ b/web/core/components/issues/issue-detail-widgets/relations/helper.tsx@@ -1,7 +1,8 @@"use client";import { useMemo } from "react";import { usePathname } from "next/navigation";-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";import { TOAST_TYPE, setToast } from "@plane/ui";// constantsimport { ISSUE_DELETED, ISSUE_UPDATED } from "@/constants/event-tracker";@@ -16,8 +17,10 @@ export type TRelationIssueOperations = {remove: (workspaceSlug: string, projectId: string, issueId: string) => Promise<void>;};-export const useRelationOperations = (): TRelationIssueOperations => {- const { updateIssue, removeIssue } = useIssueDetail();+export const useRelationOperations = (+ issueServiceType: TIssueServiceType = EIssueServiceType.ISSUES+): TRelationIssueOperations => {+ const { updateIssue, removeIssue } = useIssueDetail(issueServiceType);const { captureIssueEvent } = useEventTracker();const pathname = usePathname();diff --git a/web/core/components/issues/issue-detail-widgets/relations/quick-action-button.tsx b/web/core/components/issues/issue-detail-widgets/relations/quick-action-button.tsxindex dff072e7dc..b1ff260f6f 100644--- a/web/core/components/issues/issue-detail-widgets/relations/quick-action-button.tsx+++ b/web/core/components/issues/issue-detail-widgets/relations/quick-action-button.tsx@@ -2,6 +2,8 @@import React, { FC } from "react";import { observer } from "mobx-react";import { Plus } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { CustomMenu } from "@plane/ui";// hooksimport { useIssueDetail } from "@/hooks/store";@@ -13,12 +15,13 @@ type Props = {issueId: string;customButton?: React.ReactNode;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const RelationActionButton: FC<Props> = observer((props) => {- const { customButton, issueId, disabled = false } = props;+ const { customButton, issueId, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooks- const { toggleRelationModal, setRelationKey } = useIssueDetail();+ const { toggleRelationModal, setRelationKey } = useIssueDetail(issueServiceType);const ISSUE_RELATION_OPTIONS = useTimeLineRelationOptions();diff --git a/web/core/components/issues/issue-detail-widgets/relations/root.tsx b/web/core/components/issues/issue-detail-widgets/relations/root.tsxindex d6a8edc3fc..78c6ff3970 100644--- a/web/core/components/issues/issue-detail-widgets/relations/root.tsx+++ b/web/core/components/issues/issue-detail-widgets/relations/root.tsx@@ -1,6 +1,8 @@"use client";import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { Collapsible } from "@plane/ui";// componentsimport { RelationsCollapsibleContent, RelationsCollapsibleTitle } from "@/components/issues/issue-detail-widgets";@@ -12,12 +14,13 @@ type Props = {projectId: string;issueId: string;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const RelationsCollapsible: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled = false } = props;+ const { workspaceSlug, projectId, issueId, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooks- const { openWidgets, toggleOpenWidget } = useIssueDetail();+ const { openWidgets, toggleOpenWidget } = useIssueDetail(issueServiceType);// derived valuesconst isCollapsibleOpen = openWidgets.includes("relations");@@ -26,7 +29,14 @@ export const RelationsCollapsible: FC<Props> = observer((props) => {<CollapsibleisOpen={isCollapsibleOpen}onToggle={() => toggleOpenWidget("relations")}- title={<RelationsCollapsibleTitle isOpen={isCollapsibleOpen} issueId={issueId} disabled={disabled} />}+ title={+ <RelationsCollapsibleTitle+ isOpen={isCollapsibleOpen}+ issueId={issueId}+ disabled={disabled}+ issueServiceType={issueServiceType}+ />+ }buttonClassName="w-full"><RelationsCollapsibleContent@@ -34,6 +44,7 @@ export const RelationsCollapsible: FC<Props> = observer((props) => {projectId={projectId}issueId={issueId}disabled={disabled}+ issueServiceType={issueServiceType}/></Collapsible>);diff --git a/web/core/components/issues/issue-detail-widgets/relations/title.tsx b/web/core/components/issues/issue-detail-widgets/relations/title.tsxindex 2c3854bedd..3f91b712f7 100644--- a/web/core/components/issues/issue-detail-widgets/relations/title.tsx+++ b/web/core/components/issues/issue-detail-widgets/relations/title.tsx@@ -1,6 +1,8 @@"use client";import React, { FC, useMemo } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { CollapsibleButton } from "@plane/ui";// componentsimport { RelationActionButton } from "@/components/issues/issue-detail-widgets";@@ -13,14 +15,15 @@ type Props = {isOpen: boolean;issueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};export const RelationsCollapsibleTitle: FC<Props> = observer((props) => {- const { isOpen, issueId, disabled } = props;+ const { isOpen, issueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// store hookconst {relation: { getRelationCountByIssueId },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const ISSUE_RELATION_OPTIONS = useTimeLineRelationOptions();// derived values@@ -41,7 +44,9 @@ export const RelationsCollapsibleTitle: FC<Props> = observer((props) => {isOpen={isOpen}title="Relations"indicatorElement={indicatorElement}- actionItemElement={!disabled && <RelationActionButton issueId={issueId} disabled={disabled} />}+ actionItemElement={+ !disabled && <RelationActionButton issueId={issueId} disabled={disabled} issueServiceType={issueServiceType} />+ }/>);});diff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/content.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/content.tsxindex 5432ee777e..2bd9c90bfb 100644--- a/web/core/components/issues/issue-detail-widgets/sub-issues/content.tsx+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/content.tsx@@ -1,7 +1,8 @@"use client";import React, { FC, useCallback, useEffect, useState } from "react";import { observer } from "mobx-react";-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";// componentsimport { DeleteIssueModal } from "@/components/issues/delete-issue-modal";import { CreateUpdateIssueModal } from "@/components/issues/issue-modal";@@ -16,12 +17,13 @@ type Props = {projectId: string;parentIssueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};type TIssueCrudState = { toggle: boolean; parentIssueId: string | undefined; issue: TIssue | undefined };export const SubIssuesCollapsibleContent: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, parentIssueId, disabled } = props;+ const { workspaceSlug, projectId, parentIssueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// stateconst [issueCrudState, setIssueCrudState] = useState<{create: TIssueCrudState;@@ -58,7 +60,7 @@ export const SubIssuesCollapsibleContent: FC<Props> = observer((props) => {} = useIssueDetail();// helpers- const subIssueOperations = useSubIssueOperations();+ const subIssueOperations = useSubIssueOperations(issueServiceType);const subIssueHelpers = subIssueHelpersByIssueId(`${parentIssueId}_root`);// handler@@ -95,7 +97,6 @@ export const SubIssuesCollapsibleContent: FC<Props> = observer((props) => {useEffect(() => {handleFetchSubIssues();-return () => {handleFetchSubIssues();};@@ -123,6 +124,7 @@ export const SubIssuesCollapsibleContent: FC<Props> = observer((props) => {disabled={!disabled}handleIssueCrudState={handleIssueCrudState}subIssueOperations={subIssueOperations}+ issueServiceType={issueServiceType}/>)}diff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/helper.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/helper.tsxindex 7df432d5d2..cc8abd82fd 100644--- a/web/core/components/issues/issue-detail-widgets/sub-issues/helper.tsx+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/helper.tsx@@ -1,7 +1,8 @@"use client";import { useMemo } from "react";import { usePathname } from "next/navigation";-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";import { TOAST_TYPE, setToast } from "@plane/ui";// helperimport { copyTextToClipboard } from "@/helpers/string.helper";@@ -16,15 +17,17 @@ export type TRelationIssueOperations = {remove: (workspaceSlug: string, projectId: string, issueId: string) => Promise<void>;};-export const useSubIssueOperations = (): TSubIssueOperations => {+export const useSubIssueOperations = (+ issueServiceType: TIssueServiceType = EIssueServiceType.ISSUES+): TSubIssueOperations => {const {subIssues: { setSubIssueHelpers },fetchSubIssues,createSubIssues,updateSubIssue,- removeSubIssue,deleteSubIssue,} = useIssueDetail();+ const { removeSubIssue } = useIssueDetail(issueServiceType);const { captureIssueEvent } = useEventTracker();const pathname = usePathname();diff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/quick-action-button.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/quick-action-button.tsxindex bf1ece3100..73770bb130 100644--- a/web/core/components/issues/issue-detail-widgets/sub-issues/quick-action-button.tsx+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/quick-action-button.tsx@@ -2,7 +2,8 @@import React, { FC } from "react";import { observer } from "mobx-react";import { LayersIcon, Plus } from "lucide-react";-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";import { CustomMenu } from "@plane/ui";// hooksimport { useEventTracker, useIssueDetail } from "@/hooks/store";@@ -11,10 +12,11 @@ type Props = {issueId: string;customButton?: React.ReactNode;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const SubIssuesActionButton: FC<Props> = observer((props) => {- const { issueId, customButton, disabled = false } = props;+ const { issueId, customButton, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooksconst {issue: { getIssueById },@@ -22,7 +24,7 @@ export const SubIssuesActionButton: FC<Props> = observer((props) => {toggleSubIssuesModal,setIssueCrudOperationState,issueCrudOperationState,- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const { setTrackElement } = useEventTracker();// derived valuesdiff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/root.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/root.tsxindex 99dbcacb51..5ead3bc5f4 100644--- a/web/core/components/issues/issue-detail-widgets/sub-issues/root.tsx+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/root.tsx@@ -1,6 +1,8 @@"use client";import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { Collapsible } from "@plane/ui";// componentsimport { SubIssuesCollapsibleContent, SubIssuesCollapsibleTitle } from "@/components/issues/issue-detail-widgets";@@ -12,13 +14,14 @@ type Props = {projectId: string;issueId: string;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const SubIssuesCollapsible: FC<Props> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled = false } = props;+ const { workspaceSlug, projectId, issueId, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooks- const { openWidgets, toggleOpenWidget } = useIssueDetail();+ const { openWidgets, toggleOpenWidget } = useIssueDetail(issueServiceType);// derived stateconst isCollapsibleOpen = openWidgets.includes("sub-issues");@@ -27,7 +30,14 @@ export const SubIssuesCollapsible: FC<Props> = observer((props) => {<CollapsibleisOpen={isCollapsibleOpen}onToggle={() => toggleOpenWidget("sub-issues")}- title={<SubIssuesCollapsibleTitle isOpen={isCollapsibleOpen} parentIssueId={issueId} disabled={disabled} />}+ title={+ <SubIssuesCollapsibleTitle+ isOpen={isCollapsibleOpen}+ parentIssueId={issueId}+ disabled={disabled}+ issueServiceType={issueServiceType}+ />+ }buttonClassName="w-full"><SubIssuesCollapsibleContent@@ -35,6 +45,7 @@ export const SubIssuesCollapsible: FC<Props> = observer((props) => {projectId={projectId}parentIssueId={issueId}disabled={disabled}+ issueServiceType={issueServiceType}/></Collapsible>);diff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsxindex b3d9bf1fc1..ad88c112ed 100644--- a/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx@@ -1,6 +1,8 @@"use client";-import React, { FC, useMemo } from "react";+import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";import { CircularProgressIndicator, CollapsibleButton } from "@plane/ui";// componentsimport { SubIssuesActionButton } from "@/components/issues/issue-detail-widgets";@@ -11,14 +13,15 @@ type Props = {isOpen: boolean;parentIssueId: string;disabled: boolean;+ issueServiceType?: TIssueServiceType;};export const SubIssuesCollapsibleTitle: FC<Props> = observer((props) => {- const { isOpen, parentIssueId, disabled } = props;+ const { isOpen, parentIssueId, disabled, issueServiceType = EIssueServiceType.ISSUES } = props;// store hooksconst {subIssues: { subIssuesByIssueId, stateDistributionByIssueId },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// derived dataconst subIssuesDistribution = stateDistributionByIssueId(parentIssueId);@@ -32,25 +35,23 @@ export const SubIssuesCollapsibleTitle: FC<Props> = observer((props) => {const totalCount = subIssues.length;const percentage = completedCount && totalCount ? (completedCount / totalCount) * 100 : 0;- // indicator element- const indicatorElement = useMemo(- () => (- <div className="flex items-center gap-1.5 text-custom-text-300 text-sm">- <CircularProgressIndicator size={18} percentage={percentage} strokeWidth={3} />- <span>- {completedCount}/{totalCount} Done- </span>- </div>- ),- [completedCount, totalCount, percentage]- );-return (<CollapsibleButtonisOpen={isOpen}title="Sub-issues"- indicatorElement={indicatorElement}- actionItemElement={!disabled && <SubIssuesActionButton issueId={parentIssueId} disabled={disabled} />}+ indicatorElement={+ <div className="flex items-center gap-1.5 text-custom-text-300 text-sm">+ <CircularProgressIndicator size={18} percentage={percentage} strokeWidth={3} />+ <span>+ {completedCount}/{totalCount} Done+ </span>+ </div>+ }+ actionItemElement={+ !disabled && (+ <SubIssuesActionButton issueId={parentIssueId} disabled={disabled} issueServiceType={issueServiceType} />+ )+ }/>);});diff --git a/web/core/components/issues/issue-detail/label/root.tsx b/web/core/components/issues/issue-detail/label/root.tsxindex daa5169b13..f71e9ba3ce 100644--- a/web/core/components/issues/issue-detail/label/root.tsx+++ b/web/core/components/issues/issue-detail/label/root.tsx@@ -2,7 +2,8 @@import { FC, useMemo } from "react";import { observer } from "mobx-react";-import { IIssueLabel, TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { IIssueLabel, TIssue, TIssueServiceType } from "@plane/types";// componentsimport { TOAST_TYPE, setToast } from "@plane/ui";// hooks@@ -21,6 +22,7 @@ export type TIssueLabel = {disabled: boolean;isInboxIssue?: boolean;onLabelUpdate?: (labelIds: string[]) => void;+ issueServiceType?: TIssueServiceType;};export type TLabelOperations = {@@ -29,13 +31,21 @@ export type TLabelOperations = {};export const IssueLabel: FC<TIssueLabel> = observer((props) => {- const { workspaceSlug, projectId, issueId, disabled = false, isInboxIssue = false, onLabelUpdate } = props;+ const {+ workspaceSlug,+ projectId,+ issueId,+ disabled = false,+ isInboxIssue = false,+ onLabelUpdate,+ issueServiceType = EIssueServiceType.ISSUES,+ } = props;// hooks- const { updateIssue } = useIssueDetail();+ const { updateIssue } = useIssueDetail(issueServiceType);const { createLabel } = useLabel();const {issue: { getIssueById },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const { getIssueInboxByIssueId } = useProjectInbox();const { allowPermissions } = useUserPermissions();diff --git a/web/core/components/issues/issue-detail/links/create-update-link-modal.tsx b/web/core/components/issues/issue-detail/links/create-update-link-modal.tsxindex 99e350c613..2da5d0f795 100644--- a/web/core/components/issues/issue-detail/links/create-update-link-modal.tsx+++ b/web/core/components/issues/issue-detail/links/create-update-link-modal.tsx@@ -3,8 +3,9 @@import { FC, useEffect } from "react";import { observer } from "mobx-react";import { Controller, useForm } from "react-hook-form";+import { EIssueServiceType } from "@plane/constants";// plane types-import type { TIssueLinkEditableFields } from "@plane/types";+import type { TIssueLinkEditableFields, TIssueServiceType } from "@plane/types";// plane uiimport { Button, Input, ModalCore } from "@plane/ui";// hooks@@ -22,6 +23,7 @@ export type TIssueLinkCreateEditModal = {isModalOpen: boolean;handleOnClose?: () => void;linkOperations: TLinkOperationsModal;+ issueServiceType?: TIssueServiceType;};const defaultValues: TIssueLinkCreateFormFieldOptions = {@@ -31,7 +33,7 @@ const defaultValues: TIssueLinkCreateFormFieldOptions = {export const IssueLinkCreateUpdateModal: FC<TIssueLinkCreateEditModal> = observer((props) => {// props- const { isModalOpen, handleOnClose, linkOperations } = props;+ const { isModalOpen, handleOnClose, linkOperations, issueServiceType = EIssueServiceType.ISSUES } = props;// react hook formconst {formState: { errors, isSubmitting },@@ -42,7 +44,7 @@ export const IssueLinkCreateUpdateModal: FC<TIssueLinkCreateEditModal> = observedefaultValues,});// store hooks- const { issueLinkData: preloadedData, setIssueLinkData } = useIssueDetail();+ const { issueLinkData: preloadedData, setIssueLinkData } = useIssueDetail(issueServiceType);const onClose = () => {setIssueLinkData(null);diff --git a/web/core/components/issues/issue-detail/links/link-item.tsx b/web/core/components/issues/issue-detail/links/link-item.tsxindex c7629b5dce..68e8acf4de 100644--- a/web/core/components/issues/issue-detail/links/link-item.tsx+++ b/web/core/components/issues/issue-detail/links/link-item.tsx@@ -3,6 +3,8 @@import { FC } from "react";import { observer } from "mobx-react";import { Pencil, Trash2, LinkIcon, ExternalLink } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// uiimport { Tooltip, TOAST_TYPE, setToast, CustomMenu } from "@plane/ui";// helpers@@ -17,17 +19,18 @@ type TIssueLinkItem = {linkId: string;linkOperations: TLinkOperationsModal;isNotAllowed: boolean;+ issueServiceType?: TIssueServiceType;};export const IssueLinkItem: FC<TIssueLinkItem> = observer((props) => {// props- const { linkId, linkOperations, isNotAllowed } = props;+ const { linkId, linkOperations, isNotAllowed, issueServiceType = EIssueServiceType.ISSUES } = props;// hooksconst {toggleIssueLinkModal: toggleIssueLinkModalStore,setIssueLinkData,link: { getLinkById },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const { isMobile } = usePlatformOS();const linkDetail = getLinkById(linkId);if (!linkDetail) return <></>;diff --git a/web/core/components/issues/issue-detail/links/link-list.tsx b/web/core/components/issues/issue-detail/links/link-list.tsxindex 7f20d53677..7ca128b988 100644--- a/web/core/components/issues/issue-detail/links/link-list.tsx+++ b/web/core/components/issues/issue-detail/links/link-list.tsx@@ -1,5 +1,7 @@import { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// computedimport { useIssueDetail } from "@/hooks/store";import { IssueLinkItem } from "./link-item";@@ -12,15 +14,16 @@ type TLinkList = {issueId: string;linkOperations: TLinkOperationsModal;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const LinkList: FC<TLinkList> = observer((props) => {// props- const { issueId, linkOperations, disabled = false } = props;+ const { issueId, linkOperations, disabled = false, issueServiceType = EIssueServiceType.ISSUES } = props;// hooksconst {link: { getLinksByIssueId },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const issueLinks = getLinksByIssueId(issueId);@@ -29,7 +32,13 @@ export const LinkList: FC<TLinkList> = observer((props) => {return (<div className="flex flex-col gap-2 py-4">{issueLinks.map((linkId) => (- <IssueLinkItem key={linkId} linkId={linkId} linkOperations={linkOperations} isNotAllowed={disabled} />+ <IssueLinkItem+ key={linkId}+ linkId={linkId}+ linkOperations={linkOperations}+ isNotAllowed={disabled}+ issueServiceType={issueServiceType}+ />))}</div>);diff --git a/web/core/components/issues/issue-detail/main-content.tsx b/web/core/components/issues/issue-detail/main-content.tsxindex 08d5c06630..f484761641 100644--- a/web/core/components/issues/issue-detail/main-content.tsx+++ b/web/core/components/issues/issue-detail/main-content.tsx@@ -55,11 +55,16 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {const issue = issueId ? getIssueById(issueId) : undefined;// debounced duplicate issues swr- const { duplicateIssues } = useDebouncedDuplicateIssues(projectDetails?.workspace.toString(), projectDetails?.id, {- name: issue?.name,- description_html: getTextContent(issue?.description_html),- issueId: issue?.id,- });+ const { duplicateIssues } = useDebouncedDuplicateIssues(+ workspaceSlug,+ projectDetails?.workspace.toString(),+ projectDetails?.id,+ {+ name: issue?.name,+ description_html: getTextContent(issue?.description_html),+ issueId: issue?.id,+ }+ );useEffect(() => {if (isSubmitting === "submitted") {diff --git a/web/core/components/issues/issue-detail/parent-select.tsx b/web/core/components/issues/issue-detail/parent-select.tsxindex af9b40df1e..d83bc635b4 100644--- a/web/core/components/issues/issue-detail/parent-select.tsx+++ b/web/core/components/issues/issue-detail/parent-select.tsx@@ -88,6 +88,7 @@ export const IssueParentSelect: React.FC<TIssueParentSelect> = observer((props)isOpen={isParentIssueModalOpen === issueId}handleClose={() => toggleParentIssueModal(null)}onChange={(issue: any) => handleParentIssue(issue?.id)}+ searchEpic/><buttontype="button"diff --git a/web/core/components/issues/issue-detail/root.tsx b/web/core/components/issues/issue-detail/root.tsxindex a5363e78ca..24e24792c8 100644--- a/web/core/components/issues/issue-detail/root.tsx+++ b/web/core/components/issues/issue-detail/root.tsx@@ -9,7 +9,7 @@ import { TIssue } from "@plane/types";import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";// componentsimport { EmptyState } from "@/components/common";-import { IssuePeekOverview } from "@/components/issues";+import { IssueDetailsSidebar, IssuePeekOverview } from "@/components/issues";// constantsimport { ISSUE_UPDATED, ISSUE_DELETED, ISSUE_ARCHIVED } from "@/constants/event-tracker";import { EIssuesStoreType } from "@/constants/issue";@@ -21,7 +21,6 @@ import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/uimport emptyIssue from "@/public/empty-state/issue.svg";// local componentsimport { IssueMainContent } from "./main-content";-import { IssueDetailsSidebar } from "./sidebar";export type TIssueOperations = {fetch: (workspaceSlug: string, projectId: string, issueId: string, loader?: boolean) => Promise<void>;diff --git a/web/core/components/issues/issue-layouts/calendar/base-calendar-root.tsx b/web/core/components/issues/issue-layouts/calendar/base-calendar-root.tsxindex 2068a0921e..0fbcfbfe70 100644--- a/web/core/components/issues/issue-layouts/calendar/base-calendar-root.tsx+++ b/web/core/components/issues/issue-layouts/calendar/base-calendar-root.tsx@@ -25,18 +25,20 @@ export type CalendarStoreType =| EIssuesStoreType.CYCLE| EIssuesStoreType.PROJECT_VIEW| EIssuesStoreType.TEAM- | EIssuesStoreType.TEAM_VIEW;+ | EIssuesStoreType.TEAM_VIEW+ | EIssuesStoreType.EPIC;interface IBaseCalendarRoot {QuickActions: FC<IQuickActionProps>;addIssuesToView?: (issueIds: string[]) => Promise<any>;isCompletedCycle?: boolean;viewId?: string | undefined;+ isEpic?: boolean;canEditPropertiesBasedOnProject?: (projectId: string) => boolean;}export const BaseCalendarRoot = observer((props: IBaseCalendarRoot) => {- const { QuickActions, addIssuesToView, isCompletedCycle = false, viewId, canEditPropertiesBasedOnProject } = props;+ const { QuickActions, addIssuesToView, isCompletedCycle = false, viewId, isEpic = false, canEditPropertiesBasedOnProject } = props;// routerconst { workspaceSlug } = useParams();@@ -173,6 +175,7 @@ export const BaseCalendarRoot = observer((props: IBaseCalendarRoot) => {updateFilters={updateFilters}handleDragAndDrop={handleDragAndDrop}canEditProperties={canEditProperties}+ isEpic={isEpic}/></div></>diff --git a/web/core/components/issues/issue-layouts/calendar/calendar.tsx b/web/core/components/issues/issue-layouts/calendar/calendar.tsxindex 87ed664454..0377f19c46 100644--- a/web/core/components/issues/issue-layouts/calendar/calendar.tsx+++ b/web/core/components/issues/issue-layouts/calendar/calendar.tsx@@ -29,6 +29,7 @@ import { renderFormattedPayloadDate } from "@/helpers/date-time.helper";import { useIssues } from "@/hooks/store";import useSize from "@/hooks/use-window-size";// store+import { IProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ICycleIssuesFilter } from "@/store/issue/cycle";import { ICalendarStore } from "@/store/issue/issue_calendar_view.store";import { IModuleIssuesFilter } from "@/store/issue/module";@@ -39,7 +40,12 @@ import { TRenderQuickActions } from "../list/list-view-types";import type { ICalendarWeek } from "./types";type Props = {- issuesFilterStore: IProjectIssuesFilter | IModuleIssuesFilter | ICycleIssuesFilter | IProjectViewIssuesFilter;+ issuesFilterStore:+ | IProjectIssuesFilter+ | IModuleIssuesFilter+ | ICycleIssuesFilter+ | IProjectViewIssuesFilter+ | IProjectEpicsFilter;issues: TIssueMap | undefined;groupedIssueIds: TGroupedIssues;layout: "month" | "week" | undefined;@@ -64,6 +70,7 @@ type Props = {filters: IIssueFilterOptions | IIssueDisplayFilterOptions | IIssueDisplayProperties | TIssueKanbanFilters) => Promise<void>;canEditProperties: (projectId: string | undefined) => boolean;+ isEpic?: boolean;};export const CalendarChart: React.FC<Props> = observer((props) => {@@ -84,6 +91,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {updateFilters,canEditProperties,readOnly = false,+ isEpic = false,} = props;// statesconst [selectedDate, setSelectedDate] = useState<Date>(new Date());@@ -167,6 +175,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {addIssuesToView={addIssuesToView}readOnly={readOnly}canEditProperties={canEditProperties}+ isEpic={isEpic}/>))}</div>@@ -190,6 +199,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {addIssuesToView={addIssuesToView}readOnly={readOnly}canEditProperties={canEditProperties}+ isEpic={isEpic}/>)}</div>@@ -216,6 +226,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {canEditProperties={canEditProperties}isDragDisabledisMobileView+ isEpic={isEpic}/></div></div>@@ -243,6 +254,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {canEditProperties={canEditProperties}isDragDisabledisMobileView+ isEpic={isEpic}/></div></div>diff --git a/web/core/components/issues/issue-layouts/calendar/day-tile.tsx b/web/core/components/issues/issue-layouts/calendar/day-tile.tsxindex 2392425cac..405cbf2ac2 100644--- a/web/core/components/issues/issue-layouts/calendar/day-tile.tsx+++ b/web/core/components/issues/issue-layouts/calendar/day-tile.tsx@@ -18,6 +18,7 @@ import { MONTHS_LIST } from "@/constants/calendar";import { cn } from "@/helpers/common.helper";import { renderFormattedPayloadDate } from "@/helpers/date-time.helper";// types+import { IProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ICycleIssuesFilter } from "@/store/issue/cycle";import { IModuleIssuesFilter } from "@/store/issue/module";import { IProjectIssuesFilter } from "@/store/issue/project";@@ -25,7 +26,12 @@ import { IProjectViewIssuesFilter } from "@/store/issue/project-views";import { TRenderQuickActions } from "../list/list-view-types";type Props = {- issuesFilterStore: IProjectIssuesFilter | IModuleIssuesFilter | ICycleIssuesFilter | IProjectViewIssuesFilter;+ issuesFilterStore:+ | IProjectIssuesFilter+ | IModuleIssuesFilter+ | ICycleIssuesFilter+ | IProjectViewIssuesFilter+ | IProjectEpicsFilter;date: ICalendarDate;issues: TIssueMap | undefined;groupedIssueIds: TGroupedIssues;@@ -47,6 +53,7 @@ type Props = {selectedDate: Date;setSelectedDate: (date: Date) => void;canEditProperties: (projectId: string | undefined) => boolean;+ isEpic?: boolean;};export const CalendarDayTile: React.FC<Props> = observer((props) => {@@ -68,6 +75,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {handleDragAndDrop,setSelectedDate,canEditProperties,+ isEpic = false,} = props;const [isDraggingOver, setIsDraggingOver] = useState(false);@@ -185,6 +193,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {quickAddCallback={quickAddCallback}readOnly={readOnly}canEditProperties={canEditProperties}+ isEpic={isEpic}/></div></div>diff --git a/web/core/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx b/web/core/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsxindex 9f9f5b5bd6..05e5a16318 100644--- a/web/core/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx+++ b/web/core/components/issues/issue-layouts/calendar/dropdowns/months-dropdown.tsx@@ -9,6 +9,7 @@ import { Popover, Transition } from "@headlessui/react";import { MONTHS_LIST } from "@/constants/calendar";import { getDate } from "@/helpers/date-time.helper";import { useCalendarView } from "@/hooks/store";+import { IProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ICycleIssuesFilter } from "@/store/issue/cycle";import { IModuleIssuesFilter } from "@/store/issue/module";import { IProjectIssuesFilter } from "@/store/issue/project";@@ -16,7 +17,12 @@ import { IProjectViewIssuesFilter } from "@/store/issue/project-views";// helpersinterface Props {- issuesFilterStore: IProjectIssuesFilter | IModuleIssuesFilter | ICycleIssuesFilter | IProjectViewIssuesFilter;+ issuesFilterStore:+ | IProjectIssuesFilter+ | IModuleIssuesFilter+ | ICycleIssuesFilter+ | IProjectViewIssuesFilter+ | IProjectEpicsFilter;}export const CalendarMonthsDropdown: React.FC<Props> = observer((props: Props) => {const { issuesFilterStore } = props;diff --git a/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx b/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsxindex 822f424887..b28959c5b2 100644--- a/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx+++ b/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx@@ -23,13 +23,19 @@ import { CALENDAR_LAYOUTS } from "@/constants/calendar";import { EIssueFilterType } from "@/constants/issue";import { useCalendarView } from "@/hooks/store";import useSize from "@/hooks/use-window-size";+import { IProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ICycleIssuesFilter } from "@/store/issue/cycle";import { IModuleIssuesFilter } from "@/store/issue/module";import { IProjectIssuesFilter } from "@/store/issue/project";import { IProjectViewIssuesFilter } from "@/store/issue/project-views";interface ICalendarHeader {- issuesFilterStore: IProjectIssuesFilter | IModuleIssuesFilter | ICycleIssuesFilter | IProjectViewIssuesFilter;+ issuesFilterStore:+ | IProjectIssuesFilter+ | IModuleIssuesFilter+ | ICycleIssuesFilter+ | IProjectViewIssuesFilter+ | IProjectEpicsFilter;updateFilters?: (projectId: string,filterType: EIssueFilterType,diff --git a/web/core/components/issues/issue-layouts/calendar/header.tsx b/web/core/components/issues/issue-layouts/calendar/header.tsxindex c7e6232a05..3c55acf8e4 100644--- a/web/core/components/issues/issue-layouts/calendar/header.tsx+++ b/web/core/components/issues/issue-layouts/calendar/header.tsx@@ -13,13 +13,19 @@ import { CalendarMonthsDropdown, CalendarOptionsDropdown } from "@/components/is// iconsimport { EIssueFilterType } from "@/constants/issue";import { useCalendarView } from "@/hooks/store/use-calendar-view";+import { IProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ICycleIssuesFilter } from "@/store/issue/cycle";import { IModuleIssuesFilter } from "@/store/issue/module";import { IProjectIssuesFilter } from "@/store/issue/project";import { IProjectViewIssuesFilter } from "@/store/issue/project-views";interface ICalendarHeader {- issuesFilterStore: IProjectIssuesFilter | IModuleIssuesFilter | ICycleIssuesFilter | IProjectViewIssuesFilter;+ issuesFilterStore:+ | IProjectIssuesFilter+ | IModuleIssuesFilter+ | ICycleIssuesFilter+ | IProjectViewIssuesFilter+ | IProjectEpicsFilter;updateFilters?: (projectId: string,filterType: EIssueFilterType,diff --git a/web/core/components/issues/issue-layouts/calendar/issue-block-root.tsx b/web/core/components/issues/issue-layouts/calendar/issue-block-root.tsxindex 35bea6386e..2ca6a8f8ea 100644--- a/web/core/components/issues/issue-layouts/calendar/issue-block-root.tsx+++ b/web/core/components/issues/issue-layouts/calendar/issue-block-root.tsx@@ -15,11 +15,12 @@ type Props = {issueId: string;quickActions: TRenderQuickActions;isDragDisabled: boolean;+ isEpic?: boolean;canEditProperties: (projectId: string | undefined) => boolean;};export const CalendarIssueBlockRoot: React.FC<Props> = observer((props) => {- const { issueId, quickActions, isDragDisabled, canEditProperties } = props;+ const { issueId, quickActions, isDragDisabled, isEpic = false, canEditProperties } = props;const issueRef = useRef<HTMLAnchorElement | null>(null);const [isDragging, setIsDragging] = useState(false);@@ -58,5 +59,13 @@ export const CalendarIssueBlockRoot: React.FC<Props> = observer((props) => {if (!issue) return null;- return <CalendarIssueBlock isDragging={isDragging} issue={issue} quickActions={quickActions} ref={issueRef} />;+ return (+ <CalendarIssueBlock+ isDragging={isDragging}+ issue={issue}+ quickActions={quickActions}+ ref={issueRef}+ isEpic={isEpic}+ />+ );});diff --git a/web/core/components/issues/issue-layouts/calendar/issue-block.tsx b/web/core/components/issues/issue-layouts/calendar/issue-block.tsxindex 734ce25cff..8a03ef4c84 100644--- a/web/core/components/issues/issue-layouts/calendar/issue-block.tsx+++ b/web/core/components/issues/issue-layouts/calendar/issue-block.tsx@@ -28,11 +28,12 @@ type Props = {issue: TIssue;quickActions: TRenderQuickActions;isDragging?: boolean;+ isEpic?: boolean;};export const CalendarIssueBlock = observer(forwardRef<HTMLAnchorElement, Props>((props, ref) => {- const { issue, quickActions, isDragging = false } = props;+ const { issue, quickActions, isDragging = false, isEpic = false } = props;// statesconst [isMenuActive, setIsMenuActive] = useState(false);// refs@@ -42,7 +43,7 @@ export const CalendarIssueBlock = observer(const { workspaceSlug, projectId } = useParams();const { getProjectStates } = useProjectState();const { getIsIssuePeeked } = useIssueDetail();- const { handleRedirection } = useIssuePeekOverviewRedirection();+ const { handleRedirection } = useIssuePeekOverviewRedirection(isEpic);const { isMobile } = usePlatformOS();const storeType = useIssueStoreType() as CalendarStoreType;const { issuesFilter } = useIssues(storeType);diff --git a/web/core/components/issues/issue-layouts/calendar/issue-blocks.tsx b/web/core/components/issues/issue-layouts/calendar/issue-blocks.tsxindex a7811a4061..674819bbf7 100644--- a/web/core/components/issues/issue-layouts/calendar/issue-blocks.tsx+++ b/web/core/components/issues/issue-layouts/calendar/issue-blocks.tsx@@ -23,6 +23,7 @@ type Props = {readOnly?: boolean;isMobileView?: boolean;canEditProperties: (projectId: string | undefined) => boolean;+ isEpic?: boolean;};export const CalendarIssueBlocks: React.FC<Props> = observer((props) => {@@ -39,6 +40,7 @@ export const CalendarIssueBlocks: React.FC<Props> = observer((props) => {readOnly,isMobileView = false,canEditProperties,+ isEpic = false,} = props;const formattedDatePayload = renderFormattedPayloadDate(date);@@ -66,6 +68,7 @@ export const CalendarIssueBlocks: React.FC<Props> = observer((props) => {quickActions={quickActions}isDragDisabled={isDragDisabled || isMobileView}canEditProperties={canEditProperties}+ isEpic={isEpic}/></div>))}diff --git a/web/core/components/issues/issue-layouts/calendar/week-days.tsx b/web/core/components/issues/issue-layouts/calendar/week-days.tsxindex 1c413db35d..9aaa132294 100644--- a/web/core/components/issues/issue-layouts/calendar/week-days.tsx+++ b/web/core/components/issues/issue-layouts/calendar/week-days.tsx@@ -5,6 +5,7 @@ import { CalendarDayTile } from "@/components/issues";// helpersimport { renderFormattedPayloadDate } from "@/helpers/date-time.helper";// types+import { IProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ICycleIssuesFilter } from "@/store/issue/cycle";import { IModuleIssuesFilter } from "@/store/issue/module";import { IProjectIssuesFilter } from "@/store/issue/project";@@ -13,7 +14,12 @@ import { TRenderQuickActions } from "../list/list-view-types";import { ICalendarDate, ICalendarWeek } from "./types";type Props = {- issuesFilterStore: IProjectIssuesFilter | IModuleIssuesFilter | ICycleIssuesFilter | IProjectViewIssuesFilter;+ issuesFilterStore:+ | IProjectIssuesFilter+ | IModuleIssuesFilter+ | ICycleIssuesFilter+ | IProjectViewIssuesFilter+ | IProjectEpicsFilter;issues: TIssueMap | undefined;groupedIssueIds: TGroupedIssues;week: ICalendarWeek | undefined;@@ -35,6 +41,7 @@ type Props = {selectedDate: Date;setSelectedDate: (date: Date) => void;canEditProperties: (projectId: string | undefined) => boolean;+ isEpic?: boolean;};export const CalendarWeekDays: React.FC<Props> = observer((props) => {@@ -56,6 +63,7 @@ export const CalendarWeekDays: React.FC<Props> = observer((props) => {selectedDate,setSelectedDate,canEditProperties,+ isEpic = false,} = props;const calendarLayout = issuesFilterStore?.issueFilters?.displayFilters?.calendar?.layout ?? "month";@@ -92,6 +100,7 @@ export const CalendarWeekDays: React.FC<Props> = observer((props) => {readOnly={readOnly}handleDragAndDrop={handleDragAndDrop}canEditProperties={canEditProperties}+ isEpic={isEpic}/>);})}diff --git a/web/core/components/issues/issue-layouts/empty-states/index.tsx b/web/core/components/issues/issue-layouts/empty-states/index.tsxindex 752e00bfdd..e776d29bad 100644--- a/web/core/components/issues/issue-layouts/empty-states/index.tsx+++ b/web/core/components/issues/issue-layouts/empty-states/index.tsx@@ -6,6 +6,7 @@ import { ProjectDraftEmptyState } from "./draft-issues";import { GlobalViewEmptyState } from "./global-view";import { ModuleEmptyState } from "./module";import { ProfileViewEmptyState } from "./profile-view";+import { ProjectEpicsEmptyState } from "./project-epic";import { ProjectEmptyState } from "./project-issues";import { ProjectViewEmptyState } from "./project-view";@@ -31,6 +32,8 @@ export const IssueLayoutEmptyState = (props: Props) => {return <GlobalViewEmptyState />;case EIssuesStoreType.PROFILE:return <ProfileViewEmptyState />;+ case EIssuesStoreType.EPIC:+ return <ProjectEpicsEmptyState />;default:return null;}diff --git a/web/core/components/issues/issue-layouts/empty-states/project-epic.tsx b/web/core/components/issues/issue-layouts/empty-states/project-epic.tsxnew file mode 100644index 0000000000..213e5ac405--- /dev/null+++ b/web/core/components/issues/issue-layouts/empty-states/project-epic.tsx@@ -0,0 +1,12 @@+// types+// components+import { EmptyState } from "@/components/empty-state";+// constants+import { EmptyStateType } from "@/constants/empty-state";+// hooks++export const ProjectEpicsEmptyState: React.FC = () => (+ <div className="relative h-full w-full overflow-y-auto">+ <EmptyState type={EmptyStateType.PROJECT_NO_EPICS} primaryButtonOnClick={() => {}} />+ </div>+);diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsxindex 57175ae1d6..721bad7696 100644--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx@@ -1,29 +1,32 @@import { observer } from "mobx-react";import { useParams } from "next/navigation";+// typesimport { IIssueFilterOptions } from "@plane/types";-// hooks-// components+// uiimport { Header, EHeaderVariant } from "@plane/ui";+// componentsimport { AppliedFiltersList, SaveFilterView } from "@/components/issues";// constantsimport { EIssueFilterType, EIssuesStoreType } from "@/constants/issue";+// hooksimport { useLabel, useProjectState, useUserPermissions } from "@/hooks/store";import { useIssues } from "@/hooks/store/use-issues";+// plane web constantsimport { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";-// types+type TProjectAppliedFiltersRootProps = {+ storeType?: EIssuesStoreType.PROJECT | EIssuesStoreType.EPIC;+};-export const ProjectAppliedFiltersRoot: React.FC = observer(() => {+export const ProjectAppliedFiltersRoot: React.FC<TProjectAppliedFiltersRootProps> = observer((props) => {+ const { storeType = EIssuesStoreType.PROJECT } = props;// router- const { workspaceSlug, projectId } = useParams() as {- workspaceSlug: string;- projectId: string;- };+ const { workspaceSlug, projectId } = useParams();// store hooksconst { projectLabels } = useLabel();const {issuesFilter: { issueFilters, updateFilters },- } = useIssues(EIssuesStoreType.PROJECT);+ } = useIssues(storeType);const { allowPermissions } = useUserPermissions();const { projectStates } = useProjectState();@@ -84,8 +87,8 @@ export const ProjectAppliedFiltersRoot: React.FC = observer(() => {<Header.RightItem>{isEditingAllowed && (<SaveFilterView- workspaceSlug={workspaceSlug}- projectId={projectId}+ workspaceSlug={workspaceSlug?.toString()}+ projectId={projectId?.toString()}filterParams={{filters: appliedFilters,display_filters: issueFilters?.displayFilters,diff --git a/web/core/components/issues/issue-layouts/gantt/base-gantt-root.tsx b/web/core/components/issues/issue-layouts/gantt/base-gantt-root.tsxindex af4b244702..5e5ec1db8e 100644--- a/web/core/components/issues/issue-layouts/gantt/base-gantt-root.tsx+++ b/web/core/components/issues/issue-layouts/gantt/base-gantt-root.tsx@@ -27,16 +27,18 @@ import { IssueLayoutHOC } from "../issue-layout-HOC";interface IBaseGanttRoot {viewId?: string | undefined;isCompletedCycle?: boolean;+ isEpic?: boolean;}export type GanttStoreType =| EIssuesStoreType.PROJECT| EIssuesStoreType.MODULE| EIssuesStoreType.CYCLE- | EIssuesStoreType.PROJECT_VIEW;+ | EIssuesStoreType.PROJECT_VIEW+ | EIssuesStoreType.EPIC;export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGanttRoot) => {- const { viewId, isCompletedCycle = false } = props;+ const { viewId, isCompletedCycle = false, isEpic = false } = props;// routerconst { workspaceSlug, projectId } = useParams();@@ -123,8 +125,8 @@ export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGanloaderTitle="Issues"blockIds={issuesIds}blockUpdateHandler={updateIssueBlockStructure}- blockToRender={(data: TIssue) => <IssueGanttBlock issueId={data.id} />}- sidebarToRender={(props) => <IssueGanttSidebar {...props} showAllBlocks />}+ blockToRender={(data: TIssue) => <IssueGanttBlock issueId={data.id} isEpic={isEpic} />}+ sidebarToRender={(props) => <IssueGanttSidebar {...props} showAllBlocks isEpic={isEpic} />}enableBlockLeftResize={isAllowed}enableBlockRightResize={isAllowed}enableBlockMove={isAllowed}@@ -136,6 +138,7 @@ export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGancanLoadMoreBlocks={nextPageResults}updateBlockDates={updateBlockDates}showAllBlocks+ isEpic={isEpic}/></div></TimeLineTypeContext.Provider>diff --git a/web/core/components/issues/issue-layouts/gantt/blocks.tsx b/web/core/components/issues/issue-layouts/gantt/blocks.tsxindex efb2b6bd14..bd25dc916e 100644--- a/web/core/components/issues/issue-layouts/gantt/blocks.tsx+++ b/web/core/components/issues/issue-layouts/gantt/blocks.tsx@@ -21,10 +21,11 @@ import { GanttStoreType } from "./base-gantt-root";type Props = {issueId: string;+ isEpic?: boolean;};export const IssueGanttBlock: React.FC<Props> = observer((props) => {- const { issueId } = props;+ const { issueId, isEpic } = props;// routerconst { workspaceSlug: routerWorkspaceSlug } = useParams();const workspaceSlug = routerWorkspaceSlug?.toString();@@ -35,7 +36,7 @@ export const IssueGanttBlock: React.FC<Props> = observer((props) => {} = useIssueDetail();// hooksconst { isMobile } = usePlatformOS();- const { handleRedirection } = useIssuePeekOverviewRedirection();+ const { handleRedirection } = useIssuePeekOverviewRedirection(isEpic);// derived valuesconst issueDetails = getIssueById(issueId);@@ -78,7 +79,7 @@ export const IssueGanttBlock: React.FC<Props> = observer((props) => {// rendering issues on gantt sidebarexport const IssueGanttSidebarBlock: React.FC<Props> = observer((props) => {- const { issueId } = props;+ const { issueId, isEpic = false } = props;// routerconst { workspaceSlug: routerWorkspaceSlug } = useParams();const workspaceSlug = routerWorkspaceSlug?.toString();@@ -91,7 +92,7 @@ export const IssueGanttSidebarBlock: React.FC<Props> = observer((props) => {const { issuesFilter } = useIssues(storeType);// handlers- const { handleRedirection } = useIssuePeekOverviewRedirection();+ const { handleRedirection } = useIssuePeekOverviewRedirection(isEpic);// derived valuesconst issueDetails = getIssueById(issueId);@@ -105,7 +106,7 @@ export const IssueGanttSidebarBlock: React.FC<Props> = observer((props) => {return (<ControlLinkid={`issue-${issueId}`}- href={`/${workspaceSlug}/projects/${issueDetails?.project_id}/issues/${issueDetails?.id}`}+ href={`/${workspaceSlug}/projects/${issueDetails?.project_id}/${isEpic ? "epics" : "issues"}/${issueDetails?.id}`}onClick={handleIssuePeekOverview}className="line-clamp-1 w-full cursor-pointer text-sm text-custom-text-100"disabled={!!issueDetails?.tempId}diff --git a/web/core/components/issues/issue-layouts/kanban/base-kanban-root.tsx b/web/core/components/issues/issue-layouts/kanban/base-kanban-root.tsxindex c145c2eca2..396b1df0d5 100644--- a/web/core/components/issues/issue-layouts/kanban/base-kanban-root.tsx+++ b/web/core/components/issues/issue-layouts/kanban/base-kanban-root.tsx@@ -6,6 +6,7 @@ import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/elementimport { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";import { observer } from "mobx-react";import { useParams, usePathname } from "next/navigation";+import { EIssueServiceType } from "@plane/constants";import { DeleteIssueModal } from "@/components/issues";//constantsimport { ISSUE_DELETED } from "@/constants/event-tracker";@@ -34,7 +35,8 @@ export type KanbanStoreType =| EIssuesStoreType.DRAFT| EIssuesStoreType.PROFILE| EIssuesStoreType.TEAM- | EIssuesStoreType.TEAM_VIEW;+ | EIssuesStoreType.TEAM_VIEW+ | EIssuesStoreType.EPIC;export interface IBaseKanBanLayout {QuickActions: FC<IQuickActionProps>;@@ -42,10 +44,18 @@ export interface IBaseKanBanLayout {canEditPropertiesBasedOnProject?: (projectId: string) => boolean;isCompletedCycle?: boolean;viewId?: string | undefined;+ isEpic?: boolean;}export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBaseKanBanLayout) => {- const { QuickActions, addIssuesToView, canEditPropertiesBasedOnProject, isCompletedCycle = false, viewId } = props;+ const {+ QuickActions,+ addIssuesToView,+ canEditPropertiesBasedOnProject,+ isCompletedCycle = false,+ viewId,+ isEpic = false,+ } = props;// routerconst { workspaceSlug, projectId } = useParams();const pathname = usePathname();@@ -56,7 +66,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBasconst { issueMap, issuesFilter, issues } = useIssues(storeType);const {issue: { getIssueById },- } = useIssueDetail();+ } = useIssueDetail(isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES);const {fetchIssues,fetchNextIssues,@@ -275,6 +285,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBasscrollableContainerRef={scrollableContainerRef}handleOnDrop={handleOnDrop}loadMoreIssues={fetchMoreIssues}+ isEpic={isEpic}/></div></div>diff --git a/web/core/components/issues/issue-layouts/kanban/block.tsx b/web/core/components/issues/issue-layouts/kanban/block.tsxindex 314c103efa..d8f4307e85 100644--- a/web/core/components/issues/issue-layouts/kanban/block.tsx+++ b/web/core/components/issues/issue-layouts/kanban/block.tsx@@ -26,6 +26,7 @@ import { IssueIdentifier } from "@/plane-web/components/issues";import { TRenderQuickActions } from "../list/list-view-types";import { IssueProperties } from "../properties/all-properties";import { getIssueBlockId } from "../utils";+import { EIssueServiceType } from "@plane/constants";interface IssueBlockProps {issueId: string;@@ -41,6 +42,7 @@ interface IssueBlockProps {canEditProperties: (projectId: string | undefined) => boolean;scrollableContainerRef?: MutableRefObject<HTMLDivElement | null>;shouldRenderByDefault?: boolean;+ isEpic?: boolean;}interface IssueDetailsBlockProps {@@ -50,10 +52,11 @@ interface IssueDetailsBlockProps {updateIssue: ((projectId: string | null, issueId: string, data: Partial<TIssue>) => Promise<void>) | undefined;quickActions: TRenderQuickActions;isReadOnly: boolean;+ isEpic?: boolean;}const KanbanIssueDetailsBlock: React.FC<IssueDetailsBlockProps> = observer((props) => {- const { cardRef, issue, updateIssue, quickActions, isReadOnly, displayProperties } = props;+ const { cardRef, issue, updateIssue, quickActions, isReadOnly, displayProperties, isEpic = false } = props;// hooksconst { isMobile } = usePlatformOS();@@ -99,6 +102,7 @@ const KanbanIssueDetailsBlock: React.FC<IssueDetailsBlockProps> = observer((propactiveLayout="Kanban"updateIssue={updateIssue}isReadOnly={isReadOnly}+ isEpic={isEpic}/></>);@@ -118,6 +122,7 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = observer((props) => {canEditProperties,scrollableContainerRef,shouldRenderByDefault,+ isEpic = false,} = props;const cardRef = useRef<HTMLAnchorElement | null>(null);@@ -125,8 +130,8 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = observer((props) => {const { workspaceSlug: routerWorkspaceSlug } = useParams();const workspaceSlug = routerWorkspaceSlug?.toString();// hooks- const { getIsIssuePeeked } = useIssueDetail();- const { handleRedirection } = useIssuePeekOverviewRedirection();+ const { getIsIssuePeeked } = useIssueDetail(isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES);+ const { handleRedirection } = useIssuePeekOverviewRedirection(isEpic);const { isMobile } = usePlatformOS();// handlers@@ -210,7 +215,7 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = observer((props) => {><ControlLinkid={getIssueBlockId(issueId, groupId, subGroupId)}- href={`/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${+ href={`/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}${isEpic ? "epics" : "issues"}/${issue.id}`}ref={cardRef}@@ -238,6 +243,7 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = observer((props) => {updateIssue={updateIssue}quickActions={quickActions}isReadOnly={!canEditIssueProperties}+ isEpic={isEpic}/></RenderIfVisible></ControlLink>diff --git a/web/core/components/issues/issue-layouts/kanban/blocks-list.tsx b/web/core/components/issues/issue-layouts/kanban/blocks-list.tsxindex 4a4ae9a2c5..2fb4da801b 100644--- a/web/core/components/issues/issue-layouts/kanban/blocks-list.tsx+++ b/web/core/components/issues/issue-layouts/kanban/blocks-list.tsx@@ -18,6 +18,7 @@ interface IssueBlocksListProps {canDropOverIssue: boolean;canDragIssuesInCurrentGrouping: boolean;scrollableContainerRef?: MutableRefObject<HTMLDivElement | null>;+ isEpic?: boolean;}export const KanbanIssueBlocksList: React.FC<IssueBlocksListProps> = observer((props) => {@@ -33,6 +34,7 @@ export const KanbanIssueBlocksList: React.FC<IssueBlocksListProps> = observer((pquickActions,canEditProperties,scrollableContainerRef,+ isEpic = false,} = props;return (@@ -62,6 +64,7 @@ export const KanbanIssueBlocksList: React.FC<IssueBlocksListProps> = observer((pcanDragIssuesInCurrentGrouping={canDragIssuesInCurrentGrouping}canEditProperties={canEditProperties}scrollableContainerRef={scrollableContainerRef}+ isEpic={isEpic}/>);})}diff --git a/web/core/components/issues/issue-layouts/kanban/default.tsx b/web/core/components/issues/issue-layouts/kanban/default.tsxindex f1107c8fb7..3f20646d1c 100644--- a/web/core/components/issues/issue-layouts/kanban/default.tsx+++ b/web/core/components/issues/issue-layouts/kanban/default.tsx@@ -58,6 +58,7 @@ export interface IKanBan {handleOnDrop: (source: GroupDropLocation, destination: GroupDropLocation) => Promise<void>;showEmptyGroup?: boolean;subGroupIndex?: number;+ isEpic?: boolean;}export const KanBan: React.FC<IKanBan> = observer((props) => {@@ -86,6 +87,7 @@ export const KanBan: React.FC<IKanBan> = observer((props) => {isDropDisabled,dropErrorMessage,subGroupIndex = 0,+ isEpic = false,} = props;// store hooksconst storeType = useIssueStoreType();@@ -164,6 +166,7 @@ export const KanBan: React.FC<IKanBan> = observer((props) => {addIssuesToView={addIssuesToView}collapsedGroups={collapsedGroups}handleCollapsedGroups={handleCollapsedGroups}+ isEpic={isEpic}/></div>)}@@ -207,6 +210,7 @@ export const KanBan: React.FC<IKanBan> = observer((props) => {scrollableContainerRef={scrollableContainerRef}loadMoreIssues={loadMoreIssues}handleOnDrop={handleOnDrop}+ isEpic={isEpic}/></RenderIfVisible>)}diff --git a/web/core/components/issues/issue-layouts/kanban/headers/group-by-card.tsx b/web/core/components/issues/issue-layouts/kanban/headers/group-by-card.tsxindex 4303946dc1..853a25e9b3 100644--- a/web/core/components/issues/issue-layouts/kanban/headers/group-by-card.tsx+++ b/web/core/components/issues/issue-layouts/kanban/headers/group-by-card.tsx@@ -15,6 +15,8 @@ import { CreateUpdateIssueModal } from "@/components/issues";// hooksimport { useEventTracker } from "@/hooks/store";import { useIssueStoreType } from "@/hooks/use-issue-layout-store";+import { CreateUpdateEpicModal } from "@/plane-web/components/epics/epic-modal";+// types// Plane-webimport { WorkFlowGroupTree } from "@/plane-web/components/workflow";@@ -30,6 +32,7 @@ interface IHeaderGroupByCard {issuePayload: Partial<TIssue>;disableIssueCreation?: boolean;addIssuesToView?: (issueIds: string[]) => Promise<TIssue>;+ isEpic?: boolean;}export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {@@ -45,6 +48,7 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {issuePayload,disableIssueCreation,addIssuesToView,+ isEpic = false,} = props;const verticalAlignPosition = sub_group_by ? false : collapsedGroups?.group_by.includes(column_id);// states@@ -86,13 +90,17 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {return (<>- <CreateUpdateIssueModal- isOpen={isOpen}- onClose={() => setIsOpen(false)}- data={issuePayload}- storeType={storeType}- isDraft={isDraftIssue}- />+ {isEpic ? (+ <CreateUpdateEpicModal isOpen={isOpen} onClose={() => setIsOpen(false)} data={issuePayload} />+ ) : (+ <CreateUpdateIssueModal+ isOpen={isOpen}+ onClose={() => setIsOpen(false)}+ data={issuePayload}+ storeType={storeType}+ isDraft={isDraftIssue}+ />+ )}{renderExistingIssueModal && (<ExistingIssuesListModaldiff --git a/web/core/components/issues/issue-layouts/kanban/kanban-group.tsx b/web/core/components/issues/issue-layouts/kanban/kanban-group.tsxindex 94a5fdb240..0bee738b6f 100644--- a/web/core/components/issues/issue-layouts/kanban/kanban-group.tsx+++ b/web/core/components/issues/issue-layouts/kanban/kanban-group.tsx@@ -56,6 +56,7 @@ interface IKanbanGroup {scrollableContainerRef?: MutableRefObject<HTMLDivElement | null>;handleOnDrop: (source: GroupDropLocation, destination: GroupDropLocation) => Promise<void>;orderBy: TIssueOrderByOptions | undefined;+ isEpic?: boolean;}export const KanbanGroup = observer((props: IKanbanGroup) => {@@ -79,6 +80,7 @@ export const KanbanGroup = observer((props: IKanbanGroup) => {quickAddCallback,scrollableContainerRef,handleOnDrop,+ isEpic =false} = props;// hooksconst projectState = useProjectState();@@ -294,6 +296,7 @@ export const KanbanGroup = observer((props: IKanbanGroup) => {scrollableContainerRef={scrollableContainerRef}canDropOverIssue={!canOverlayBeVisible}canDragIssuesInCurrentGrouping={canDragIssuesInCurrentGrouping}+ isEpic={isEpic}/>{shouldLoadMore && (isSubGroup ? <>{loadMore}</> : <KanbanIssueBlockLoader ref={setIntersectionElement} />)}diff --git a/web/core/components/issues/issue-layouts/list/base-list-root.tsx b/web/core/components/issues/issue-layouts/list/base-list-root.tsxindex 7bff28cd92..ff49ec668e 100644--- a/web/core/components/issues/issue-layouts/list/base-list-root.tsx+++ b/web/core/components/issues/issue-layouts/list/base-list-root.tsx@@ -28,7 +28,8 @@ type ListStoreType =| EIssuesStoreType.ARCHIVED| EIssuesStoreType.WORKSPACE_DRAFT| EIssuesStoreType.TEAM- | EIssuesStoreType.TEAM_VIEW;+ | EIssuesStoreType.TEAM_VIEW+ | EIssuesStoreType.EPIC;interface IBaseListRoot {QuickActions: FC<IQuickActionProps>;@@ -36,9 +37,17 @@ interface IBaseListRoot {canEditPropertiesBasedOnProject?: (projectId: string) => boolean;viewId?: string | undefined;isCompletedCycle?: boolean;+ isEpic?: boolean;}export const BaseListRoot = observer((props: IBaseListRoot) => {- const { QuickActions, viewId, addIssuesToView, canEditPropertiesBasedOnProject, isCompletedCycle = false } = props;+ const {+ QuickActions,+ viewId,+ addIssuesToView,+ canEditPropertiesBasedOnProject,+ isCompletedCycle = false,+ isEpic = false,+ } = props;// routerconst storeType = useIssueStoreType() as ListStoreType;//stores@@ -157,6 +166,7 @@ export const BaseListRoot = observer((props: IBaseListRoot) => {handleOnDrop={handleOnDrop}handleCollapsedGroups={handleCollapsedGroups}collapsedGroups={collapsedGroups}+ isEpic={isEpic}/></div></IssueLayoutHOC>diff --git a/web/core/components/issues/issue-layouts/list/block-root.tsx b/web/core/components/issues/issue-layouts/list/block-root.tsxindex 4d13e3ef9f..bcb2ef1895 100644--- a/web/core/components/issues/issue-layouts/list/block-root.tsx+++ b/web/core/components/issues/issue-layouts/list/block-root.tsx@@ -5,6 +5,7 @@ import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";import { attachInstruction, extractInstruction } from "@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";// plane helpersimport { useOutsideClickDetector } from "@plane/hooks";// types@@ -39,6 +40,7 @@ type Props = {isParentIssueBeingDragged?: boolean;isLastChild?: boolean;shouldRenderByDefault?: boolean;+ isEpic?: boolean;};export const IssueBlockRoot: FC<Props> = observer((props) => {@@ -59,6 +61,7 @@ export const IssueBlockRoot: FC<Props> = observer((props) => {isLastChild = false,selectionHelpers,shouldRenderByDefault,+ isEpic = false,} = props;// statesconst [isExpanded, setExpanded] = useState<boolean>(false);@@ -69,7 +72,7 @@ export const IssueBlockRoot: FC<Props> = observer((props) => {// hooksconst { isMobile } = usePlatformOS();// store hooks- const { subIssues: subIssuesStore } = useIssueDetail();+ const { subIssues: subIssuesStore } = useIssueDetail(isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES);const isSubIssue = nestingLevel !== 0;@@ -150,10 +153,12 @@ export const IssueBlockRoot: FC<Props> = observer((props) => {canDrag={!isSubIssue && isDragAllowed}isCurrentBlockDragging={isParentIssueBeingDragged || isCurrentBlockDragging}setIsCurrentBlockDragging={setIsCurrentBlockDragging}+ isEpic={isEpic}/></RenderIfVisible>{isExpanded &&+ !isEpic &&subIssues?.map((subIssueId) => (<IssueBlockRootkey={`${subIssueId}`}diff --git a/web/core/components/issues/issue-layouts/list/block.tsx b/web/core/components/issues/issue-layouts/list/block.tsxindex 1d22bb143b..6b938bc160 100644--- a/web/core/components/issues/issue-layouts/list/block.tsx+++ b/web/core/components/issues/issue-layouts/list/block.tsx@@ -6,6 +6,7 @@ import { draggable } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";import { observer } from "mobx-react";import { useParams } from "next/navigation";import { ChevronRight } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";// typesimport { TIssue, IIssueDisplayProperties, TIssueMap } from "@plane/types";// ui@@ -40,6 +41,7 @@ interface IssueBlockProps {isCurrentBlockDragging: boolean;setIsCurrentBlockDragging: React.Dispatch<React.SetStateAction<boolean>>;canDrag: boolean;+ isEpic?: boolean;}export const IssueBlock = observer((props: IssueBlockProps) => {@@ -59,6 +61,7 @@ export const IssueBlock = observer((props: IssueBlockProps) => {isCurrentBlockDragging,setIsCurrentBlockDragging,canDrag,+ isEpic = false,} = props;// refconst issueRef = useRef<HTMLDivElement | null>(null);@@ -69,7 +72,12 @@ export const IssueBlock = observer((props: IssueBlockProps) => {// hooksconst { sidebarCollapsed: isSidebarCollapsed } = useAppTheme();const { getProjectIdentifierById } = useProject();- const { getIsIssuePeeked, peekIssue, setPeekIssue, subIssues: subIssuesStore } = useIssueDetail();+ const {+ getIsIssuePeeked,+ peekIssue,+ setPeekIssue,+ subIssues: subIssuesStore,+ } = useIssueDetail(isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES);const handleIssuePeekOverview = (issue: TIssue) =>workspaceSlug &&@@ -143,7 +151,7 @@ export const IssueBlock = observer((props: IssueBlockProps) => {return (<ControlLinkid={`issue-${issue.id}`}- href={`/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${issue.id}`}+ href={`/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}${isEpic ? "epics" : "issues"}/${issue.id}`}onClick={() => handleIssuePeekOverview(issue)}className="w-full cursor-pointer"disabled={!!issue?.tempId || issue?.is_draft}@@ -178,7 +186,7 @@ export const IssueBlock = observer((props: IssueBlockProps) => {<div className="flex flex-grow items-center gap-0.5 truncate"><div className="flex items-center gap-1" style={isSubIssue ? { marginLeft } : {}}>{/* select checkbox */}- {projectId && canSelectIssues && (+ {projectId && canSelectIssues && !isEpic && (<TooltiptooltipContent={<>@@ -220,7 +228,7 @@ export const IssueBlock = observer((props: IssueBlockProps) => {{/* sub-issues chevron */}<div className="size-4 grid place-items-center flex-shrink-0">- {subIssuesCount > 0 && (+ {subIssuesCount > 0 && !isEpic && (<buttontype="button"className="size-4 grid place-items-center rounded-sm text-custom-text-400 hover:text-custom-text-300"@@ -275,6 +283,7 @@ export const IssueBlock = observer((props: IssueBlockProps) => {updateIssue={updateIssue}displayProperties={displayProperties}activeLayout="List"+ isEpic={isEpic}/><divclassName={cn("hidden", {diff --git a/web/core/components/issues/issue-layouts/list/blocks-list.tsx b/web/core/components/issues/issue-layouts/list/blocks-list.tsxindex a415dc0ebf..4c84322d17 100644--- a/web/core/components/issues/issue-layouts/list/blocks-list.tsx+++ b/web/core/components/issues/issue-layouts/list/blocks-list.tsx@@ -19,6 +19,7 @@ interface Props {isDragAllowed: boolean;canDropOverIssue: boolean;selectionHelpers: TSelectionHelper;+ isEpic?: boolean;}export const IssueBlocksList: FC<Props> = (props) => {@@ -34,6 +35,7 @@ export const IssueBlocksList: FC<Props> = (props) => {selectionHelpers,isDragAllowed,canDropOverIssue,+ isEpic = false,} = props;return (@@ -57,6 +59,7 @@ export const IssueBlocksList: FC<Props> = (props) => {isLastChild={index === issueIds.length - 1}isDragAllowed={isDragAllowed}canDropOverIssue={canDropOverIssue}+ isEpic={isEpic}/>))}</div>diff --git a/web/core/components/issues/issue-layouts/list/default.tsx b/web/core/components/issues/issue-layouts/list/default.tsxindex 01a81cc61b..b09802c24e 100644--- a/web/core/components/issues/issue-layouts/list/default.tsx+++ b/web/core/components/issues/issue-layouts/list/default.tsx@@ -48,6 +48,7 @@ export interface IList {loadMoreIssues: (groupId?: string) => void;handleCollapsedGroups: (value: string) => void;collapsedGroups: TIssueKanbanFilters;+ isEpic?: boolean;}export const List: React.FC<IList> = observer((props) => {@@ -70,6 +71,7 @@ export const List: React.FC<IList> = observer((props) => {loadMoreIssues,handleCollapsedGroups,collapsedGroups,+ isEpic = false,} = props;const storeType = useIssueStoreType();@@ -121,7 +123,11 @@ export const List: React.FC<IList> = observer((props) => {return (<div className="relative size-full flex flex-col">{groups && (- <MultipleSelectGroup containerRef={containerRef} entities={entities} disabled={!isBulkOperationsEnabled}>+ <MultipleSelectGroup+ containerRef={containerRef}+ entities={entities}+ disabled={!isBulkOperationsEnabled || isEpic}+ >{(helpers) => (<><div@@ -153,6 +159,7 @@ export const List: React.FC<IList> = observer((props) => {selectionHelpers={helpers}handleCollapsedGroups={handleCollapsedGroups}collapsedGroups={collapsedGroups}+ isEpic={isEpic}/>))}</div>diff --git a/web/core/components/issues/issue-layouts/list/headers/group-by-card.tsx b/web/core/components/issues/issue-layouts/list/headers/group-by-card.tsxindex 6d2f57a990..6dc4a16aa7 100644--- a/web/core/components/issues/issue-layouts/list/headers/group-by-card.tsx+++ b/web/core/components/issues/issue-layouts/list/headers/group-by-card.tsx@@ -18,6 +18,8 @@ import { cn } from "@/helpers/common.helper";import { useEventTracker } from "@/hooks/store";import { useIssueStoreType } from "@/hooks/use-issue-layout-store";import { TSelectionHelper } from "@/hooks/use-multiple-select";+// plane-web+import { CreateUpdateEpicModal } from "@/plane-web/components/epics/epic-modal";// Plane-webimport { WorkFlowGroupTree } from "@/plane-web/components/workflow";@@ -33,6 +35,7 @@ interface IHeaderGroupByCard {addIssuesToView?: (issueIds: string[]) => Promise<TIssue>;selectionHelpers: TSelectionHelper;handleCollapsedGroups: (value: string) => void;+ isEpic?: boolean;}export const HeaderGroupByCard = observer((props: IHeaderGroupByCard) => {@@ -48,6 +51,7 @@ export const HeaderGroupByCard = observer((props: IHeaderGroupByCard) => {addIssuesToView,selectionHelpers,handleCollapsedGroups,+ isEpic = false,} = props;// statesconst [isOpen, setIsOpen] = useState(false);@@ -157,13 +161,17 @@ export const HeaderGroupByCard = observer((props: IHeaderGroupByCard) => {</div>))}- <CreateUpdateIssueModal- isOpen={isOpen}- onClose={() => setIsOpen(false)}- data={issuePayload}- storeType={storeType}- isDraft={isDraftIssue}- />+ {isEpic ? (+ <CreateUpdateEpicModal isOpen={isOpen} onClose={() => setIsOpen(false)} data={issuePayload} />+ ) : (+ <CreateUpdateIssueModal+ isOpen={isOpen}+ onClose={() => setIsOpen(false)}+ data={issuePayload}+ storeType={storeType}+ isDraft={isDraftIssue}+ />+ )}{renderExistingIssueModal && (<ExistingIssuesListModaldiff --git a/web/core/components/issues/issue-layouts/list/list-group.tsx b/web/core/components/issues/issue-layouts/list/list-group.tsxindex fe54ce875d..7e8f3d2912 100644--- a/web/core/components/issues/issue-layouts/list/list-group.tsx+++ b/web/core/components/issues/issue-layouts/list/list-group.tsx@@ -64,6 +64,7 @@ interface Props {selectionHelpers: TSelectionHelper;handleCollapsedGroups: (value: string) => void;collapsedGroups: TIssueKanbanFilters;+ isEpic?: boolean;}export const ListGroup = observer((props: Props) => {@@ -90,6 +91,7 @@ export const ListGroup = observer((props: Props) => {selectionHelpers,handleCollapsedGroups,collapsedGroups,+ isEpic = false,} = props;const [isDraggingOverColumn, setIsDraggingOverColumn] = useState(false);@@ -266,6 +268,7 @@ export const ListGroup = observer((props: Props) => {addIssuesToView={addIssuesToView}selectionHelpers={selectionHelpers}handleCollapsedGroups={handleCollapsedGroups}+ isEpic={isEpic}/></Row>{shouldExpand && (@@ -292,6 +295,7 @@ export const ListGroup = observer((props: Props) => {isDragAllowed={isDragAllowed}canDropOverIssue={!canOverlayBeVisible}selectionHelpers={selectionHelpers}+ isEpic={isEpic}/>)}diff --git a/web/core/components/issues/issue-layouts/properties/all-properties.tsx b/web/core/components/issues/issue-layouts/properties/all-properties.tsxindex 36bb6fafcc..fd285daf10 100644--- a/web/core/components/issues/issue-layouts/properties/all-properties.tsx+++ b/web/core/components/issues/issue-layouts/properties/all-properties.tsx@@ -42,10 +42,11 @@ export interface IIssueProperties {isReadOnly: boolean;className: string;activeLayout: string;+ isEpic?: boolean;}export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {- const { issue, updateIssue, displayProperties, activeLayout, isReadOnly, className } = props;+ const { issue, updateIssue, displayProperties, activeLayout, isReadOnly, className, isEpic = false } = props;// store hooksconst { getProjectById } = useProject();const { labelMap } = useLabel();@@ -376,42 +377,46 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {</div></WithDisplayPropertiesHOC>- {/* modules */}- {projectDetails?.module_view && (- <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="modules">- <div className="h-5" onClick={handleEventPropagation}>- <ModuleDropdown- buttonContainerClassName="truncate max-w-40"- projectId={issue?.project_id}- value={issue?.module_ids ?? []}- onChange={handleModule}- disabled={isReadOnly}- renderByDefault={isMobile}- multiple- buttonVariant="border-with-text"- showCount- showTooltip- />- </div>- </WithDisplayPropertiesHOC>- )}-- {/* cycles */}- {projectDetails?.cycle_view && (- <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="cycle">- <div className="h-5" onClick={handleEventPropagation}>- <CycleDropdown- buttonContainerClassName="truncate max-w-40"- projectId={issue?.project_id}- value={issue?.cycle_id}- onChange={handleCycle}- disabled={isReadOnly}- buttonVariant="border-with-text"- renderByDefault={isMobile}- showTooltip- />- </div>- </WithDisplayPropertiesHOC>+ {!isEpic && (+ <>+ {/* modules */}+ {projectDetails?.module_view && (+ <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="modules">+ <div className="h-5" onClick={handleEventPropagation}>+ <ModuleDropdown+ buttonContainerClassName="truncate max-w-40"+ projectId={issue?.project_id}+ value={issue?.module_ids ?? []}+ onChange={handleModule}+ disabled={isReadOnly}+ renderByDefault={isMobile}+ multiple+ buttonVariant="border-with-text"+ showCount+ showTooltip+ />+ </div>+ </WithDisplayPropertiesHOC>+ )}++ {/* cycles */}+ {projectDetails?.cycle_view && (+ <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="cycle">+ <div className="h-5" onClick={handleEventPropagation}>+ <CycleDropdown+ buttonContainerClassName="truncate max-w-40"+ projectId={issue?.project_id}+ value={issue?.cycle_id}+ onChange={handleCycle}+ disabled={isReadOnly}+ buttonVariant="border-with-text"+ renderByDefault={isMobile}+ showTooltip+ />+ </div>+ </WithDisplayPropertiesHOC>+ )}+ </>)}{/* estimates */}diff --git a/web/core/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx b/web/core/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsxindex 4ba268dedb..b7bd6d9f13 100644--- a/web/core/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx+++ b/web/core/components/issues/issue-layouts/spreadsheet/base-spreadsheet-root.tsx@@ -26,17 +26,19 @@ export type SpreadsheetStoreType =| EIssuesStoreType.CYCLE| EIssuesStoreType.PROJECT_VIEW| EIssuesStoreType.TEAM- | EIssuesStoreType.TEAM_VIEW;+ | EIssuesStoreType.TEAM_VIEW+ | EIssuesStoreType.EPIC;interface IBaseSpreadsheetRoot {QuickActions: FC<IQuickActionProps>;canEditPropertiesBasedOnProject?: (projectId: string) => boolean;isCompletedCycle?: boolean;viewId?: string | undefined;+ isEpic?: boolean;}export const BaseSpreadsheetRoot = observer((props: IBaseSpreadsheetRoot) => {- const { QuickActions, canEditPropertiesBasedOnProject, isCompletedCycle = false, viewId } = props;+ const { QuickActions, canEditPropertiesBasedOnProject, isCompletedCycle = false, viewId, isEpic = false } = props;// routerconst { projectId } = useParams();// store hooks@@ -126,6 +128,7 @@ export const BaseSpreadsheetRoot = observer((props: IBaseSpreadsheetRoot) => {disableIssueCreation={!enableIssueCreation || !isEditingAllowed || isCompletedCycle}canLoadMoreIssues={!!nextPageResults}loadMoreIssues={fetchNextIssues}+ isEpic={isEpic}/></IssueLayoutHOC>);diff --git a/web/core/components/issues/issue-layouts/spreadsheet/issue-row.tsx b/web/core/components/issues/issue-layouts/spreadsheet/issue-row.tsxindex 5c4e9e9274..0ce6465512 100644--- a/web/core/components/issues/issue-layouts/spreadsheet/issue-row.tsx+++ b/web/core/components/issues/issue-layouts/spreadsheet/issue-row.tsx@@ -4,6 +4,7 @@ import { Dispatch, MouseEvent, MutableRefObject, SetStateAction, useRef, useStatimport { observer } from "mobx-react";import { useParams } from "next/navigation";import { ChevronRight, MoreHorizontal } from "lucide-react";+import { EIssueServiceType } from "@plane/constants";// plane helpersimport { useOutsideClickDetector } from "@plane/hooks";// types@@ -44,6 +45,7 @@ interface Props {spacingLeft?: number;selectionHelpers: TSelectionHelper;shouldRenderByDefault?: boolean;+ isEpic?: boolean;}export const SpreadsheetIssueRow = observer((props: Props) => {@@ -62,11 +64,12 @@ export const SpreadsheetIssueRow = observer((props: Props) => {spacingLeft = 6,selectionHelpers,shouldRenderByDefault,+ isEpic = false,} = props;// statesconst [isExpanded, setExpanded] = useState<boolean>(false);// store hooks- const { subIssues: subIssuesStore } = useIssueDetail();+ const { subIssues: subIssuesStore } = useIssueDetail(isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES);const { issueMap } = useIssues();// derived values@@ -110,10 +113,12 @@ export const SpreadsheetIssueRow = observer((props: Props) => {setExpanded={setExpanded}spreadsheetColumnsList={spreadsheetColumnsList}selectionHelpers={selectionHelpers}+ isEpic={isEpic}/></RenderIfVisible>{isExpanded &&+ !isEpic &&subIssues?.map((subIssueId: string) => (<SpreadsheetIssueRowkey={subIssueId}@@ -152,6 +157,7 @@ interface IssueRowDetailsProps {spreadsheetColumnsList: (keyof IIssueDisplayProperties)[];spacingLeft?: number;selectionHelpers: TSelectionHelper;+ isEpic?: boolean;}const IssueRowDetails = observer((props: IssueRowDetailsProps) => {@@ -170,6 +176,7 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {spreadsheetColumnsList,spacingLeft = 6,selectionHelpers,+ isEpic = false,} = props;// statesconst [isMenuActive, setIsMenuActive] = useState(false);@@ -180,8 +187,8 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {const { workspaceSlug, projectId } = useParams();// hooksconst { getProjectIdentifierById } = useProject();- const { getIsIssuePeeked, peekIssue } = useIssueDetail();- const { handleRedirection } = useIssuePeekOverviewRedirection();+ const { getIsIssuePeeked, peekIssue } = useIssueDetail(isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES);+ const { handleRedirection } = useIssuePeekOverviewRedirection(isEpic);const { isMobile } = usePlatformOS();// handlers@@ -243,7 +250,7 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {className="relative md:sticky left-0 z-10 group/list-block bg-custom-background-100"><ControlLink- href={`/${workspaceSlug}/projects/${issueDetail.project_id}/issues/${issueId}`}+ href={`/${workspaceSlug}/projects/${issueDetail.project_id}/${isEpic ? "epics" : "issues"}/${issueId}`}onClick={() => handleIssuePeekOverview(issueDetail)}className={cn("group clickable cursor-pointer h-11 w-[28rem] flex items-center text-sm after:absolute border-r-[0.5px] z-10 border-custom-border-200 bg-transparent group-[.selected-issue-row]:bg-custom-primary-100/5 group-[.selected-issue-row]:hover:bg-custom-primary-100/10",@@ -307,7 +314,7 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {{/* sub-issues chevron */}<div className="grid place-items-center size-4">- {subIssuesCount > 0 && (+ {subIssuesCount > 0 && !isEpic && (<buttontype="button"className="grid place-items-center size-4 rounded-sm text-custom-text-400 hover:text-custom-text-300"diff --git a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-table.tsx b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-table.tsxindex 2bf3ce3658..14c9ee3228 100644--- a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-table.tsx+++ b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-table.tsx@@ -29,6 +29,7 @@ type Props = {loadMoreIssues: () => void;spreadsheetColumnsList: (keyof IIssueDisplayProperties)[];selectionHelpers: TSelectionHelper;+ isEpic?: boolean;};export const SpreadsheetTable = observer((props: Props) => {@@ -47,6 +48,7 @@ export const SpreadsheetTable = observer((props: Props) => {loadMoreIssues,spreadsheetColumnsList,selectionHelpers,+ isEpic = false,} = props;// states@@ -127,6 +129,7 @@ export const SpreadsheetTable = observer((props: Props) => {isScrolled={isScrolled}spreadsheetColumnsList={spreadsheetColumnsList}selectionHelpers={selectionHelpers}+ isEpic={isEpic}/>))}</tbody>diff --git a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsxindex 167aa46f42..26c7881112 100644--- a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx+++ b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx@@ -34,6 +34,7 @@ type Props = {enableQuickCreateIssue?: boolean;disableIssueCreation?: boolean;isWorkspaceLevel?: boolean;+ isEpic?: boolean;};export const SpreadsheetView: React.FC<Props> = observer((props) => {@@ -51,6 +52,7 @@ export const SpreadsheetView: React.FC<Props> = observer((props) => {canLoadMoreIssues,loadMoreIssues,isWorkspaceLevel = false,+ isEpic = false,} = props;// refsconst containerRef = useRef<HTMLTableElement | null>(null);@@ -85,7 +87,7 @@ export const SpreadsheetView: React.FC<Props> = observer((props) => {entities={{[SPREADSHEET_SELECT_GROUP]: issueIds,}}- disabled={!isBulkOperationsEnabled}+ disabled={!isBulkOperationsEnabled || isEpic}>{(helpers) => (<>@@ -105,6 +107,7 @@ export const SpreadsheetView: React.FC<Props> = observer((props) => {loadMoreIssues={loadMoreIssues}spreadsheetColumnsList={spreadsheetColumnsList}selectionHelpers={helpers}+ isEpic={isEpic}/></div><div className="border-t border-custom-border-100">diff --git a/web/core/components/issues/issue-modal/base.tsx b/web/core/components/issues/issue-modal/base.tsxindex 798af25779..2a9d4abe1c 100644--- a/web/core/components/issues/issue-modal/base.tsx+++ b/web/core/components/issues/issue-modal/base.tsx@@ -21,7 +21,7 @@ import { FileService } from "@/services/file.service";const fileService = new FileService();// local componentsimport { DraftIssueLayout } from "./draft-issue-layout";-import { IssueFormRoot } from "./form";+import { type IssueFormProps, IssueFormRoot } from "./form";export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((props) => {const {@@ -41,7 +41,9 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((} = props;const issueStoreType = useIssueStoreType();- const storeType = issueStoreFromProps ?? issueStoreType;+ const storeType = (issueStoreFromProps ? issueStoreFromProps : issueStoreType === EIssuesStoreType.EPIC)+ ? EIssuesStoreType.PROJECT+ : issueStoreType;// refconst issueTitleRef = useRef<HTMLInputElement>(null);// states@@ -333,6 +335,30 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((// don't open the modal if there are no projectsif (!projectIdsWithCreatePermissions || projectIdsWithCreatePermissions.length === 0 || !activeProjectId) return null;+ const commonIssueModalProps: IssueFormProps = {+ issueTitleRef: issueTitleRef,+ data: {+ ...data,+ description_html: description,+ cycle_id: data?.cycle_id ? data?.cycle_id : cycleId ? cycleId.toString() : null,+ module_ids: data?.module_ids ? data?.module_ids : moduleId ? [moduleId.toString()] : null,+ },+ onAssetUpload: handleUpdateUploadedAssetIds,+ onClose: handleClose,+ onSubmit: (payload) => handleFormSubmit(payload, isDraft),+ projectId: activeProjectId,+ isCreateMoreToggleEnabled: createMore,+ onCreateMoreToggleChange: handleCreateMoreToggleChange,+ isDraft: isDraft,+ moveToIssue: moveToIssue,+ modalTitle: modalTitle,+ primaryButtonText: primaryButtonText,+ isDuplicateModalOpen: isDuplicateModalOpen,+ handleDuplicateIssueModal: handleDuplicateIssueModal,+ isProjectSelectionDisabled: isProjectSelectionDisabled,+ storeType: storeType,+ };+return (<ModalCoreisOpen={isOpen}@@ -342,51 +368,9 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((className="!bg-transparent rounded-lg shadow-none transition-[width] ease-linear">{withDraftIssueWrapper ? (- <DraftIssueLayout- changesMade={changesMade}- data={{- ...data,- description_html: description,- cycle_id: data?.cycle_id ? data?.cycle_id : cycleId ? cycleId.toString() : null,- module_ids: data?.module_ids ? data?.module_ids : moduleId ? [moduleId.toString()] : null,- }}- issueTitleRef={issueTitleRef}- onAssetUpload={handleUpdateUploadedAssetIds}- onChange={handleFormChange}- onClose={handleClose}- onSubmit={(payload) => handleFormSubmit(payload, isDraft)}- projectId={activeProjectId}- isCreateMoreToggleEnabled={createMore}- onCreateMoreToggleChange={handleCreateMoreToggleChange}- isDraft={isDraft}- moveToIssue={moveToIssue}- isDuplicateModalOpen={isDuplicateModalOpen}- handleDuplicateIssueModal={handleDuplicateIssueModal}- isProjectSelectionDisabled={isProjectSelectionDisabled}- />+ <DraftIssueLayout {...commonIssueModalProps} changesMade={changesMade} onChange={handleFormChange} />) : (- <IssueFormRoot- issueTitleRef={issueTitleRef}- data={{- ...data,- description_html: description,- cycle_id: data?.cycle_id ? data?.cycle_id : cycleId ? cycleId.toString() : null,- module_ids: data?.module_ids ? data?.module_ids : moduleId ? [moduleId.toString()] : null,- }}- onAssetUpload={handleUpdateUploadedAssetIds}- onClose={handleClose}- isCreateMoreToggleEnabled={createMore}- onCreateMoreToggleChange={handleCreateMoreToggleChange}- onSubmit={(payload) => handleFormSubmit(payload, isDraft)}- projectId={activeProjectId}- isDraft={isDraft}- moveToIssue={moveToIssue}- modalTitle={modalTitle}- primaryButtonText={primaryButtonText}- isDuplicateModalOpen={isDuplicateModalOpen}- handleDuplicateIssueModal={handleDuplicateIssueModal}- isProjectSelectionDisabled={isProjectSelectionDisabled}- />+ <IssueFormRoot {...commonIssueModalProps} />)}</ModalCore>);diff --git a/web/core/components/issues/issue-modal/components/default-properties.tsx b/web/core/components/issues/issue-modal/components/default-properties.tsxindex c1978260a1..91425e71a1 100644--- a/web/core/components/issues/issue-modal/components/default-properties.tsx+++ b/web/core/components/issues/issue-modal/components/default-properties.tsx@@ -332,6 +332,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob}}projectId={projectId ?? undefined}issueId={isDraft ? undefined : id}+ searchEpic/>)}/>diff --git a/web/core/components/issues/issue-modal/context/index.ts b/web/core/components/issues/issue-modal/context/index.tsindex 61ad8c43aa..e396ff2c17 100644--- a/web/core/components/issues/issue-modal/context/index.ts+++ b/web/core/components/issues/issue-modal/context/index.ts@@ -1 +1 @@-export * from "./issue-modal";+export * from "./issue-modal-context";diff --git a/web/core/components/issues/issue-modal/context/issue-modal.tsx b/web/core/components/issues/issue-modal/context/issue-modal-context.tsxsimilarity index 100%rename from web/core/components/issues/issue-modal/context/issue-modal.tsxrename to web/core/components/issues/issue-modal/context/issue-modal-context.tsxdiff --git a/web/core/components/issues/issue-modal/draft-issue-layout.tsx b/web/core/components/issues/issue-modal/draft-issue-layout.tsxindex d74cb7606e..e2c693acc4 100644--- a/web/core/components/issues/issue-modal/draft-issue-layout.tsx+++ b/web/core/components/issues/issue-modal/draft-issue-layout.tsx@@ -16,51 +16,15 @@ import { isEmptyHtmlString } from "@/helpers/string.helper";import { useIssueModal } from "@/hooks/context/use-issue-modal";import { useEventTracker, useWorkspaceDraftIssues } from "@/hooks/store";// local components-import { IssueFormRoot } from "./form";+import { IssueFormRoot, type IssueFormProps } from "./form";-export interface DraftIssueProps {+export interface DraftIssueProps extends IssueFormProps {changesMade: Partial<TIssue> | null;- data?: Partial<TIssue>;- issueTitleRef: React.MutableRefObject<HTMLInputElement | null>;- isCreateMoreToggleEnabled: boolean;- onAssetUpload: (assetId: string) => void;- onCreateMoreToggleChange: (value: boolean) => void;onChange: (formData: Partial<TIssue> | null) => void;- onClose: (saveDraftIssueInLocalStorage?: boolean) => void;- onSubmit: (formData: Partial<TIssue>, is_draft_issue?: boolean) => Promise<void>;- projectId: string;- isDraft: boolean;- moveToIssue?: boolean;- modalTitle?: string;- primaryButtonText?: {- default: string;- loading: string;- };- isDuplicateModalOpen: boolean;- handleDuplicateIssueModal: (isOpen: boolean) => void;- isProjectSelectionDisabled?: boolean;}export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {- const {- changesMade,- data,- issueTitleRef,- onAssetUpload,- onChange,- onClose,- onSubmit,- projectId,- isCreateMoreToggleEnabled,- onCreateMoreToggleChange,- isDraft,- moveToIssue = false,- modalTitle,- primaryButtonText,- isDuplicateModalOpen,- handleDuplicateIssueModal,- isProjectSelectionDisabled = false,- } = props;+ const { changesMade, data, onChange, onClose, projectId } = props;// statesconst [issueDiscardModal, setIssueDiscardModal] = useState(false);// router params@@ -74,7 +38,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {const handleClose = () => {if (data?.id) {- onClose(false);+ onClose();setIssueDiscardModal(false);} else {if (changesMade) {@@ -93,11 +57,11 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {delete changesMade.description_html;});if (isEmpty(changesMade)) {- onClose(false);+ onClose();setIssueDiscardModal(false);} else setIssueDiscardModal(true);} else {- onClose(false);+ onClose();setIssueDiscardModal(false);}}@@ -126,7 +90,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {});onChange(null);setIssueDiscardModal(false);- onClose(false);+ onClose();return res;}).catch(() => {@@ -162,27 +126,10 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {onDiscard={() => {onChange(null);setIssueDiscardModal(false);- onClose(false);+ onClose();}}/>- <IssueFormRoot- isCreateMoreToggleEnabled={isCreateMoreToggleEnabled}- onCreateMoreToggleChange={onCreateMoreToggleChange}- data={data}- issueTitleRef={issueTitleRef}- onAssetUpload={onAssetUpload}- onChange={onChange}- onClose={handleClose}- onSubmit={onSubmit}- projectId={projectId}- isDraft={isDraft}- moveToIssue={moveToIssue}- modalTitle={modalTitle}- primaryButtonText={primaryButtonText}- isDuplicateModalOpen={isDuplicateModalOpen}- handleDuplicateIssueModal={handleDuplicateIssueModal}- isProjectSelectionDisabled={isProjectSelectionDisabled}- />+ <IssueFormRoot {...props} onClose={handleClose} /></>);});diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsxindex 5f182d24ee..48e12a377b 100644--- a/web/core/components/issues/issue-modal/form.tsx+++ b/web/core/components/issues/issue-modal/form.tsx@@ -19,6 +19,7 @@ import {IssueTitleInput,} from "@/components/issues/issue-modal/components";import { CreateLabelModal } from "@/components/labels";+import { EIssuesStoreType } from "@/constants/issue";import { ETabIndices } from "@/constants/tab-indices";// helpersimport { cn } from "@/helpers/common.helper";@@ -72,6 +73,7 @@ export interface IssueFormProps {isDuplicateModalOpen: boolean;handleDuplicateIssueModal: (isOpen: boolean) => void;isProjectSelectionDisabled?: boolean;+ storeType: EIssuesStoreType;}export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {@@ -86,8 +88,8 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {isCreateMoreToggleEnabled,onCreateMoreToggleChange,isDraft,- moveToIssue,- modalTitle = `${data?.id ? "Update" : isDraft ? "Create a draft" : "Create new issue"}`,+ moveToIssue = false,+ modalTitle,primaryButtonText = {default: `${data?.id ? "Update" : isDraft ? "Save to Drafts" : "Save"}`,loading: `${data?.id ? "Updating" : "Saving"}`,@@ -95,6 +97,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {isDuplicateModalOpen,handleDuplicateIssueModal,isProjectSelectionDisabled = false,+ storeType,} = props;// states@@ -280,6 +283,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {// debounced duplicate issues swrconst { duplicateIssues } = useDebouncedDuplicateIssues(+ workspaceSlug?.toString(),projectDetails?.workspace.toString(),projectId ?? undefined,{@@ -373,7 +377,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {disabled={!!data?.id || !!data?.sourceIssueId || isProjectSelectionDisabled}handleFormChange={handleFormChange}/>- {projectId && (+ {projectId && storeType !== EIssuesStoreType.EPIC && (<IssueTypeSelectcontrol={control}projectId={projectId}diff --git a/web/core/components/issues/parent-issues-list-modal.tsx b/web/core/components/issues/parent-issues-list-modal.tsxindex fab6bbaf17..5042902221 100644--- a/web/core/components/issues/parent-issues-list-modal.tsx+++ b/web/core/components/issues/parent-issues-list-modal.tsx@@ -29,6 +29,7 @@ type Props = {onChange: (issue: ISearchIssueResponse) => void;projectId: string | undefined;issueId?: string;+ searchEpic?: boolean;};// services@@ -41,6 +42,7 @@ export const ParentIssuesListModal: React.FC<Props> = ({onChange,projectId,issueId,+ searchEpic = false,}) => {const [isLoading, setIsLoading] = useState(false);const [searchTerm, setSearchTerm] = useState("");@@ -72,6 +74,7 @@ export const ParentIssuesListModal: React.FC<Props> = ({parent: true,issue_id: issueId,workspace_search: isWorkspaceLevel,+ epic: searchEpic ? true : undefined,}).then((res) => setIssues(res)).finally(() => {diff --git a/web/core/components/issues/peek-overview/issue-detail.tsx b/web/core/components/issues/peek-overview/issue-detail.tsxindex 38c98238b5..421aa6521e 100644--- a/web/core/components/issues/peek-overview/issue-detail.tsx+++ b/web/core/components/issues/peek-overview/issue-detail.tsx@@ -57,11 +57,16 @@ export const PeekOverviewIssueDetails: FC<IPeekOverviewIssueDetails> = observer(const issue = issueId ? getIssueById(issueId) : undefined;const projectDetails = issue?.project_id ? getProjectById(issue?.project_id) : undefined;// debounced duplicate issues swr- const { duplicateIssues } = useDebouncedDuplicateIssues(projectDetails?.workspace.toString(), projectDetails?.id, {- name: issue?.name,- description_html: getTextContent(issue?.description_html),- issueId: issue?.id,- });+ const { duplicateIssues } = useDebouncedDuplicateIssues(+ workspaceSlug,+ projectDetails?.workspace.toString(),+ projectDetails?.id,+ {+ name: issue?.name,+ description_html: getTextContent(issue?.description_html),+ issueId: issue?.id,+ }+ );if (!issue || !issue.project_id) return <></>;diff --git a/web/core/components/issues/peek-overview/root.tsx b/web/core/components/issues/peek-overview/root.tsxindex 70eb51d81b..e2e907ef85 100644--- a/web/core/components/issues/peek-overview/root.tsx+++ b/web/core/components/issues/peek-overview/root.tsx@@ -14,7 +14,7 @@ import { ISSUE_UPDATED, ISSUE_DELETED, ISSUE_ARCHIVED, ISSUE_RESTORED } from "@/import { EIssuesStoreType } from "@/constants/issue";// hooksimport { useEventTracker, useIssueDetail, useIssues, useUserPermissions } from "@/hooks/store";-import { useIssuesStore } from "@/hooks/use-issue-layout-store";+import { useIssueStoreType } from "@/hooks/use-issue-layout-store";// plane web constantsimport { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";@@ -22,10 +22,16 @@ interface IIssuePeekOverview {embedIssue?: boolean;embedRemoveCurrentNotification?: () => void;is_draft?: boolean;+ storeType?: EIssuesStoreType;}export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {- const { embedIssue = false, embedRemoveCurrentNotification, is_draft = false } = props;+ const {+ embedIssue = false,+ embedRemoveCurrentNotification,+ is_draft = false,+ storeType: issueStoreFromProps,+ } = props;// routerconst pathname = usePathname();// store hook@@ -40,8 +46,9 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {issue: { fetchIssue, getIsFetchingIssueDetails },fetchActivities,} = useIssueDetail();-- const { issues } = useIssuesStore();+ const issueStoreType = useIssueStoreType();+ const storeType = issueStoreFromProps ?? issueStoreType;+ const { issues } = useIssues(storeType);const { captureIssueEvent } = useEventTracker();// stateconst [error, setError] = useState(false);diff --git a/web/core/components/issues/peek-overview/view.tsx b/web/core/components/issues/peek-overview/view.tsxindex fc8a4df42a..c80212556c 100644--- a/web/core/components/issues/peek-overview/view.tsx+++ b/web/core/components/issues/peek-overview/view.tsx@@ -1,5 +1,7 @@import { FC, useRef, useState } from "react";import { observer } from "mobx-react";+// constants+import { EIssueServiceType } from "@plane/constants";// typesimport { TNameDescriptionLoader } from "@plane/types";// components@@ -65,6 +67,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {toggleArchiveIssueModal,issue: { getIssueById, getIsLocalDBIssueDescription },} = useIssueDetail();+ const { isAnyModalOpen: isAnyEpicModalOpen } = useIssueDetail(EIssueServiceType.EPICS);const issue = getIssueById(issueId);// remove peek idconst removeRoutePeekId = () => {@@ -78,7 +81,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {issuePeekOverviewRef,() => {if (!embedIssue) {- if (!isAnyModalOpen) {+ if (!isAnyModalOpen && !isAnyEpicModalOpen) {removeRoutePeekId();}}diff --git a/web/core/components/issues/relations/issue-list-item.tsx b/web/core/components/issues/relations/issue-list-item.tsxindex 9ac1253aea..fa5cb886a3 100644--- a/web/core/components/issues/relations/issue-list-item.tsx+++ b/web/core/components/issues/relations/issue-list-item.tsx@@ -4,7 +4,8 @@ import React, { FC } from "react";import { observer } from "mobx-react";import { X, Pencil, Trash, Link as LinkIcon } from "lucide-react";// Plane-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";import { ControlLink, CustomMenu, Tooltip } from "@plane/ui";// componentsimport { RelationIssueProperty } from "@/components/issues/relations";@@ -27,6 +28,7 @@ type Props = {disabled: boolean;issueOperations: TRelationIssueOperations;handleIssueCrudState: (key: "update" | "delete", issueId: string, issue?: TIssue | null) => void;+ issueServiceType?: TIssueServiceType;};export const RelationIssueListItem: FC<Props> = observer((props) => {@@ -39,6 +41,7 @@ export const RelationIssueListItem: FC<Props> = observer((props) => {disabled = false,issueOperations,handleIssueCrudState,+ issueServiceType = EIssueServiceType.ISSUES,} = props;// store hooks@@ -47,7 +50,7 @@ export const RelationIssueListItem: FC<Props> = observer((props) => {removeRelation,toggleCreateIssueModal,toggleDeleteIssueModal,- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const project = useProject();const { getProjectStates } = useProjectState();const { handleRedirection } = useIssuePeekOverviewRedirection();@@ -137,6 +140,7 @@ export const RelationIssueListItem: FC<Props> = observer((props) => {issueId={relationIssueId}disabled={disabled}issueOperations={issueOperations}+ issueServiceType={issueServiceType}/></div><div className="flex-shrink-0 text-sm">diff --git a/web/core/components/issues/relations/issue-list.tsx b/web/core/components/issues/relations/issue-list.tsxindex 1b89788a41..efd8786d98 100644--- a/web/core/components/issues/relations/issue-list.tsx+++ b/web/core/components/issues/relations/issue-list.tsx@@ -2,7 +2,8 @@import React, { FC } from "react";import { observer } from "mobx-react";// Plane-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";// componentsimport { RelationIssueListItem } from "@/components/issues/relations";// Plane-web@@ -19,6 +20,7 @@ type Props = {issueOperations: TRelationIssueOperations;handleIssueCrudState: (key: "update" | "delete", issueId: string, issue?: TIssue | null) => void;disabled?: boolean;+ issueServiceType?: TIssueServiceType;};export const RelationIssueList: FC<Props> = observer((props) => {@@ -31,6 +33,7 @@ export const RelationIssueList: FC<Props> = observer((props) => {disabled = false,issueOperations,handleIssueCrudState,+ issueServiceType = EIssueServiceType.ISSUES,} = props;return (@@ -48,6 +51,7 @@ export const RelationIssueList: FC<Props> = observer((props) => {disabled={disabled}handleIssueCrudState={handleIssueCrudState}issueOperations={issueOperations}+ issueServiceType={issueServiceType}/>))}</div>diff --git a/web/core/components/issues/relations/properties.tsx b/web/core/components/issues/relations/properties.tsxindex 543a88c4d0..b301c8b1f5 100644--- a/web/core/components/issues/relations/properties.tsx+++ b/web/core/components/issues/relations/properties.tsx@@ -1,8 +1,9 @@"use client";import React, { FC } from "react";import { observer } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";// components-import { TIssuePriorities } from "@plane/types";+import { TIssuePriorities, TIssueServiceType } from "@plane/types";import { PriorityDropdown, MemberDropdown, StateDropdown } from "@/components/dropdowns";// hooksimport { useIssueDetail } from "@/hooks/store";@@ -14,14 +15,15 @@ type Props = {issueId: string;disabled: boolean;issueOperations: TRelationIssueOperations;+ issueServiceType?: TIssueServiceType;};export const RelationIssueProperty: FC<Props> = observer((props) => {- const { workspaceSlug, issueId, disabled, issueOperations } = props;+ const { workspaceSlug, issueId, disabled, issueOperations, issueServiceType = EIssueServiceType.ISSUES } = props;// hooksconst {issue: { getIssueById },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);// derived valueconst issue = getIssueById(issueId);diff --git a/web/core/components/issues/sub-issues/issue-list-item.tsx b/web/core/components/issues/sub-issues/issue-list-item.tsxindex c4486c2aeb..64a5c7a02b 100644--- a/web/core/components/issues/sub-issues/issue-list-item.tsx+++ b/web/core/components/issues/sub-issues/issue-list-item.tsx@@ -3,7 +3,7 @@import React from "react";import { observer } from "mobx-react";import { ChevronRight, X, Pencil, Trash, Link as LinkIcon, Loader } from "lucide-react";-import { TIssue } from "@plane/types";+import { TIssue, TIssueServiceType } from "@plane/types";// uiimport { ControlLink, CustomMenu, Tooltip } from "@plane/ui";// helpers@@ -36,6 +36,7 @@ export interface ISubIssues {) => void;subIssueOperations: TSubIssueOperations;issueId: string;+ issueServiceType?: TIssueServiceType;}export const IssueListItem: React.FC<ISubIssues> = observer((props) => {diff --git a/web/core/components/issues/sub-issues/issues-list.tsx b/web/core/components/issues/sub-issues/issues-list.tsxindex 2178f086fd..2ac8f7394d 100644--- a/web/core/components/issues/sub-issues/issues-list.tsx+++ b/web/core/components/issues/sub-issues/issues-list.tsx@@ -1,6 +1,7 @@import { FC, Fragment } from "react";import { observer } from "mobx-react";-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";// hooksimport { useIssueDetail } from "@/hooks/store";// components@@ -21,6 +22,7 @@ export interface IIssueList {issue?: TIssue | null) => void;subIssueOperations: TSubIssueOperations;+ issueServiceType?: TIssueServiceType;}export const IssueList: FC<IIssueList> = observer((props) => {@@ -33,11 +35,12 @@ export const IssueList: FC<IIssueList> = observer((props) => {disabled,handleIssueCrudState,subIssueOperations,+ issueServiceType = EIssueServiceType.ISSUES,} = props;// hooksconst {subIssues: { subIssuesByIssueId },- } = useIssueDetail();+ } = useIssueDetail(issueServiceType);const subIssueIds = subIssuesByIssueId(parentIssueId);diff --git a/web/core/components/issues/sub-issues/properties.tsx b/web/core/components/issues/sub-issues/properties.tsxindex 948f97721e..c4ea3bbd2d 100644--- a/web/core/components/issues/sub-issues/properties.tsx+++ b/web/core/components/issues/sub-issues/properties.tsx@@ -1,4 +1,5 @@import React from "react";+import { TIssueServiceType } from "@plane/types";// hooksimport { PriorityDropdown, MemberDropdown, StateDropdown } from "@/components/dropdowns";import { useIssueDetail } from "@/hooks/store";@@ -12,6 +13,7 @@ export interface IIssueProperty {issueId: string;disabled: boolean;subIssueOperations: TSubIssueOperations;+ issueServiceType?: TIssueServiceType;}export const IssueProperty: React.FC<IIssueProperty> = (props) => {diff --git a/web/core/constants/empty-state.ts b/web/core/constants/empty-state.tsindex b2477eead8..70df416a46 100644--- a/web/core/constants/empty-state.ts+++ b/web/core/constants/empty-state.ts@@ -108,6 +108,8 @@ export enum EmptyStateType {INBOX_DETAIL_EMPTY_STATE = "inbox-detail-empty-state",WORKSPACE_DRAFT_ISSUES = "workspace-draft-issues",++ PROJECT_NO_EPICS = "project-no-epics",}const emptyStateDetails = {@@ -787,6 +789,15 @@ const emptyStateDetails = {accessType: "workspace",access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],},+ [EmptyStateType.PROJECT_NO_EPICS]: {+ key: EmptyStateType.PROJECT_NO_EPICS,+ title: "Create an epic and assign it to someone, even yourself",+ description:+ "For larger bodies of work that span several cycles and can live across modules, create an epic. Link issues and sub-issues in a project to an epic and jump into an issue from the overview.",+ path: "/empty-state/onboarding/issues",+ accessType: "project",+ access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],+ },} as const;export const EMPTY_STATE_DETAILS: Record<EmptyStateType, EmptyStateDetails> = emptyStateDetails;diff --git a/web/core/constants/issue.ts b/web/core/constants/issue.tsindex 3780567b35..c568284393 100644--- a/web/core/constants/issue.ts+++ b/web/core/constants/issue.ts@@ -34,6 +34,7 @@ export enum EIssuesStoreType {DRAFT = "DRAFT",DEFAULT = "DEFAULT",WORKSPACE_DRAFT = "WORKSPACE_DRAFT",+ EPIC = "EPIC",}export enum EIssueLayoutTypes {@@ -51,7 +52,8 @@ export type TCreateModalStoreTypes =| EIssuesStoreType.PROJECT_VIEW| EIssuesStoreType.PROFILE| EIssuesStoreType.CYCLE- | EIssuesStoreType.MODULE;+ | EIssuesStoreType.MODULE+ | EIssuesStoreType.EPIC;export enum EIssueFilterType {FILTERS = "filters",@@ -134,6 +136,10 @@ export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] ="issue_type",];+export const EPICS_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] = ISSUE_DISPLAY_PROPERTIES_KEYS.filter(+ (key) => !["cycle", "modules"].includes(key)+);+export const ISSUE_DISPLAY_PROPERTIES: {key: keyof IIssueDisplayProperties;title: string;@@ -206,9 +212,15 @@ export interface ILayoutDisplayFiltersOptions {};}-export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {- [pageType: string]: { [layoutType: string]: ILayoutDisplayFiltersOptions };-} = {+export type TFiltersByLayout = {+ [layoutType: string]: ILayoutDisplayFiltersOptions;+};++export type TIssueFiltersToDisplayByPageType = {+ [pageType: string]: TFiltersByLayout;+};++export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: TIssueFiltersToDisplayByPageType = {profile_issues: {list: {filters: ["priority", "state_group", "labels", "start_date", "target_date"],@@ -469,9 +481,78 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {},},},+ epics: {+ list: {+ filters: ["priority", "state", "assignees", "mentions", "created_by", "labels", "start_date", "target_date"],+ display_properties: EPICS_DISPLAY_PROPERTIES_KEYS,+ display_filters: {+ group_by: ["state", "priority", "labels", "assignees", "created_by", null],+ order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],+ type: [null, "active", "backlog"],+ },+ extra_options: {+ access: true,+ values: ["show_empty_groups", "sub_issue"],+ },+ },+ kanban: {+ filters: ["priority", "state", "assignees", "mentions", "created_by", "labels", "start_date", "target_date"],+ display_properties: EPICS_DISPLAY_PROPERTIES_KEYS,+ display_filters: {+ group_by: ["state", "priority", "labels", "assignees", "created_by"],+ sub_group_by: ["state", "priority", "labels", "assignees", "created_by", null],+ order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority", "target_date"],+ type: [null, "active", "backlog"],+ },+ extra_options: {+ access: true,+ values: ["show_empty_groups", "sub_issue"],+ },+ },+ calendar: {+ filters: ["priority", "state", "assignees", "mentions", "created_by", "labels", "start_date"],+ display_properties: ["key", "issue_type"],+ display_filters: {+ type: [null, "active", "backlog"],+ },+ extra_options: {+ access: true,+ values: ["sub_issue"],+ },+ },+ spreadsheet: {+ filters: ["priority", "state", "assignees", "mentions", "created_by", "labels", "start_date", "target_date"],+ display_properties: EPICS_DISPLAY_PROPERTIES_KEYS,+ display_filters: {+ order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],+ type: [null, "active", "backlog"],+ },+ extra_options: {+ access: true,+ values: ["sub_issue"],+ },+ },+ gantt_chart: {+ filters: ["priority", "state", "assignees", "mentions", "created_by", "labels", "start_date", "target_date"],+ display_properties: ["key", "issue_type"],+ display_filters: {+ order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],+ type: [null, "active", "backlog"],+ },+ extra_options: {+ access: true,+ values: ["sub_issue"],+ },+ },+ },...ADDITIONAL_ISSUE_DISPLAY_FILTERS_BY_LAYOUT,};+export const ISSUE_STORE_TO_FILTERS_MAP: Partial<Record<EIssuesStoreType, TFiltersByLayout>> = {+ [EIssuesStoreType.PROJECT]: ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues,+ [EIssuesStoreType.EPIC]: ISSUE_DISPLAY_FILTERS_BY_LAYOUT.epics,+};+export enum EIssueListRow {HEADER = "HEADER",ISSUE = "ISSUE",diff --git a/web/core/hooks/store/use-issue-detail.ts b/web/core/hooks/store/use-issue-detail.tsindex 52e18a905f..786173fd3f 100644--- a/web/core/hooks/store/use-issue-detail.ts+++ b/web/core/hooks/store/use-issue-detail.ts@@ -1,11 +1,14 @@import { useContext } from "react";+import { EIssueServiceType } from "@plane/constants";+import { TIssueServiceType } from "@plane/types";// mobx storeimport { StoreContext } from "@/lib/store-context";// typesimport { IIssueDetail } from "@/store/issue/issue-details/root.store";-export const useIssueDetail = (): IIssueDetail => {+export const useIssueDetail = (serviceType: TIssueServiceType = EIssueServiceType.ISSUES): IIssueDetail => {const context = useContext(StoreContext);- if (context === undefined) throw new Error("useInbox must be used within StoreProvider");- return context.issue.issueDetail;+ if (context === undefined) throw new Error("useIssueDetail must be used within StoreProvider");+ if (serviceType === EIssueServiceType.EPICS) return context.epic.issueDetail;+ else return context.issue.issueDetail;};diff --git a/web/core/hooks/store/use-issues.ts b/web/core/hooks/store/use-issues.tsindex 8c9bc905af..6e359dcabc 100644--- a/web/core/hooks/store/use-issues.ts+++ b/web/core/hooks/store/use-issues.ts@@ -4,6 +4,8 @@ import { TIssueMap } from "@plane/types";// mobx storeimport { EIssuesStoreType } from "@/constants/issue";import { StoreContext } from "@/lib/store-context";+// plane web types+import { IProjectEpics, IProjectEpicsFilter } from "@/plane-web/store/issue/epic";// typesimport { ITeamIssues, ITeamIssuesFilter } from "@/plane-web/store/issue/team";import { ITeamViewIssues, ITeamViewIssuesFilter } from "@/plane-web/store/issue/team-views";@@ -71,6 +73,10 @@ export type TStoreIssues = {issues: IProjectIssues;issuesFilter: IProjectIssuesFilter;};+ [EIssuesStoreType.EPIC]: defaultIssueStore & {+ issues: IProjectEpics;+ issuesFilter: IProjectEpicsFilter;+ };};export const useIssues = <T extends EIssuesStoreType>(storeType?: T): TStoreIssues[T] => {@@ -137,6 +143,11 @@ export const useIssues = <T extends EIssuesStoreType>(storeType?: T): TStoreIssuissues: context.issue.draftIssues,issuesFilter: context.issue.draftIssuesFilter,}) as TStoreIssues[T];+ case EIssuesStoreType.EPIC:+ return merge(defaultStore, {+ issues: context.issue.projectEpics,+ issuesFilter: context.issue.projectEpicsFilter,+ }) as TStoreIssues[T];default:return merge(defaultStore, {issues: context.issue.projectIssues,diff --git a/web/core/hooks/use-group-dragndrop.ts b/web/core/hooks/use-group-dragndrop.tsindex bef3bd1f11..3e5bff3e36 100644--- a/web/core/hooks/use-group-dragndrop.ts+++ b/web/core/hooks/use-group-dragndrop.ts@@ -19,7 +19,8 @@ type DNDStoreType =| EIssuesStoreType.ARCHIVED| EIssuesStoreType.WORKSPACE_DRAFT| EIssuesStoreType.TEAM- | EIssuesStoreType.TEAM_VIEW;+ | EIssuesStoreType.TEAM_VIEW+ | EIssuesStoreType.EPIC;export const useGroupIssuesDragNDrop = (storeType: DNDStoreType,diff --git a/web/core/hooks/use-issue-layout-store.ts b/web/core/hooks/use-issue-layout-store.tsindex 122e97fe53..aab69402f0 100644--- a/web/core/hooks/use-issue-layout-store.ts+++ b/web/core/hooks/use-issue-layout-store.ts@@ -7,8 +7,7 @@ export const IssuesStoreContext = createContext<EIssuesStoreType | undefined>(unexport const useIssueStoreType = () => {const storeType = useContext(IssuesStoreContext);-- const { globalViewId, viewId, projectId, cycleId, moduleId, userId, teamId } = useParams();+ const { globalViewId, viewId, projectId, cycleId, moduleId, userId, epicId, teamId } = useParams();// If store type exists in context, use that store typeif (storeType) return storeType;@@ -24,6 +23,8 @@ export const useIssueStoreType = () => {if (moduleId) return EIssuesStoreType.MODULE;+ if (epicId) return EIssuesStoreType.EPIC;+if (projectId) return EIssuesStoreType.PROJECT;if (teamId) return EIssuesStoreType.TEAM;diff --git a/web/core/hooks/use-issue-peek-overview-redirection.tsx b/web/core/hooks/use-issue-peek-overview-redirection.tsxindex 1433e6ffb9..f1ad94c596 100644--- a/web/core/hooks/use-issue-peek-overview-redirection.tsx+++ b/web/core/hooks/use-issue-peek-overview-redirection.tsx@@ -1,14 +1,18 @@import { useRouter } from "next/navigation";+// constants+import { EIssueServiceType } from "@plane/constants";// typesimport { TIssue } from "@plane/types";// hooksimport { useIssueDetail } from "./store";-const useIssuePeekOverviewRedirection = () => {+const useIssuePeekOverviewRedirection = (isEpic: boolean = false) => {// routerconst router = useRouter();// store hooks- const { getIsIssuePeeked, setPeekIssue } = useIssueDetail();+ const { getIsIssuePeeked, setPeekIssue } = useIssueDetail(+ isEpic ? EIssueServiceType.EPICS : EIssueServiceType.ISSUES+ );const handleRedirection = (workspaceSlug: string | undefined,@@ -20,7 +24,7 @@ const useIssuePeekOverviewRedirection = () => {const { project_id, id, archived_at, tempId } = issue;if (workspaceSlug && project_id && id && !getIsIssuePeeked(id) && !tempId) {- const issuePath = `/${workspaceSlug}/projects/${project_id}/${archived_at ? "archives/" : ""}issues/${id}`;+ const issuePath = `/${workspaceSlug}/projects/${project_id}/${archived_at ? "archives/" : ""}${isEpic ? "epics" : "issues"}/${id}`;if (isMobile) {router.push(issuePath);diff --git a/web/core/hooks/use-issues-actions.tsx b/web/core/hooks/use-issues-actions.tsxindex a0778a47d1..2315b43850 100644--- a/web/core/hooks/use-issues-actions.tsx+++ b/web/core/hooks/use-issues-actions.tsx@@ -41,6 +41,7 @@ export interface IssueActions {export const useIssuesActions = (storeType: EIssuesStoreType): IssueActions => {const teamIssueActions = useTeamIssueActions();const projectIssueActions = useProjectIssueActions();+ const projectEpicsActions = useProjectEpicsActions();const cycleIssueActions = useCycleIssueActions();const moduleIssueActions = useModuleIssueActions();const teamViewIssueActions = useTeamViewIssueActions();@@ -73,6 +74,8 @@ export const useIssuesActions = (storeType: EIssuesStoreType): IssueActions => {case EIssuesStoreType.WORKSPACE_DRAFT://@ts-expect-error type mismatchreturn workspaceDraftIssueActions;+ case EIssuesStoreType.EPIC:+ return projectEpicsActions;case EIssuesStoreType.PROJECT:default:return projectIssueActions;@@ -165,6 +168,92 @@ const useProjectIssueActions = () => {);};+const useProjectEpicsActions = () => {+ // router+ const { workspaceSlug: routerWorkspaceSlug, projectId: routerProjectId } = useParams();+ const workspaceSlug = routerWorkspaceSlug?.toString();+ const projectId = routerProjectId?.toString();+ // store hooks+ const { issues, issuesFilter } = useIssues(EIssuesStoreType.EPIC);++ const fetchIssues = useCallback(+ async (loadType: TLoader, options: IssuePaginationOptions) => {+ if (!workspaceSlug || !projectId) return;+ return issues.fetchIssues(workspaceSlug.toString(), projectId.toString(), loadType, options);+ },+ [issues.fetchIssues, workspaceSlug, projectId]+ );+ const fetchNextIssues = useCallback(+ async (groupId?: string, subGroupId?: string) => {+ if (!workspaceSlug || !projectId) return;+ return issues.fetchNextIssues(workspaceSlug.toString(), projectId.toString(), groupId, subGroupId);+ },+ [issues.fetchIssues, workspaceSlug, projectId]+ );++ const createIssue = useCallback(+ async (projectId: string | undefined | null, data: Partial<TIssue>) => {+ if (!workspaceSlug || !projectId) return;+ return await issues.createIssue(workspaceSlug, projectId, data);+ },+ [issues.createIssue, workspaceSlug]+ );+ const quickAddIssue = useCallback(+ async (projectId: string | undefined | null, data: TIssue) => {+ if (!workspaceSlug || !projectId) return;+ return await issues.quickAddIssue(workspaceSlug, projectId, data);+ },+ [issues.quickAddIssue, workspaceSlug]+ );+ const updateIssue = useCallback(+ async (projectId: string | undefined | null, issueId: string, data: Partial<TIssue>) => {+ if (!workspaceSlug || !projectId) return;+ return await issues.updateIssue(workspaceSlug, projectId, issueId, data);+ },+ [issues.updateIssue, workspaceSlug]+ );+ const removeIssue = useCallback(+ async (projectId: string | undefined | null, issueId: string) => {+ if (!workspaceSlug || !projectId) return;+ return await issues.removeIssue(workspaceSlug, projectId, issueId);+ },+ [issues.removeIssue, workspaceSlug]+ );+ const archiveIssue = useCallback(+ async (projectId: string | undefined | null, issueId: string) => {+ if (!workspaceSlug || !projectId) return;+ return await issues.archiveIssue(workspaceSlug, projectId, issueId);+ },+ [issues.archiveIssue, workspaceSlug]+ );++ const updateFilters = useCallback(+ async (+ projectId: string,+ filterType: EIssueFilterType,+ filters: IIssueFilterOptions | IIssueDisplayFilterOptions | IIssueDisplayProperties | TIssueKanbanFilters+ ) => {+ if (!workspaceSlug) return;+ return await issuesFilter.updateFilters(workspaceSlug, projectId, filterType, filters);+ },+ [issuesFilter.updateFilters, workspaceSlug]+ );++ return useMemo(+ () => ({+ fetchIssues,+ fetchNextIssues,+ createIssue,+ quickAddIssue,+ updateIssue,+ removeIssue,+ archiveIssue,+ updateFilters,+ }),+ [fetchIssues, fetchNextIssues, createIssue, quickAddIssue, updateIssue, removeIssue, archiveIssue, updateFilters]+ );+};+const useCycleIssueActions = () => {// routerconst { workspaceSlug: routerWorkspaceSlug, projectId: routerProjectId, cycleId: routerCycleId } = useParams();diff --git a/web/core/services/issue/issue.service.ts b/web/core/services/issue/issue.service.tsindex d74ce0c88f..f140eb49f0 100644--- a/web/core/services/issue/issue.service.ts+++ b/web/core/services/issue/issue.service.ts@@ -1,12 +1,14 @@+import { EIssueServiceType } from "@plane/constants";// types-import type {- IIssueDisplayProperties,- TBulkOperationsPayload,- TIssue,- TIssueActivity,- TIssueLink,- TIssuesResponse,- TIssueSubIssues,+import {+ type IIssueDisplayProperties,+ type TBulkOperationsPayload,+ type TIssue,+ type TIssueActivity,+ type TIssueLink,+ type TIssueServiceType,+ type TIssuesResponse,+ type TIssueSubIssues,} from "@plane/types";// helpersimport { API_BASE_URL } from "@/helpers/common.helper";@@ -18,12 +20,15 @@ import { addIssuesBulk, deleteIssueFromLocal, updateIssue } from "@/local-db/utiimport { APIService } from "@/services/api.service";export class IssueService extends APIService {- constructor() {+ private serviceType: TIssueServiceType;++ constructor(serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {super(API_BASE_URL);+ this.serviceType = serviceType;}async createIssue(workspaceSlug: string, projectId: string, data: Partial<TIssue>): Promise<TIssue> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/`, data)+ return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/`, data).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -39,7 +44,7 @@ export class IssueService extends APIService {const path =(queries.expand as string)?.includes("issue_relation") && !queries.group_by? `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues-detail/`- : `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/`;+ : `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/`;return this.get(path,{@@ -59,7 +64,11 @@ export class IssueService extends APIService {queries?: any,config = {}): Promise<TIssuesResponse> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/v2/issues/`, { params: queries }, config)+ return this.get(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/v2/${this.serviceType}/`,+ { params: queries },+ config+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -89,7 +98,7 @@ export class IssueService extends APIService {projectId: string,queries?: any): Promise<TIssue[] | { [key: string]: TIssue[] }> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/`, {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/`, {params: queries,}).then((response) => response?.data)@@ -99,7 +108,7 @@ export class IssueService extends APIService {}async retrieve(workspaceSlug: string, projectId: string, issueId: string, queries?: any): Promise<TIssue> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/`, {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/`, {params: queries,}).then((response) => {@@ -114,7 +123,7 @@ export class IssueService extends APIService {}async retrieveIssues(workspaceSlug: string, projectId: string, issueIds: string[]): Promise<TIssue[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/list/`, {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/list/`, {params: { issues: issueIds.join(",") },}).then((response) => {@@ -129,7 +138,7 @@ export class IssueService extends APIService {}async getIssueActivities(workspaceSlug: string, projectId: string, issueId: string): Promise<TIssueActivity[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/history/`)+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/history/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -173,7 +182,10 @@ export class IssueService extends APIService {relation?: "blocking" | null;}) {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/issue-relation/`, data)+ return this.post(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/issue-relation/`,+ data+ ).then((response) => response?.data).catch((error) => {throw error?.response;@@ -182,7 +194,7 @@ export class IssueService extends APIService {async deleteIssueRelation(workspaceSlug: string, projectId: string, issueId: string, relationId: string) {return this.delete(- `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/issue-relation/${relationId}/`+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/issue-relation/${relationId}/`).then((response) => response?.data).catch((error) => {@@ -213,7 +225,7 @@ export class IssueService extends APIService {}async patchIssue(workspaceSlug: string, projectId: string, issueId: string, data: Partial<TIssue>): Promise<any> {- return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/`, data)+ return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/`, data).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -222,7 +234,7 @@ export class IssueService extends APIService {async deleteIssue(workspaceSlug: string, projectId: string, issuesId: string): Promise<any> {deleteIssueFromLocal(issuesId);- return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issuesId}/`)+ return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issuesId}/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -242,7 +254,9 @@ export class IssueService extends APIService {}async subIssues(workspaceSlug: string, projectId: string, issueId: string): Promise<TIssueSubIssues> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/sub-issues/`)+ return this.get(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/${this.serviceType === EIssueServiceType.EPICS ? "issues" : "sub-issues"}/`+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -255,7 +269,10 @@ export class IssueService extends APIService {issueId: string,data: { sub_issue_ids: string[] }): Promise<TIssueSubIssues> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/sub-issues/`, data)+ return this.post(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/${this.serviceType === EIssueServiceType.EPICS ? "issues" : "sub-issues"}/`,+ data+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -263,7 +280,9 @@ export class IssueService extends APIService {}async fetchIssueLinks(workspaceSlug: string, projectId: string, issueId: string): Promise<TIssueLink[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/issue-links/`)+ return this.get(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/${this.serviceType === EIssueServiceType.EPICS ? "links" : "issue-links"}/`+ ).then((response) => response?.data).catch((error) => {throw error?.response;@@ -276,7 +295,10 @@ export class IssueService extends APIService {issueId: string,data: Partial<TIssueLink>): Promise<TIssueLink> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/issue-links/`, data)+ return this.post(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/${this.serviceType === EIssueServiceType.EPICS ? "links" : "issue-links"}/`,+ data+ ).then((response) => response?.data).catch((error) => {throw error?.response;@@ -291,7 +313,7 @@ export class IssueService extends APIService {data: Partial<TIssueLink>): Promise<TIssueLink> {return this.patch(- `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/issue-links/${linkId}/`,+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/${this.serviceType === EIssueServiceType.EPICS ? "links" : "issue-links"}/${linkId}/`,data).then((response) => response?.data)@@ -302,7 +324,7 @@ export class IssueService extends APIService {async deleteIssueLink(workspaceSlug: string, projectId: string, issueId: string, linkId: string): Promise<any> {return this.delete(- `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/issue-links/${linkId}/`+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/${this.serviceType === EIssueServiceType.EPICS ? "links" : "issue-links"}/${linkId}/`).then((response) => response?.data).catch((error) => {@@ -365,7 +387,7 @@ export class IssueService extends APIService {): Promise<{subscribed: boolean;}> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/subscribe/`)+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/subscribe/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -373,7 +395,9 @@ export class IssueService extends APIService {}async unsubscribeFromIssueNotifications(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/subscribe/`)+ return this.delete(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/subscribe/`+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -381,7 +405,7 @@ export class IssueService extends APIService {}async subscribeToIssueNotifications(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/subscribe/`)+ return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/subscribe/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;diff --git a/web/core/services/issue/issue_activity.service.ts b/web/core/services/issue/issue_activity.service.tsindex b99d07d889..103cf6e217 100644--- a/web/core/services/issue/issue_activity.service.ts+++ b/web/core/services/issue/issue_activity.service.ts@@ -1,12 +1,16 @@-import { TIssueActivity } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssueActivity, TIssueServiceType } from "@plane/types";import { API_BASE_URL } from "@/helpers/common.helper";import { APIService } from "@/services/api.service";// types// helperexport class IssueActivityService extends APIService {- constructor() {+ private serviceType: TIssueServiceType;++ constructor(serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {super(API_BASE_URL);+ this.serviceType = serviceType;}async getIssueActivities(@@ -19,9 +23,9 @@ export class IssueActivityService extends APIService {}| object = {}): Promise<TIssueActivity[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/history/`, {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/history/`, {params: {- activity_type: "issue-property",+ activity_type: `${this.serviceType === EIssueServiceType.EPICS ? "epic-property" : "issue-property"}`,...params,},})diff --git a/web/core/services/issue/issue_archive.service.ts b/web/core/services/issue/issue_archive.service.tsindex 9012fce5b8..b86886ca93 100644--- a/web/core/services/issue/issue_archive.service.ts+++ b/web/core/services/issue/issue_archive.service.ts@@ -1,12 +1,16 @@-import { TIssue } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { TIssue, TIssueServiceType } from "@plane/types";import { API_BASE_URL } from "@/helpers/common.helper";import { APIService } from "@/services/api.service";// types// constantsexport class IssueArchiveService extends APIService {- constructor() {+ private serviceType: TIssueServiceType;++ constructor(serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {super(API_BASE_URL);+ this.serviceType = serviceType;}async getArchivedIssues(workspaceSlug: string, projectId: string, queries?: any, config = {}): Promise<any> {@@ -30,7 +34,7 @@ export class IssueArchiveService extends APIService {): Promise<{archived_at: string;}> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/archive/`)+ return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/archive/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -38,7 +42,7 @@ export class IssueArchiveService extends APIService {}async restoreIssue(workspaceSlug: string, projectId: string, issueId: string): Promise<any> {- return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/archive/`)+ return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/archive/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -51,7 +55,7 @@ export class IssueArchiveService extends APIService {issueId: string,queries?: any): Promise<TIssue> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/archive/`, {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/archive/`, {params: queries,}).then((response) => response?.data)diff --git a/web/core/services/issue/issue_attachment.service.ts b/web/core/services/issue/issue_attachment.service.tsindex b550217cf2..322e8c2c68 100644--- a/web/core/services/issue/issue_attachment.service.ts+++ b/web/core/services/issue/issue_attachment.service.ts@@ -1,6 +1,7 @@import { AxiosRequestConfig } from "axios";+import { EIssueServiceType } from "@plane/constants";// plane types-import { TIssueAttachment, TIssueAttachmentUploadResponse } from "@plane/types";+import { TIssueAttachment, TIssueAttachmentUploadResponse, TIssueServiceType } from "@plane/types";// helpersimport { API_BASE_URL } from "@/helpers/common.helper";import { generateFileUploadPayload, getFileMetaDataForUpload } from "@/helpers/file.helper";@@ -10,11 +11,13 @@ import { FileUploadService } from "@/services/file-upload.service";export class IssueAttachmentService extends APIService {private fileUploadService: FileUploadService;+ private serviceType: TIssueServiceType;- constructor() {+ constructor(serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {super(API_BASE_URL);// upload servicethis.fileUploadService = new FileUploadService();+ this.serviceType = serviceType;}private async updateIssueAttachmentUploadStatus(@@ -24,7 +27,7 @@ export class IssueAttachmentService extends APIService {attachmentId: string): Promise<void> {return this.patch(- `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/attachments/${attachmentId}/`+ `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/attachments/${attachmentId}/`).then((response) => response?.data).catch((error) => {@@ -41,7 +44,7 @@ export class IssueAttachmentService extends APIService {): Promise<TIssueAttachment> {const fileMetaData = getFileMetaDataForUpload(file);return this.post(- `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/attachments/`,+ `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/attachments/`,fileMetaData).then(async (response) => {@@ -61,7 +64,9 @@ export class IssueAttachmentService extends APIService {}async getIssueAttachments(workspaceSlug: string, projectId: string, issueId: string): Promise<TIssueAttachment[]> {- return this.get(`/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/attachments/`)+ return this.get(+ `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/attachments/`+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -75,7 +80,7 @@ export class IssueAttachmentService extends APIService {assetId: string): Promise<TIssueAttachment> {return this.delete(- `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/attachments/${assetId}/`+ `/api/assets/v2/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/attachments/${assetId}/`).then((response) => response?.data).catch((error) => {diff --git a/web/core/services/issue/issue_comment.service.ts b/web/core/services/issue/issue_comment.service.tsindex b0c9821a36..ccfce8a86c 100644--- a/web/core/services/issue/issue_comment.service.ts+++ b/web/core/services/issue/issue_comment.service.ts@@ -1,5 +1,6 @@+import { EIssueServiceType } from "@plane/constants";// plane types-import { TFileSignedURLResponse, TIssueComment } from "@plane/types";+import { TFileSignedURLResponse, TIssueComment, TIssueServiceType } from "@plane/types";// helpersimport { API_BASE_URL } from "@/helpers/common.helper";import { generateFileUploadPayload, getFileMetaDataForUpload } from "@/helpers/file.helper";@@ -9,11 +10,13 @@ import { FileUploadService } from "@/services/file-upload.service";export class IssueCommentService extends APIService {private fileUploadService: FileUploadService;+ private serviceType: TIssueServiceType;- constructor() {+ constructor(serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {super(API_BASE_URL);// upload servicethis.fileUploadService = new FileUploadService();+ this.serviceType = serviceType;}async getIssueComments(@@ -26,9 +29,9 @@ export class IssueCommentService extends APIService {}| object = {}): Promise<TIssueComment[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/history/`, {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/history/`, {params: {- activity_type: "issue-comment",+ activity_type: `${this.serviceType === EIssueServiceType.EPICS ? "epic-comment" : "issue-comment"}`,...params,},})@@ -44,7 +47,10 @@ export class IssueCommentService extends APIService {issueId: string,data: Partial<TIssueComment>): Promise<TIssueComment> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/comments/`, data)+ return this.post(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/comments/`,+ data+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -59,7 +65,7 @@ export class IssueCommentService extends APIService {data: Partial<TIssueComment>): Promise<void> {return this.patch(- `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/comments/${commentId}/`,+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/comments/${commentId}/`,data).then((response) => response?.data)@@ -75,7 +81,7 @@ export class IssueCommentService extends APIService {commentId: string): Promise<void> {return this.delete(- `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/comments/${commentId}/`+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/comments/${commentId}/`).then((response) => response?.data).catch((error) => {diff --git a/web/core/services/issue/issue_reaction.service.ts b/web/core/services/issue/issue_reaction.service.tsindex 9e2d355e12..39fc8406ac 100644--- a/web/core/services/issue/issue_reaction.service.ts+++ b/web/core/services/issue/issue_reaction.service.ts@@ -1,12 +1,16 @@-import type { TIssueCommentReaction, TIssueReaction } from "@plane/types";+import { EIssueServiceType } from "@plane/constants";+import { type TIssueCommentReaction, type TIssueReaction, type TIssueServiceType } from "@plane/types";import { API_BASE_URL } from "@/helpers/common.helper";// servicesimport { APIService } from "@/services/api.service";// typesexport class IssueReactionService extends APIService {- constructor() {+ private serviceType: TIssueServiceType;++ constructor(serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {super(API_BASE_URL);+ this.serviceType = serviceType;}async createIssueReaction(@@ -15,7 +19,10 @@ export class IssueReactionService extends APIService {issueId: string,data: Partial<TIssueReaction>): Promise<any> {- return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/reactions/`, data)+ return this.post(+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/reactions/`,+ data+ ).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -23,7 +30,7 @@ export class IssueReactionService extends APIService {}async listIssueReactions(workspaceSlug: string, projectId: string, issueId: string): Promise<TIssueReaction[]> {- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/reactions/`)+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/reactions/`).then((response) => response?.data).catch((error) => {throw error?.response?.data;@@ -32,7 +39,7 @@ export class IssueReactionService extends APIService {async deleteIssueReaction(workspaceSlug: string, projectId: string, issueId: string, reaction: string): Promise<any> {return this.delete(- `/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/reactions/${reaction}/`+ `/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/reactions/${reaction}/`).then((response) => response?.data).catch((error) => {diff --git a/web/core/services/issue_filter.service.ts b/web/core/services/issue_filter.service.tsindex d051c685cd..3e288bb1a8 100644--- a/web/core/services/issue_filter.service.ts+++ b/web/core/services/issue_filter.service.ts@@ -48,6 +48,26 @@ export class IssueFiltersService extends APIService {});}+ // epic issue filters+ async fetchProjectEpicFilters(workspaceSlug: string, projectId: string): Promise<IIssueFiltersResponse> {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/epics-user-properties/`)+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response?.data;+ });+ }+ async patchProjectEpicFilters(+ workspaceSlug: string,+ projectId: string,+ data: Partial<IIssueFiltersResponse>+ ): Promise<any> {+ return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/epics-user-properties/`, data)+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response?.data;+ });+ }+// cycle issue filtersasync fetchCycleIssueFilters(workspaceSlug: string,diff --git a/web/core/services/project/project.service.ts b/web/core/services/project/project.service.tsindex dcc9d11b52..f9c2af8b66 100644--- a/web/core/services/project/project.service.ts+++ b/web/core/services/project/project.service.ts@@ -1,8 +1,4 @@-import type {- GithubRepositoriesResponse,- ISearchIssueResponse,- TProjectIssuesSearchParams,-} from "@plane/types";+import type { GithubRepositoriesResponse, ISearchIssueResponse, TProjectIssuesSearchParams } from "@plane/types";// helpersimport { API_BASE_URL } from "@/helpers/common.helper";// plane web types@@ -67,6 +63,14 @@ export class ProjectService extends APIService {});}+ async fetchProjectEpicProperties(workspaceSlug: string, projectId: string): Promise<any> {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/epic-properties/`)+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response?.data;+ });+ }+async setProjectView(workspaceSlug: string,projectId: string,diff --git a/web/core/store/issue/issue-details/attachment.store.ts b/web/core/store/issue/issue-details/attachment.store.tsindex ef2a356fcf..f9e47a5605 100644--- a/web/core/store/issue/issue-details/attachment.store.ts+++ b/web/core/store/issue/issue-details/attachment.store.ts@@ -8,7 +8,7 @@ import { action, computed, makeObservable, observable, runInAction } from "mobx"import { computedFn } from "mobx-utils";import { v4 as uuidv4 } from "uuid";// types-import { TIssueAttachment, TIssueAttachmentMap, TIssueAttachmentIdMap } from "@plane/types";+import { TIssueAttachment, TIssueAttachmentMap, TIssueAttachmentIdMap, TIssueServiceType } from "@plane/types";// servicesimport { IssueAttachmentService } from "@/services/issue";import { IIssueRootStore } from "../root.store";@@ -64,7 +64,7 @@ export class IssueAttachmentStore implements IIssueAttachmentStore {// servicesissueAttachmentService;- constructor(rootStore: IIssueRootStore) {+ constructor(rootStore: IIssueRootStore, serviceType: TIssueServiceType) {makeObservable(this, {// observablesattachments: observable,@@ -82,7 +82,7 @@ export class IssueAttachmentStore implements IIssueAttachmentStore {this.rootIssueStore = rootStore;this.rootIssueDetailStore = rootStore.issueDetail;// services- this.issueAttachmentService = new IssueAttachmentService();+ this.issueAttachmentService = new IssueAttachmentService(serviceType);}// computeddiff --git a/web/core/store/issue/issue-details/comment.store.ts b/web/core/store/issue/issue-details/comment.store.tsindex 211a71f48e..b0fba6d3c0 100644--- a/web/core/store/issue/issue-details/comment.store.ts+++ b/web/core/store/issue/issue-details/comment.store.ts@@ -5,7 +5,7 @@ import uniq from "lodash/uniq";import update from "lodash/update";import { action, makeObservable, observable, runInAction } from "mobx";// services-import { TIssueComment, TIssueCommentMap, TIssueCommentIdMap } from "@plane/types";+import { TIssueComment, TIssueCommentMap, TIssueCommentIdMap, TIssueServiceType } from "@plane/types";import { IssueCommentService } from "@/services/issue";// typesimport { IIssueDetail } from "./root.store";@@ -50,12 +50,13 @@ export class IssueCommentStore implements IIssueCommentStore {loader: TCommentLoader = "fetch";comments: TIssueCommentIdMap = {};commentMap: TIssueCommentMap = {};+ serviceType;// root storerootIssueDetail: IIssueDetail;// servicesissueCommentService;- constructor(rootStore: IIssueDetail) {+ constructor(rootStore: IIssueDetail, serviceType: TIssueServiceType) {makeObservable(this, {// observablesloader: observable.ref,@@ -68,9 +69,10 @@ export class IssueCommentStore implements IIssueCommentStore {removeComment: action,});// root store+ this.serviceType = serviceType;this.rootIssueDetail = rootStore;// services- this.issueCommentService = new IssueCommentService();+ this.issueCommentService = new IssueCommentService(serviceType);}// helper methodsdiff --git a/web/core/store/issue/issue-details/issue.store.ts b/web/core/store/issue/issue-details/issue.store.tsindex a7c439beed..3fe1898420 100644--- a/web/core/store/issue/issue-details/issue.store.ts+++ b/web/core/store/issue/issue-details/issue.store.ts@@ -1,7 +1,8 @@import { makeObservable, observable } from "mobx";import { computedFn } from "mobx-utils";+import { EIssueServiceType } from "@plane/constants";// types-import { TIssue } from "@plane/types";+import { TIssue, TIssueServiceType } from "@plane/types";// localimport { persistence } from "@/local-db/storage.sqlite";// services@@ -46,11 +47,12 @@ export class IssueStore implements IIssueStore {// root storerootIssueDetailStore: IIssueDetail;// services+ serviceType;issueService;issueArchiveService;issueDraftService;- constructor(rootStore: IIssueDetail) {+ constructor(rootStore: IIssueDetail, serviceType: TIssueServiceType) {makeObservable(this, {fetchingIssueDetails: observable.ref,localDBIssueDescription: observable.ref,@@ -58,8 +60,9 @@ export class IssueStore implements IIssueStore {// root storethis.rootIssueDetailStore = rootStore;// services- this.issueService = new IssueService();- this.issueArchiveService = new IssueArchiveService();+ this.serviceType = serviceType;+ this.issueService = new IssueService(serviceType);+ this.issueArchiveService = new IssueArchiveService(serviceType);this.issueDraftService = new IssueDraftService();}@@ -190,15 +193,32 @@ export class IssueStore implements IIssueStore {};updateIssue = async (workspaceSlug: string, projectId: string, issueId: string, data: Partial<TIssue>) => {- await this.rootIssueDetailStore.rootIssueStore.projectIssues.updateIssue(workspaceSlug, projectId, issueId, data);- await this.rootIssueDetailStore.activity.fetchActivities(workspaceSlug, projectId, issueId);+ const currentStore =+ this.serviceType === EIssueServiceType.EPICS+ ? this.rootIssueDetailStore.rootIssueStore.projectEpics+ : this.rootIssueDetailStore.rootIssueStore.projectIssues;++ await Promise.all([+ currentStore.updateIssue(workspaceSlug, projectId, issueId, data),+ this.rootIssueDetailStore.activity.fetchActivities(workspaceSlug, projectId, issueId),+ ]);};- removeIssue = async (workspaceSlug: string, projectId: string, issueId: string) =>- this.rootIssueDetailStore.rootIssueStore.projectIssues.removeIssue(workspaceSlug, projectId, issueId);+ removeIssue = async (workspaceSlug: string, projectId: string, issueId: string) => {+ const currentStore =+ this.serviceType === EIssueServiceType.EPICS+ ? this.rootIssueDetailStore.rootIssueStore.projectEpics+ : this.rootIssueDetailStore.rootIssueStore.projectIssues;+ currentStore.removeIssue(workspaceSlug, projectId, issueId);+ };- archiveIssue = async (workspaceSlug: string, projectId: string, issueId: string) =>- this.rootIssueDetailStore.rootIssueStore.projectIssues.archiveIssue(workspaceSlug, projectId, issueId);+ archiveIssue = async (workspaceSlug: string, projectId: string, issueId: string) => {+ const currentStore =+ this.serviceType === EIssueServiceType.EPICS+ ? this.rootIssueDetailStore.rootIssueStore.projectEpics+ : this.rootIssueDetailStore.rootIssueStore.projectIssues;+ currentStore.archiveIssue(workspaceSlug, projectId, issueId);+ };addCycleToIssue = async (workspaceSlug: string, projectId: string, cycleId: string, issueId: string) => {await this.rootIssueDetailStore.rootIssueStore.cycleIssues.addCycleToIssue(diff --git a/web/core/store/issue/issue-details/link.store.ts b/web/core/store/issue/issue-details/link.store.tsindex de33706a00..85c6fa5b83 100644--- a/web/core/store/issue/issue-details/link.store.ts+++ b/web/core/store/issue/issue-details/link.store.ts@@ -1,7 +1,7 @@import set from "lodash/set";import { action, computed, makeObservable, observable, runInAction } from "mobx";// services-import { TIssueLink, TIssueLinkMap, TIssueLinkIdMap } from "@plane/types";+import { TIssueLink, TIssueLinkMap, TIssueLinkIdMap, TIssueServiceType } from "@plane/types";import { IssueService } from "@/services/issue";// typesimport { IIssueDetail } from "./root.store";@@ -44,8 +44,9 @@ export class IssueLinkStore implements IIssueLinkStore {rootIssueDetailStore: IIssueDetail;// servicesissueService;+ serviceType;- constructor(rootStore: IIssueDetail) {+ constructor(rootStore: IIssueDetail, serviceType: TIssueServiceType) {makeObservable(this, {// observableslinks: observable,@@ -59,10 +60,11 @@ export class IssueLinkStore implements IIssueLinkStore {updateLink: action,removeLink: action,});+ this.serviceType = serviceType;// root storethis.rootIssueDetailStore = rootStore;// services- this.issueService = new IssueService();+ this.issueService = new IssueService(serviceType);}// computeddiff --git a/web/core/store/issue/issue-details/reaction.store.ts b/web/core/store/issue/issue-details/reaction.store.tsindex f3ae77fa3f..5fd0e22452 100644--- a/web/core/store/issue/issue-details/reaction.store.ts+++ b/web/core/store/issue/issue-details/reaction.store.ts@@ -7,7 +7,7 @@ import { action, makeObservable, observable, runInAction } from "mobx";// services// types// helpers-import { TIssueReaction, TIssueReactionMap, TIssueReactionIdMap } from "@plane/types";+import { TIssueReaction, TIssueReactionMap, TIssueReactionIdMap, TIssue, TIssueServiceType } from "@plane/types";import { groupReactions } from "@/helpers/emoji.helper";import { IssueReactionService } from "@/services/issue";import { IIssueDetail } from "./root.store";@@ -44,8 +44,9 @@ export class IssueReactionStore implements IIssueReactionStore {rootIssueDetailStore: IIssueDetail;// servicesissueReactionService;+ serviceType;- constructor(rootStore: IIssueDetail) {+ constructor(rootStore: IIssueDetail, serviceType: TIssueServiceType) {makeObservable(this, {// observablesreactions: observable,@@ -56,10 +57,11 @@ export class IssueReactionStore implements IIssueReactionStore {createReaction: action,removeReaction: action,});+ this.serviceType = serviceType;// root storethis.rootIssueDetailStore = rootStore;// services- this.issueReactionService = new IssueReactionService();+ this.issueReactionService = new IssueReactionService(serviceType);}// helper methodsdiff --git a/web/core/store/issue/issue-details/root.store.ts b/web/core/store/issue/issue-details/root.store.tsindex e6e0ca8d0b..c72ef1a77d 100644--- a/web/core/store/issue/issue-details/root.store.ts+++ b/web/core/store/issue/issue-details/root.store.ts@@ -8,6 +8,7 @@ import {TIssueLink,TIssueReaction,TIssueDetailWidget,+ TIssueServiceType,} from "@plane/types";// plane web storeimport {@@ -140,6 +141,8 @@ export class IssueDetail implements IIssueDetail {isRelationModalOpen: TIssueRelationModal | null = null;isSubIssuesModalOpen: string | null = null;attachmentDeleteModalId: string | null = null;+ // service type+ serviceType: TIssueServiceType;// storerootIssueStore: IIssueRootStore;issue: IIssueStore;@@ -153,7 +156,7 @@ export class IssueDetail implements IIssueDetail {comment: IIssueCommentStore;commentReaction: IIssueCommentReactionStore;- constructor(rootStore: IIssueRootStore) {+ constructor(rootStore: IIssueRootStore, serviceType: TIssueServiceType) {makeObservable(this, {// observablespeekIssue: observable,@@ -191,15 +194,16 @@ export class IssueDetail implements IIssueDetail {});// store+ this.serviceType = serviceType;this.rootIssueStore = rootStore;- this.issue = new IssueStore(this);- this.reaction = new IssueReactionStore(this);- this.attachment = new IssueAttachmentStore(rootStore);- this.activity = new IssueActivityStore(rootStore.rootStore as RootStore);- this.comment = new IssueCommentStore(this);+ this.issue = new IssueStore(this, serviceType);+ this.reaction = new IssueReactionStore(this, serviceType);+ this.attachment = new IssueAttachmentStore(rootStore, serviceType);+ this.activity = new IssueActivityStore(rootStore.rootStore as RootStore, serviceType);+ this.comment = new IssueCommentStore(this, serviceType);this.commentReaction = new IssueCommentReactionStore(this);- this.subIssues = new IssueSubIssuesStore(this);- this.link = new IssueLinkStore(this);+ this.subIssues = new IssueSubIssuesStore(this, serviceType);+ this.link = new IssueLinkStore(this, serviceType);this.subscription = new IssueSubscriptionStore(this);this.relation = new IssueRelationStore(this);}diff --git a/web/core/store/issue/issue-details/sub_issues.store.ts b/web/core/store/issue/issue-details/sub_issues.store.tsindex 9d5fd25c4f..df87df67c5 100644--- a/web/core/store/issue/issue-details/sub_issues.store.ts+++ b/web/core/store/issue/issue-details/sub_issues.store.ts@@ -11,6 +11,7 @@ import {TIssueSubIssuesStateDistributionMap,TIssueSubIssuesIdMap,TSubIssuesStateDistribution,+ TIssueServiceType,} from "@plane/types";// servicesimport { updatePersistentLayer } from "@/local-db/utils/utils";@@ -65,7 +66,7 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {// servicesissueService;- constructor(rootStore: IIssueDetail) {+ constructor(rootStore: IIssueDetail, serviceType: TIssueServiceType) {makeObservable(this, {// observablessubIssuesStateDistribution: observable,@@ -83,7 +84,7 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {// root storethis.rootIssueDetailStore = rootStore;// services- this.issueService = new IssueService();+ this.issueService = new IssueService(serviceType);}// helper methodsdiff --git a/web/core/store/issue/issue.store.ts b/web/core/store/issue/issue.store.tsindex 7fcb0eef48..a6ff334b9a 100644--- a/web/core/store/issue/issue.store.ts+++ b/web/core/store/issue/issue.store.ts@@ -3,7 +3,7 @@ import update from "lodash/update";import { action, makeObservable, observable, runInAction } from "mobx";import { computedFn } from "mobx-utils";// types-import { TIssue } from "@plane/types";+import { TIssue, TIssueServiceType } from "@plane/types";// helpersimport { getCurrentDateTimeInISO } from "@/helpers/date-time.helper";// services@@ -30,7 +30,7 @@ export class IssueStore implements IIssueStore {// serviceissueService;- constructor() {+ constructor(serviceType: TIssueServiceType) {makeObservable(this, {// observableissuesMap: observable,@@ -40,7 +40,7 @@ export class IssueStore implements IIssueStore {removeIssue: action,});- this.issueService = new IssueService();+ this.issueService = new IssueService(serviceType);}// actionsdiff --git a/web/core/store/issue/root.store.ts b/web/core/store/issue/root.store.tsindex 944a32f719..002ede3ba4 100644--- a/web/core/store/issue/root.store.ts+++ b/web/core/store/issue/root.store.ts@@ -1,7 +1,10 @@import isEmpty from "lodash/isEmpty";import { autorun, makeObservable, observable } from "mobx";-import { ICycle, IIssueLabel, IModule, IProject, IState, IUserLite } from "@plane/types";+// types+import { EIssueServiceType } from "@plane/constants";+import { ICycle, IIssueLabel, IModule, IProject, IState, IUserLite, TIssueServiceType } from "@plane/types";// plane web store+import { IProjectEpics, IProjectEpicsFilter, ProjectEpics, ProjectEpicsFilter } from "@/plane-web/store/issue/epic";import { ITeamIssuesFilter, ITeamIssues, TeamIssues, TeamIssuesFilter } from "@/plane-web/store/issue/team";import {ITeamViewIssues,@@ -59,6 +62,7 @@ export interface IIssueRootStore {cycleMap: Record<string, ICycle> | undefined;rootStore: RootStore;+ serviceType: TIssueServiceType;issues: IIssueStore;@@ -99,6 +103,9 @@ export interface IIssueRootStore {issueKanBanView: IIssueKanBanViewStore;issueCalendarView: ICalendarStore;++ projectEpicsFilter: IProjectEpicsFilter;+ projectEpics: IProjectEpics;}export class IssueRootStore implements IIssueRootStore {@@ -122,6 +129,7 @@ export class IssueRootStore implements IIssueRootStore {cycleMap: Record<string, ICycle> | undefined = undefined;rootStore: RootStore;+ serviceType: TIssueServiceType;issues: IIssueStore;@@ -163,7 +171,10 @@ export class IssueRootStore implements IIssueRootStore {issueKanBanView: IIssueKanBanViewStore;issueCalendarView: ICalendarStore;- constructor(rootStore: RootStore) {+ projectEpicsFilter: IProjectEpicsFilter;+ projectEpics: IProjectEpics;++ constructor(rootStore: RootStore, serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {makeObservable(this, {workspaceSlug: observable.ref,teamId: observable.ref,@@ -184,6 +195,7 @@ export class IssueRootStore implements IIssueRootStore {cycleMap: observable,});+ this.serviceType = serviceType;this.rootStore = rootStore;autorun(() => {@@ -209,9 +221,9 @@ export class IssueRootStore implements IIssueRootStore {if (!isEmpty(rootStore?.cycle?.cycleMap)) this.cycleMap = rootStore?.cycle?.cycleMap;});- this.issues = new IssueStore();+ this.issues = new IssueStore(this.serviceType);- this.issueDetail = new IssueDetail(this);+ this.issueDetail = new IssueDetail(this, this.serviceType);this.workspaceIssuesFilter = new WorkspaceIssuesFilter(this);this.workspaceIssues = new WorkspaceIssues(this, this.workspaceIssuesFilter);@@ -248,5 +260,8 @@ export class IssueRootStore implements IIssueRootStore {this.issueKanBanView = new IssueKanBanViewStore(this);this.issueCalendarView = new CalendarStore();++ this.projectEpicsFilter = new ProjectEpicsFilter(this);+ this.projectEpics = new ProjectEpics(this, this.projectEpicsFilter);}}diff --git a/web/core/store/project/project.store.ts b/web/core/store/project/project.store.tsindex d8b5f02b7b..25e6d500da 100644--- a/web/core/store/project/project.store.ts+++ b/web/core/store/project/project.store.ts@@ -18,6 +18,9 @@ export interface IProjectStore {projectMap: {[projectId: string]: TProject; // projectId: project Info};+ projectEpicPropertiesMap: {+ [projectId: string]: any;+ };// computedfilteredProjectIds: string[] | undefined;workspaceProjectIds: string[] | undefined;@@ -29,7 +32,9 @@ export interface IProjectStore {// actionsgetProjectById: (projectId: string | undefined | null) => TProject | undefined;getProjectIdentifierById: (projectId: string | undefined | null) => string;+ getProjectEpicPropertiesById: (projectId: string | undefined | null) => any;// fetch actions+ fetchProjectEpicProperties: (workspaceSlug: string, projectId: string) => Promise<any>;fetchProjects: (workspaceSlug: string) => Promise<TProject[]>;fetchProjectDetails: (workspaceSlug: string, projectId: string) => Promise<TProject>;// favorites actions@@ -53,6 +58,9 @@ export class ProjectStore implements IProjectStore {projectMap: {[projectId: string]: TProject; // projectId: project Info} = {};+ projectEpicPropertiesMap: {+ [projectId: string]: any;+ } = {};// root storerootStore: CoreRootStore;// service@@ -77,6 +85,7 @@ export class ProjectStore implements IProjectStore {joinedProjectIds: computed,favoriteProjectIds: computed,// fetch actions+ fetchProjectEpicProperties: action,fetchProjects: action,fetchProjectDetails: action,// favorites actions@@ -205,6 +214,24 @@ export class ProjectStore implements IProjectStore {return projectIds;}+ fetchProjectEpicProperties = async (workspaceSlug: string, projectId: string) => {+ try {+ const response = await this.projectService.fetchProjectEpicProperties(workspaceSlug, projectId);+ runInAction(() => {+ set(this.projectEpicPropertiesMap, [projectId], response);+ });+ return response;+ } catch (error) {+ console.log("Failed to fetch epic properties from project store");+ throw error;+ }+ };++ getProjectEpicPropertiesById = computedFn((projectId: string | undefined | null) => {+ const projectEpicProperties = this.projectEpicPropertiesMap[projectId ?? ""];+ return projectEpicProperties;+ });+/*** get Workspace projects using workspace slug* @param workspaceSlugdiff --git a/web/core/store/root.store.ts b/web/core/store/root.store.tsindex 621f5f8082..ebd118da87 100644--- a/web/core/store/root.store.ts+++ b/web/core/store/root.store.ts@@ -1,4 +1,5 @@import { enableStaticRendering } from "mobx-react";+import { EIssueServiceType } from "@plane/constants";// plane web storeimport { CommandPaletteStore, ICommandPaletteStore } from "@/plane-web/store/command-palette.store";import { RootStore } from "@/plane-web/store/root.store";@@ -42,6 +43,7 @@ export class CoreRootStore {projectView: IProjectViewStore;globalView: IGlobalViewStore;issue: IIssueRootStore;+ epic: IIssueRootStore;state: IStateStore;label: ILabelStore;dashboard: IDashboardStore;@@ -75,6 +77,7 @@ export class CoreRootStore {this.projectView = new ProjectViewStore(this);this.globalView = new GlobalViewStore(this);this.issue = new IssueRootStore(this as unknown as RootStore);+ this.epic = new IssueRootStore(this as unknown as RootStore, EIssueServiceType.EPICS);this.state = new StateStore(this as unknown as RootStore);this.label = new LabelStore(this);this.dashboard = new DashboardStore(this);@@ -106,6 +109,7 @@ export class CoreRootStore {this.projectView = new ProjectViewStore(this);this.globalView = new GlobalViewStore(this);this.issue = new IssueRootStore(this as unknown as RootStore);+ this.epic = new IssueRootStore(this as unknown as RootStore, EIssueServiceType.EPICS);this.state = new StateStore(this as unknown as RootStore);this.label = new LabelStore(this);this.dashboard = new DashboardStore(this);diff --git a/web/core/store/router.store.ts b/web/core/store/router.store.tsindex 051ed49b4a..94b7754142 100644--- a/web/core/store/router.store.ts+++ b/web/core/store/router.store.ts@@ -21,6 +21,7 @@ export interface IRouterStore {issueId: string | undefined;inboxId: string | undefined;webhookId: string | undefined;+ epicId: string | undefined;}export class RouterStore implements IRouterStore {@@ -47,6 +48,7 @@ export class RouterStore implements IRouterStore {issueId: computed,inboxId: computed,webhookId: computed,+ epicId: computed,});}@@ -163,4 +165,12 @@ export class RouterStore implements IRouterStore {get webhookId() {return this.query?.webhookId?.toString();}++ /**+ * Returns the epic id from the query+ * @returns string|undefined+ */+ get epicId() {+ return this.query?.epicId?.toString();+ }}diff --git a/web/core/store/theme.store.ts b/web/core/store/theme.store.tsindex 185f47f173..0102a09369 100644--- a/web/core/store/theme.store.ts+++ b/web/core/store/theme.store.ts@@ -6,11 +6,13 @@ export interface IThemeStore {profileSidebarCollapsed: boolean | undefined;workspaceAnalyticsSidebarCollapsed: boolean | undefined;issueDetailSidebarCollapsed: boolean | undefined;+ epicDetailSidebarCollapsed: boolean | undefined;// actionstoggleSidebar: (collapsed?: boolean) => void;toggleProfileSidebar: (collapsed?: boolean) => void;toggleWorkspaceAnalyticsSidebar: (collapsed?: boolean) => void;toggleIssueDetailSidebar: (collapsed?: boolean) => void;+ toggleEpicDetailSidebar: (collapsed?: boolean) => void;}export class ThemeStore implements IThemeStore {@@ -19,6 +21,7 @@ export class ThemeStore implements IThemeStore {profileSidebarCollapsed: boolean | undefined = undefined;workspaceAnalyticsSidebarCollapsed: boolean | undefined = undefined;issueDetailSidebarCollapsed: boolean | undefined = undefined;+ epicDetailSidebarCollapsed: boolean | undefined = undefined;constructor() {makeObservable(this, {@@ -27,11 +30,13 @@ export class ThemeStore implements IThemeStore {profileSidebarCollapsed: observable.ref,workspaceAnalyticsSidebarCollapsed: observable.ref,issueDetailSidebarCollapsed: observable.ref,+ epicDetailSidebarCollapsed: observable.ref,// actiontoggleSidebar: action,toggleProfileSidebar: action,toggleWorkspaceAnalyticsSidebar: action,toggleIssueDetailSidebar: action,+ toggleEpicDetailSidebar: action,});}@@ -82,4 +87,13 @@ export class ThemeStore implements IThemeStore {}localStorage.setItem("issue_detail_sidebar_collapsed", this.issueDetailSidebarCollapsed.toString());};++ toggleEpicDetailSidebar = (collapsed?: boolean) => {+ if (collapsed === undefined) {+ this.epicDetailSidebarCollapsed = !this.epicDetailSidebarCollapsed;+ } else {+ this.epicDetailSidebarCollapsed = collapsed;+ }+ localStorage.setItem("epic_detail_sidebar_collapsed", this.epicDetailSidebarCollapsed.toString());+ };}diff --git a/web/ee/components/epics/index.ts b/web/ee/components/epics/index.tsnew file mode 100644index 0000000000..6cef4035fc--- /dev/null+++ b/web/ee/components/epics/index.ts@@ -0,0 +1 @@+export * from "ce/components/epics";diff --git a/web/public/empty-state/epics/epics-dark.webp b/web/public/empty-state/epics/epics-dark.webpnew file mode 100644index 0000000000..ee8da30145Binary files /dev/null and b/web/public/empty-state/epics/epics-dark.webp differdiff --git a/web/public/empty-state/epics/epics-light.webp b/web/public/empty-state/epics/epics-light.webpnew file mode 100644index 0000000000..179acf0addBinary files /dev/null and b/web/public/empty-state/epics/epics-light.webp differ