π₯π₯π₯ 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-3396] chore: work items parent select improvement (#6608)
Anmol Singh Bhatia8a792d381b5f
diff --git a/web/ce/components/issues/issue-details/index.ts b/web/ce/components/issues/issue-details/index.tsindex 3979faf948..e23fbe531e 100644--- a/web/ce/components/issues/issue-details/index.ts+++ b/web/ce/components/issues/issue-details/index.ts@@ -2,3 +2,4 @@ export * from "./issue-identifier";export * from "./issue-properties-activity";export * from "./issue-type-switcher";export * from "./issue-type-activity";+export * from "./parent-select-root";diff --git a/web/ce/components/issues/issue-details/parent-select-root.tsx b/web/ce/components/issues/issue-details/parent-select-root.tsxnew file mode 100644index 0000000000..820a578e17--- /dev/null+++ b/web/ce/components/issues/issue-details/parent-select-root.tsx@@ -0,0 +1,82 @@+"use client";++import React from "react";+import { observer } from "mobx-react";+import { useTranslation } from "@plane/i18n";+// ui+import { TOAST_TYPE, setToast } from "@plane/ui";+// components+import { IssueParentSelect, TIssueOperations } from "@/components/issues";+// hooks+import { useIssueDetail } from "@/hooks/store";++type TIssueParentSelect = {+ className?: string;+ disabled?: boolean;+ issueId: string;+ issueOperations: TIssueOperations;+ projectId: string;+ workspaceSlug: string;+};++export const IssueParentSelectRoot: React.FC<TIssueParentSelect> = observer((props) => {+ const { issueId, issueOperations, projectId, workspaceSlug } = props;+ const { t } = useTranslation();+ // store hooks+ const {+ issue: { getIssueById },+ } = useIssueDetail();+ const {+ toggleParentIssueModal,+ removeSubIssue,+ subIssues: { setSubIssueHelpers, fetchSubIssues },+ } = useIssueDetail();++ // derived values+ const issue = getIssueById(issueId);+ const parentIssue = issue?.parent_id ? getIssueById(issue.parent_id) : undefined;++ const handleParentIssue = async (_issueId: string | null = null) => {+ try {+ await issueOperations.update(workspaceSlug, projectId, issueId, { parent_id: _issueId });+ await issueOperations.fetch(workspaceSlug, projectId, issueId, false);+ if (_issueId) await fetchSubIssues(workspaceSlug, projectId, _issueId);+ toggleParentIssueModal(null);+ } catch (error) {+ console.error("something went wrong while fetching the issue");+ }+ };++ const handleRemoveSubIssue = async (+ workspaceSlug: string,+ projectId: string,+ parentIssueId: string,+ issueId: string+ ) => {+ try {+ setSubIssueHelpers(parentIssueId, "issue_loader", issueId);+ await removeSubIssue(workspaceSlug, projectId, parentIssueId, issueId);+ await fetchSubIssues(workspaceSlug, projectId, parentIssueId);+ setSubIssueHelpers(parentIssueId, "issue_loader", issueId);+ } catch (error) {+ setToast({+ type: TOAST_TYPE.ERROR,+ title: t("common.error.label"),+ message: t("common.something_went_wrong"),+ });+ }+ };++ const workItemLink = `/${workspaceSlug}/projects/${parentIssue?.project_id}/issues/${parentIssue?.id}`;++ if (!issue) return <></>;++ return (+ <IssueParentSelect+ {...props}+ handleParentIssue={handleParentIssue}+ handleRemoveSubIssue={handleRemoveSubIssue}+ workItemLink={workItemLink}+ />+ );+});diff --git a/web/core/components/issues/issue-detail/parent-select.tsx b/web/core/components/issues/issue-detail/parent-select.tsxindex 72c0de4128..59cb3808a5 100644--- a/web/core/components/issues/issue-detail/parent-select.tsx+++ b/web/core/components/issues/issue-detail/parent-select.tsx@@ -6,7 +6,7 @@ import Link from "next/link";import { Pencil, X } from "lucide-react";import { useTranslation } from "@plane/i18n";// ui-import { TOAST_TYPE, Tooltip, setToast } from "@plane/ui";+import { Tooltip } from "@plane/ui";// componentsimport { ParentIssuesListModal } from "@/components/issues";// helpers@@ -17,31 +17,41 @@ import { usePlatformOS } from "@/hooks/use-platform-os";// plane web componentsimport { IssueIdentifier } from "@/plane-web/components/issues";// types-import { TIssueOperations } from "./root";type TIssueParentSelect = {className?: string;disabled?: boolean;issueId: string;- issueOperations: TIssueOperations;projectId: string;workspaceSlug: string;+ handleParentIssue: (_issueId?: string | null) => Promise<void>;+ handleRemoveSubIssue: (+ workspaceSlug: string,+ projectId: string,+ parentIssueId: string,+ issueId: string+ ) => Promise<void>;+ workItemLink: string;};export const IssueParentSelect: React.FC<TIssueParentSelect> = observer((props) => {- const { className = "", disabled = false, issueId, issueOperations, projectId, workspaceSlug } = props;+ const {+ className = "",+ disabled = false,+ issueId,+ projectId,+ workspaceSlug,+ handleParentIssue,+ handleRemoveSubIssue,+ workItemLink,+ } = props;const { t } = useTranslation();// store hooksconst { getProjectById } = useProject();const {issue: { getIssueById },} = useIssueDetail();- const {- isParentIssueModalOpen,- toggleParentIssueModal,- removeSubIssue,- subIssues: { setSubIssueHelpers, fetchSubIssues },- } = useIssueDetail();+ const { isParentIssueModalOpen, toggleParentIssueModal } = useIssueDetail();// derived valuesconst issue = getIssueById(issueId);@@ -49,36 +59,6 @@ export const IssueParentSelect: React.FC<TIssueParentSelect> = observer((props)const parentIssueProjectDetails =parentIssue && parentIssue.project_id ? getProjectById(parentIssue.project_id) : undefined;const { isMobile } = usePlatformOS();- const handleParentIssue = async (_issueId: string | null = null) => {- try {- await issueOperations.update(workspaceSlug, projectId, issueId, { parent_id: _issueId });- await issueOperations.fetch(workspaceSlug, projectId, issueId, false);- _issueId && (await fetchSubIssues(workspaceSlug, projectId, _issueId));- toggleParentIssueModal(null);- } catch (error) {- console.error("something went wrong while fetching the issue");- }- };-- const handleRemoveSubIssue = async (- workspaceSlug: string,- projectId: string,- parentIssueId: string,- issueId: string- ) => {- try {- setSubIssueHelpers(parentIssueId, "issue_loader", issueId);- await removeSubIssue(workspaceSlug, projectId, parentIssueId, issueId);- await fetchSubIssues(workspaceSlug, projectId, parentIssueId);- setSubIssueHelpers(parentIssueId, "issue_loader", issueId);- } catch (error) {- setToast({- type: TOAST_TYPE.ERROR,- title: t("common.error.label"),- message: t("common.something_went_wrong"),- });- }- };if (!issue) return <></>;@@ -109,12 +89,7 @@ export const IssueParentSelect: React.FC<TIssueParentSelect> = observer((props){issue.parent_id && parentIssue ? (<div className="flex items-center gap-1 bg-green-500/20 rounded px-1.5 py-1"><Tooltip tooltipHeading="Title" tooltipContent={parentIssue.name} isMobile={isMobile}>- <Link- href={`/${workspaceSlug}/projects/${parentIssue.project_id}/issues/${parentIssue?.id}`}- target="_blank"- rel="noopener noreferrer"- onClick={(e) => e.stopPropagation()}- >+ <Link href={workItemLink} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>{parentIssue?.project_id && parentIssueProjectDetails && (<IssueIdentifierprojectId={parentIssue.project_id}diff --git a/web/core/components/issues/issue-detail/root.tsx b/web/core/components/issues/issue-detail/root.tsxindex d5aef51df0..ec9aaf7b26 100644--- a/web/core/components/issues/issue-detail/root.tsx+++ b/web/core/components/issues/issue-detail/root.tsx@@ -4,7 +4,14 @@ import { FC, useMemo } from "react";import { observer } from "mobx-react";import { usePathname } from "next/navigation";// types-import { EIssuesStoreType, ISSUE_UPDATED, ISSUE_DELETED, ISSUE_ARCHIVED,EUserPermissions, EUserPermissionsLevel } from "@plane/constants";+import {+ EIssuesStoreType,+ ISSUE_UPDATED,+ ISSUE_DELETED,+ ISSUE_ARCHIVED,+ EUserPermissions,+ EUserPermissionsLevel,+} from "@plane/constants";import { useTranslation } from "@plane/i18n";import { TIssue } from "@plane/types";// uidiff --git a/web/core/components/issues/issue-detail/sidebar.tsx b/web/core/components/issues/issue-detail/sidebar.tsxindex b91c6fb3f2..1749ccba49 100644--- a/web/core/components/issues/issue-detail/sidebar.tsx+++ b/web/core/components/issues/issue-detail/sidebar.tsx@@ -16,7 +16,7 @@ import {StateDropdown,} from "@/components/dropdowns";import { ButtonAvatars } from "@/components/dropdowns/member/avatar";-import { IssueCycleSelect, IssueLabel, IssueModuleSelect, IssueParentSelect } from "@/components/issues";+import { IssueCycleSelect, IssueLabel, IssueModuleSelect } from "@/components/issues";// helpersimport { cn } from "@/helpers/common.helper";import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";@@ -25,7 +25,7 @@ import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";import { useProjectEstimates, useIssueDetail, useProject, useProjectState, useMember } from "@/hooks/store";// plane web componentsimport { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issue-types/values";-import { IssueWorklogProperty } from "@/plane-web/components/issues";+import { IssueParentSelectRoot, IssueWorklogProperty } from "@/plane-web/components/issues";// componentsimport type { TIssueOperations } from "./root";@@ -261,7 +261,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {<LayoutPanelTop className="h-4 w-4 flex-shrink-0" /><span>{t("common.parent")}</span></div>- <IssueParentSelect+ <IssueParentSelectRootclassName="h-full w-3/5 flex-grow"workspaceSlug={workspaceSlug}projectId={projectId}diff --git a/web/core/components/issues/peek-overview/properties.tsx b/web/core/components/issues/peek-overview/properties.tsxindex 7d80f5a231..e3e5d51456 100644--- a/web/core/components/issues/peek-overview/properties.tsx+++ b/web/core/components/issues/peek-overview/properties.tsx@@ -16,13 +16,7 @@ import {StateDropdown,} from "@/components/dropdowns";import { ButtonAvatars } from "@/components/dropdowns/member/avatar";-import {- IssueCycleSelect,- IssueModuleSelect,- IssueParentSelect,- IssueLabel,- TIssueOperations,-} from "@/components/issues";+import { IssueCycleSelect, IssueModuleSelect, IssueLabel, TIssueOperations } from "@/components/issues";// helpersimport { cn } from "@/helpers/common.helper";import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";@@ -30,7 +24,7 @@ import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";import { useIssueDetail, useMember, useProject, useProjectState } from "@/hooks/store";// plane web componentsimport { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issue-types/values";-import { IssueWorklogProperty } from "@/plane-web/components/issues";+import { IssueParentSelectRoot, IssueWorklogProperty } from "@/plane-web/components/issues";interface IPeekOverviewProperties {workspaceSlug: string;@@ -269,7 +263,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro<LayoutPanelTop className="h-4 w-4 flex-shrink-0" /><p>{t("common.parent")}</p></div>- <IssueParentSelect+ <IssueParentSelectRootclassName="w-3/4 flex-grow h-full"disabled={disabled}issueId={issueId}diff --git a/web/ee/components/issues/issue-details/index.ts b/web/ee/components/issues/issue-details/index.tsindex 3979faf948..e23fbe531e 100644--- a/web/ee/components/issues/issue-details/index.ts+++ b/web/ee/components/issues/issue-details/index.ts@@ -2,3 +2,4 @@ export * from "./issue-identifier";export * from "./issue-properties-activity";export * from "./issue-type-switcher";export * from "./issue-type-activity";+export * from "./parent-select-root";diff --git a/web/ee/components/issues/issue-details/parent-select-root.tsx b/web/ee/components/issues/issue-details/parent-select-root.tsxnew file mode 100644index 0000000000..0b668ecb14--- /dev/null+++ b/web/ee/components/issues/issue-details/parent-select-root.tsx@@ -0,0 +1 @@+export * from "ce/components/issues/issue-details/parent-select-root";