π₯π₯π₯ 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
fix: issue link edit modal and mutation fix (#5172)
Anmol Singh Bhatiae055abb711db
diff --git a/web/core/components/issues/issue-detail-widgets/issue-detail-widget-modals.tsx b/web/core/components/issues/issue-detail-widgets/issue-detail-widget-modals.tsxindex 42bf809b1b..cc46b80c34 100644--- a/web/core/components/issues/issue-detail-widgets/issue-detail-widget-modals.tsx+++ b/web/core/components/issues/issue-detail-widgets/issue-detail-widget-modals.tsx@@ -25,6 +25,7 @@ export const IssueDetailWidgetModals: FC<Props> = observer((props) => {const {isIssueLinkModalOpen,toggleIssueLinkModal: toggleIssueLinkModalStore,+ setIssueLinkData,isCreateIssueModalOpen,toggleCreateIssueModal,isSubIssuesModalOpen,@@ -88,6 +89,7 @@ export const IssueDetailWidgetModals: FC<Props> = observer((props) => {const handleIssueLinkModalOnClose = () => {toggleIssueLinkModalStore(false);setLastWidgetAction("links");+ setIssueLinkData(null);};const handleRelationOnClose = () => {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 684ef01c8e..808fa6dd42 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@@ -6,6 +6,7 @@ import { Dialog, Transition } from "@headlessui/react";import type { TIssueLinkEditableFields } from "@plane/types";// uiimport { Button, Input } from "@plane/ui";+import { useIssueDetail } from "@/hooks/store";// typesimport { TLinkOperations } from "./root";@@ -19,7 +20,6 @@ export type TIssueLinkCreateEditModal = {isModalOpen: boolean;handleOnClose?: () => void;linkOperations: TLinkOperationsModal;- preloadedData?: TIssueLinkCreateFormFieldOptions | null;};const defaultValues: TIssueLinkCreateFormFieldOptions = {@@ -29,7 +29,7 @@ const defaultValues: TIssueLinkCreateFormFieldOptions = {export const IssueLinkCreateUpdateModal: FC<TIssueLinkCreateEditModal> = (props) => {// props- const { isModalOpen, handleOnClose, linkOperations, preloadedData } = props;+ const { isModalOpen, handleOnClose, linkOperations } = props;// react hook formconst {@@ -41,12 +41,11 @@ export const IssueLinkCreateUpdateModal: FC<TIssueLinkCreateEditModal> = (props)defaultValues,});+ const { issueLinkData: preloadedData, setIssueLinkData } = useIssueDetail();+const onClose = () => {+ setIssueLinkData(null);if (handleOnClose) handleOnClose();- const timeout = setTimeout(() => {- reset(preloadedData ? preloadedData : defaultValues);- clearTimeout(timeout);- }, 500);};const handleFormSubmit = async (formData: TIssueLinkCreateFormFieldOptions) => {diff --git a/web/core/components/issues/issue-detail/links/link-detail.tsx b/web/core/components/issues/issue-detail/links/link-detail.tsxindex 489ec2f1d7..286e501b7c 100644--- a/web/core/components/issues/issue-detail/links/link-detail.tsx+++ b/web/core/components/issues/issue-detail/links/link-detail.tsx@@ -1,6 +1,6 @@"use client";-import { FC, useState } from "react";+import { FC } from "react";// hooks// uiimport { Pencil, Trash2, LinkIcon, ExternalLink } from "lucide-react";@@ -12,7 +12,7 @@ import { calculateTimeAgo } from "@/helpers/date-time.helper";import { copyTextToClipboard } from "@/helpers/string.helper";import { useIssueDetail, useMember } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";-import { IssueLinkCreateUpdateModal, TLinkOperationsModal } from "./create-update-link-modal";+import { TLinkOperationsModal } from "./create-update-link-modal";export type TIssueLinkDetail = {linkId: string;@@ -27,34 +27,22 @@ export const IssueLinkDetail: FC<TIssueLinkDetail> = (props) => {const {toggleIssueLinkModal: toggleIssueLinkModalStore,link: { getLinkById },+ setIssueLinkData,} = useIssueDetail();const { getUserDetails } = useMember();+ const { isMobile } = usePlatformOS();+ const linkDetail = getLinkById(linkId);+ if (!linkDetail) return <></>;- // state- const [isIssueLinkModalOpen, setIsIssueLinkModalOpen] = useState(false);const toggleIssueLinkModal = (modalToggle: boolean) => {toggleIssueLinkModalStore(modalToggle);- setIsIssueLinkModalOpen(modalToggle);+ setIssueLinkData(linkDetail);};- const { isMobile } = usePlatformOS();- const linkDetail = getLinkById(linkId);- if (!linkDetail) return <></>;const createdByDetails = getUserDetails(linkDetail.created_by_id);- const handleOnClose = () => {- toggleIssueLinkModal(false);- };-return (<div key={linkId}>- <IssueLinkCreateUpdateModal- isModalOpen={isIssueLinkModalOpen}- handleOnClose={handleOnClose}- linkOperations={linkOperations}- preloadedData={linkDetail}- />-<div className="relative flex flex-col rounded-md bg-custom-background-90 p-2.5"><divclassName="flex w-full cursor-pointer items-start justify-between gap-2"diff --git a/web/core/components/issues/issue-detail/links/link-item.tsx b/web/core/components/issues/issue-detail/links/link-item.tsxindex 256ccb7255..d758b08d3e 100644--- a/web/core/components/issues/issue-detail/links/link-item.tsx+++ b/web/core/components/issues/issue-detail/links/link-item.tsx@@ -1,6 +1,7 @@"use client";-import { FC, useState } from "react";+import { FC } from "react";+import { observer } from "mobx-react";import { Pencil, Trash2, LinkIcon, ExternalLink } from "lucide-react";// uiimport { Tooltip, TOAST_TYPE, setToast, CustomMenu } from "@plane/ui";@@ -10,7 +11,7 @@ import { copyTextToClipboard } from "@/helpers/string.helper";// hooksimport { useIssueDetail } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";-import { IssueLinkCreateUpdateModal, TLinkOperationsModal } from "./create-update-link-modal";+import { TLinkOperationsModal } from "./create-update-link-modal";type TIssueLinkItem = {linkId: string;@@ -18,36 +19,25 @@ type TIssueLinkItem = {isNotAllowed: boolean;};-export const IssueLinkItem: FC<TIssueLinkItem> = (props) => {+export const IssueLinkItem: FC<TIssueLinkItem> = observer((props) => {// propsconst { linkId, linkOperations, isNotAllowed } = props;// hooksconst {toggleIssueLinkModal: toggleIssueLinkModalStore,+ setIssueLinkData,link: { getLinkById },} = useIssueDetail();-- // state- const [isIssueLinkModalOpen, setIsIssueLinkModalOpen] = useState(false);- const toggleIssueLinkModal = (modalToggle: boolean) => {- toggleIssueLinkModalStore(modalToggle);- setIsIssueLinkModalOpen(modalToggle);- };const { isMobile } = usePlatformOS();const linkDetail = getLinkById(linkId);if (!linkDetail) return <></>;- const handleOnClose = () => {- toggleIssueLinkModal(false);+ const toggleIssueLinkModal = (modalToggle: boolean) => {+ toggleIssueLinkModalStore(modalToggle);+ setIssueLinkData(linkDetail);};return (<>- <IssueLinkCreateUpdateModal- isModalOpen={isIssueLinkModalOpen}- handleOnClose={handleOnClose}- linkOperations={linkOperations}- preloadedData={linkDetail}- /><divkey={linkId}className="col-span-12 lg:col-span-6 xl:col-span-4 2xl:col-span-3 3xl:col-span-2 flex items-center justify-between gap-3 h-8 flex-shrink-0 px-3 bg-custom-background-90 border-[0.5px] border-custom-border-200 rounded"@@ -116,4 +106,4 @@ export const IssueLinkItem: FC<TIssueLinkItem> = (props) => {</div></>);-};+});diff --git a/web/core/store/issue/issue-details/root.store.ts b/web/core/store/issue/issue-details/root.store.tsindex e16a41a4a0..88ecac41a8 100644--- a/web/core/store/issue/issue-details/root.store.ts+++ b/web/core/store/issue/issue-details/root.store.ts@@ -59,6 +59,7 @@ export interface IIssueDetail// observablespeekIssue: TPeekIssue | undefined;relationKey: TIssueRelationTypes | null;+ issueLinkData: TIssueLink | null;issueCrudOperationState: TIssueCrudOperationState;openWidgets: TIssueDetailWidget[];lastWidgetAction: TIssueDetailWidget | null;@@ -76,6 +77,7 @@ export interface IIssueDetailgetIsIssuePeeked: (issueId: string) => boolean;// actionssetPeekIssue: (peekIssue: TPeekIssue | undefined) => void;+ setIssueLinkData: (issueLinkData: TIssueLink | null) => void;toggleCreateIssueModal: (value: boolean) => void;toggleIssueLinkModal: (value: boolean) => void;toggleParentIssueModal: (issueId: string | null) => void;@@ -107,6 +109,7 @@ export class IssueDetail implements IIssueDetail {// observablespeekIssue: TPeekIssue | undefined = undefined;relationKey: TIssueRelationTypes | null = null;+ issueLinkData: TIssueLink | null = null;issueCrudOperationState: TIssueCrudOperationState = {create: {toggle: false,@@ -147,6 +150,7 @@ export class IssueDetail implements IIssueDetail {// observablespeekIssue: observable,relationKey: observable,+ issueLinkData: observable,issueCrudOperationState: observable,isCreateIssueModalOpen: observable,isIssueLinkModalOpen: observable.ref,@@ -162,6 +166,7 @@ export class IssueDetail implements IIssueDetail {isAnyModalOpen: computed,// actionsetPeekIssue: action,+ setIssueLinkData: action,toggleCreateIssueModal: action,toggleIssueLinkModal: action,toggleParentIssueModal: action,@@ -233,6 +238,7 @@ export class IssueDetail implements IIssueDetail {this.openWidgets = this.openWidgets.filter((s) => s !== state);else this.openWidgets = [state, ...this.openWidgets];};+ setIssueLinkData = (issueLinkData: TIssueLink | null) => (this.issueLinkData = issueLinkData);// issuefetchIssue = async (