π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-2568] chore: minor improvements related to issue identifier and issue modal. (#5723)
Prateek Shouryac25fa594fede
diff --git a/web/app/layout.tsx b/web/app/layout.tsxindex 3784191d96..648f70357d 100644--- a/web/app/layout.tsx+++ b/web/app/layout.tsx@@ -93,7 +93,7 @@ export default function RootLayout({ children }: { children: React.ReactNode }){`(function(c,l,a,r,i,t,y){c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;- y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);+ y=l.getElementsByTagName(r)[0];if(y){y.parentNode.insertBefore(t,y);}})(window, document, "clarity", "script", "${process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY}");`}</Script>)}diff --git a/web/ce/components/issues/issue-details/index.ts b/web/ce/components/issues/issue-details/index.tsindex a465ed4b3b..8a71f51f5d 100644--- a/web/ce/components/issues/issue-details/index.ts+++ b/web/ce/components/issues/issue-details/index.ts@@ -1,2 +1,3 @@export * from "./issue-identifier";export * from "./issue-properties-activity";+export * from "./issue-type-switcher";diff --git a/web/ce/components/issues/issue-details/issue-type-switcher.tsx b/web/ce/components/issues/issue-details/issue-type-switcher.tsxnew file mode 100644index 0000000000..5cbd8e6d67--- /dev/null+++ b/web/ce/components/issues/issue-details/issue-type-switcher.tsx@@ -0,0 +1,24 @@+import { observer } from "mobx-react";+// store hooks+import { useIssueDetail } from "@/hooks/store";+// plane web components+import { IssueIdentifier } from "@/plane-web/components/issues";++export type TIssueTypeSwitcherProps = {+ issueId: string;+ disabled: boolean;+};++export const IssueTypeSwitcher: React.FC<TIssueTypeSwitcherProps> = observer((props) => {+ const { issueId } = props;+ // store hooks+ const {+ issue: { getIssueById },+ } = useIssueDetail();+ // derived values+ const issue = getIssueById(issueId);++ if (!issue || !issue.project_id) return <></>;++ return <IssueIdentifier issueId={issueId} projectId={issue.project_id} size="md" />;+});diff --git a/web/core/components/issues/issue-detail/main-content.tsx b/web/core/components/issues/issue-detail/main-content.tsxindex 729300c17a..0dccf61635 100644--- a/web/core/components/issues/issue-detail/main-content.tsx+++ b/web/core/components/issues/issue-detail/main-content.tsx@@ -2,8 +2,6 @@import { useEffect, useState } from "react";import { observer } from "mobx-react";-// types-import { TIssue } from "@plane/types";// componentsimport {IssueActivity,@@ -20,7 +18,7 @@ import { useIssueDetail, useUser } from "@/hooks/store";import useReloadConfirmations from "@/hooks/use-reload-confirmation";import useSize from "@/hooks/use-window-size";// plane web components-import { IssueIdentifier } from "@/plane-web/components/issues";+import { IssueTypeSwitcher } from "@/plane-web/components/issues";// typesimport { TIssueOperations } from "./root";@@ -68,8 +66,8 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {/>)}- <div className="mb-2.5 flex items-center gap-4">- <IssueIdentifier issueId={issueId} projectId={issue.project_id} size="md" />+ <div className="mb-2.5 flex items-center justify-between gap-4">+ <IssueTypeSwitcher issueId={issueId} disabled={isArchived || !isEditable} /><IssueUpdateStatus isSubmitting={isSubmitting} /></div>diff --git a/web/core/components/issues/issue-modal/base.tsx b/web/core/components/issues/issue-modal/base.tsxindex 8ff824ec80..0d1763011c 100644--- a/web/core/components/issues/issue-modal/base.tsx+++ b/web/core/components/issues/issue-modal/base.tsx@@ -30,6 +30,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((withDraftIssueWrapper = true,storeType: issueStoreFromProps,isDraft = false,+ fetchIssueDetails = true,} = props;const issueStoreType = useIssueStoreType();@@ -68,7 +69,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((setDescription(undefined);if (!workspaceSlug) return;- if (!projectId || issueId === undefined) {+ if (!projectId || issueId === undefined || !fetchIssueDetails) {+ // Set description to the issue description from the props if availablesetDescription(data?.description_html || "<p></p>");return;}diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsxindex d18538b7f3..ec6c421927 100644--- a/web/core/components/issues/issue-modal/form.tsx+++ b/web/core/components/issues/issue-modal/form.tsx@@ -146,12 +146,6 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {useEffect(() => {const issueTypeId = watch("type_id");- // if data is present, set active type id to the type id of the issue- if (data && data.type_id) {- setValue("type_id", data.type_id, { shouldValidate: true });- return;- }-// if issue type id is present or project not available, returnif (issueTypeId || !projectId) return;@@ -284,7 +278,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {<IssueTypeSelectcontrol={control}projectId={projectId}- disabled={!!data?.id || !!data?.sourceIssueId}+ disabled={!!data?.sourceIssueId}handleFormChange={handleFormChange}/>)}diff --git a/web/core/components/issues/issue-modal/modal.tsx b/web/core/components/issues/issue-modal/modal.tsxindex 0f2d3ce000..9266cb3225 100644--- a/web/core/components/issues/issue-modal/modal.tsx+++ b/web/core/components/issues/issue-modal/modal.tsx@@ -19,10 +19,14 @@ export interface IssuesModalProps {withDraftIssueWrapper?: boolean;storeType?: EIssuesStoreType;isDraft?: boolean;+ fetchIssueDetails?: boolean;}-export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer((props) => (- <IssueModalProvider>- <CreateUpdateIssueModalBase {...props} />- </IssueModalProvider>-));+export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer(+ (props) =>+ props.isOpen && (+ <IssueModalProvider>+ <CreateUpdateIssueModalBase {...props} />+ </IssueModalProvider>+ )+);diff --git a/web/core/components/issues/peek-overview/issue-detail.tsx b/web/core/components/issues/peek-overview/issue-detail.tsxindex b51e2834eb..7c801dd01a 100644--- a/web/core/components/issues/peek-overview/issue-detail.tsx+++ b/web/core/components/issues/peek-overview/issue-detail.tsx@@ -1,13 +1,14 @@import { FC, useEffect } from "react";import { observer } from "mobx-react";-// store hooks+// componentsimport { TIssueOperations } from "@/components/issues";+// store hooksimport { useIssueDetail, useUser } from "@/hooks/store";// hooksimport useReloadConfirmations from "@/hooks/use-reload-confirmation";// plane web components-import { IssueIdentifier } from "@/plane-web/components/issues";-// components+import { IssueTypeSwitcher } from "@/plane-web/components/issues";+// local componentsimport { IssueDescriptionInput } from "../description-input";import { IssueReaction } from "../issue-detail/reactions";import { IssueTitleInput } from "../title-input";@@ -56,7 +57,7 @@ export const PeekOverviewIssueDetails: FC<IPeekOverviewIssueDetails> = observer(return (<div className="space-y-2">- <IssueIdentifier issueId={issueId} projectId={issue.project_id} size="md" />+ <IssueTypeSwitcher issueId={issueId} disabled={isArchived || disabled} /><IssueTitleInputworkspaceSlug={workspaceSlug}projectId={issue.project_id}diff --git a/web/ee/components/issues/issue-details/index.ts b/web/ee/components/issues/issue-details/index.tsindex a465ed4b3b..8a71f51f5d 100644--- a/web/ee/components/issues/issue-details/index.ts+++ b/web/ee/components/issues/issue-details/index.ts@@ -1,2 +1,3 @@export * from "./issue-identifier";export * from "./issue-properties-activity";+export * from "./issue-type-switcher";diff --git a/web/ee/components/issues/issue-details/issue-type-switcher.tsx b/web/ee/components/issues/issue-details/issue-type-switcher.tsxnew file mode 100644index 0000000000..683fdbd523--- /dev/null+++ b/web/ee/components/issues/issue-details/issue-type-switcher.tsx@@ -0,0 +1 @@+export * from "ce/components/issues/issue-details/issue-type-switcher";