[WEB-2577] improvement: use common create/update issue modal for accepting intake issues for consistency

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/header.tsx

@@ -8,7 +8,7 @@ import { RefreshCcw } from "lucide-react";
 import { Breadcrumbs, Button, Intake, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink, Logo } from "@/components/common";
-import { InboxIssueCreateEditModalRoot } from "@/components/inbox";
+import { InboxIssueCreateModalRoot } from "@/components/inbox";
 // hooks
 import { useProject, useProjectInbox, useUserPermissions } from "@/hooks/store";
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
@@ -69,12 +69,11 @@ export const ProjectInboxHeader: FC = observer(() => {
       <Header.RightItem>
         {currentProjectDetails?.inbox_view && workspaceSlug && projectId && isAuthorized ? (
           <div className="flex items-center gap-2">
-            <InboxIssueCreateEditModalRoot
+            <InboxIssueCreateModalRoot
               workspaceSlug={workspaceSlug.toString()}
               projectId={projectId.toString()}
               modalState={createIssueModal}
               handleModalClose={() => setCreateIssueModal(false)}
-              issue={undefined}
             />
 
             <Button variant="primary" size="sm" onClick={() => setCreateIssueModal(true)}>

web/core/components/inbox/content/inbox-issue-header.tsx

@@ -21,12 +21,11 @@ import {
   DeclineIssueModal,
   DeleteInboxIssueModal,
   InboxIssueActionsMobileHeader,
-  InboxIssueCreateEditModalRoot,
   InboxIssueSnoozeModal,
   InboxIssueStatus,
   SelectDuplicateInboxIssueModal,
 } from "@/components/inbox";
-import { IssueUpdateStatus } from "@/components/issues";
+import { CreateUpdateIssueModal, IssueUpdateStatus } from "@/components/issues";
 // helpers
 import { findHowManyDaysLeft } from "@/helpers/date-time.helper";
 import { EInboxIssueStatus } from "@/helpers/inbox.helper";
@@ -70,6 +69,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
   const { currentTab, deleteInboxIssue, filteredInboxIssueIds } = useProjectInbox();
   const { data: currentUser } = useUser();
   const { allowPermissions } = useUserPermissions();
+  const { currentProjectDetails } = useProject();
 
   const router = useAppRouter();
   const { getProjectById } = useProject();
@@ -234,16 +234,19 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
           value={inboxIssue?.duplicate_to}
           onSubmit={handleInboxIssueDuplicate}
         />
-
-        <InboxIssueCreateEditModalRoot
-          workspaceSlug={workspaceSlug.toString()}
-          projectId={projectId.toString()}
-          modalState={acceptIssueModal}
-          handleModalClose={() => setAcceptIssueModal(false)}
-          issue={inboxIssue?.issue}
-          onSubmit={handleInboxIssueAccept}
+        <CreateUpdateIssueModal
+          data={inboxIssue?.issue}
+          isOpen={acceptIssueModal}
+          onClose={() => setAcceptIssueModal(false)}
+          beforeFormSubmit={handleInboxIssueAccept}
+          withDraftIssueWrapper={false}
+          fetchIssueDetails={false}
+          modalTitle={`Move ${currentProjectDetails?.identifier}-${issue?.sequence_id} to project issues`}
+          primaryButtonText={{
+            default: "Add to project",
+            loading: "Adding",
+          }}
         />
-
         <DeclineIssueModal
           data={inboxIssue?.issue || {}}
           isOpen={declineIssueModal}

web/core/components/inbox/modals/create-edit-modal/create-root.tsx → web/core/components/inbox/modals/create-modal/create-root.tsx

@@ -9,11 +9,7 @@ import { EditorRefApi } from "@plane/editor";
 import { TIssue } from "@plane/types";
 import { Button, ToggleSwitch, TOAST_TYPE, setToast } from "@plane/ui";
 // components
-import {
-  InboxIssueTitle,
-  InboxIssueDescription,
-  InboxIssueProperties,
-} from "@/components/inbox/modals/create-edit-modal";
+import { InboxIssueTitle, InboxIssueDescription, InboxIssueProperties } from "@/components/inbox/modals/create-modal";
 // constants
 import { ISSUE_CREATED } from "@/constants/event-tracker";
 import { ETabIndices } from "@/constants/tab-indices";
@@ -201,7 +197,7 @@ export const InboxIssueCreateRoot: FC<TInboxIssueCreateRoot> = observer((props)
           role="button"
           tabIndex={getIndex("create_more")}
         >
-          <ToggleSwitch value={createMore} onChange={() => {}} size="sm" />
+          <ToggleSwitch value={createMore} onChange={() => { }} size="sm" />
           <span className="text-xs">Create more</span>
         </div>
         <div className="flex items-center gap-3">

web/core/components/inbox/modals/create-edit-modal/index.ts → web/core/components/inbox/modals/create-modal/index.ts

@@ -1,6 +1,5 @@
 export * from "./modal";
 export * from "./create-root";
-export * from "./edit-root";
 export * from "./issue-title";
 export * from "./issue-description";
 export * from "./issue-properties";

web/core/components/inbox/modals/create-edit-modal/issue-properties.tsx → web/core/components/inbox/modals/create-modal/issue-properties.tsx

@@ -91,7 +91,7 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
       {/* labels */}
       <div className="h-7">
         <IssueLabelSelect
-          setIsOpen={() => {}}
+          setIsOpen={() => { }}
           value={data?.label_ids || []}
           onChange={(labelIds) => handleData("label_ids", labelIds)}
           projectId={projectId}

web/core/components/inbox/modals/create-modal/modal.tsx

@@ -0,0 +1,27 @@
+import { FC } from "react";
+// ui
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
+// components
+import { InboxIssueCreateRoot } from "@/components/inbox/modals/create-modal";
+
+type TInboxIssueCreateModalRoot = {
+  workspaceSlug: string;
+  projectId: string;
+  modalState: boolean;
+  handleModalClose: () => void;
+};
+
+export const InboxIssueCreateModalRoot: FC<TInboxIssueCreateModalRoot> = (props) => {
+  const { workspaceSlug, projectId, modalState, handleModalClose } = props;
+
+  return (
+    <ModalCore
+      isOpen={modalState}
+      handleClose={handleModalClose}
+      position={EModalPosition.TOP}
+      width={EModalWidth.XXXXL}
+    >
+      <InboxIssueCreateRoot workspaceSlug={workspaceSlug} projectId={projectId} handleModalClose={handleModalClose} />
+    </ModalCore>
+  );
+};

web/core/components/inbox/modals/index.ts

@@ -1,4 +1,4 @@
-export * from "./create-edit-modal";
+export * from "./create-modal";
 export * from "./decline-issue-modal";
 export * from "./delete-issue-modal";
 export * from "./select-duplicate";