π₯π₯π₯ 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-404] chore: calendar layout add existing issue workflow improvement (#3877)
Anmol Singh Bhatiada735f318a75
diff --git a/apiserver/plane/app/views/search.py b/apiserver/plane/app/views/search.pyindex a2ed1c015a..ba8e2e0c38 100644--- a/apiserver/plane/app/views/search.py+++ b/apiserver/plane/app/views/search.py@@ -235,6 +235,7 @@ class IssueSearchEndpoint(BaseAPIView):cycle = request.query_params.get("cycle", "false")module = request.query_params.get("module", False)sub_issue = request.query_params.get("sub_issue", "false")+ target_date = request.query_params.get("target_date", True)issue_id = request.query_params.get("issue_id", False)@@ -273,6 +274,9 @@ class IssueSearchEndpoint(BaseAPIView):if module:issues = issues.exclude(issue_module__module=module)+ if target_date == "none":+ issues = issues.filter(target_date__isnull=True)+return Response(issues.values("name",diff --git a/packages/types/src/projects.d.ts b/packages/types/src/projects.d.tsindex a937341866..a6da364b9b 100644--- a/packages/types/src/projects.d.ts+++ b/packages/types/src/projects.d.ts@@ -130,6 +130,7 @@ export type TProjectIssuesSearchParams = {sub_issue?: boolean;issue_id?: string;workspace_search: boolean;+ target_date?: string;};export interface ISearchIssueResponse {diff --git a/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx b/web/components/issues/issue-layouts/calendar/base-calendar-root.tsxindex 2a8cbcc26e..ab47a7399d 100644--- a/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx+++ b/web/components/issues/issue-layouts/calendar/base-calendar-root.tsx@@ -29,12 +29,21 @@ interface IBaseCalendarRoot {[EIssueActions.ARCHIVE]?: (issue: TIssue) => Promise<void>;[EIssueActions.RESTORE]?: (issue: TIssue) => Promise<void>;};+ addIssuesToView?: (issueIds: string[]) => Promise<any>;viewId?: string;isCompletedCycle?: boolean;}export const BaseCalendarRoot = observer((props: IBaseCalendarRoot) => {- const { issueStore, issuesFilterStore, QuickActions, issueActions, viewId, isCompletedCycle = false } = props;+ const {+ issueStore,+ issuesFilterStore,+ QuickActions,+ issueActions,+ addIssuesToView,+ viewId,+ isCompletedCycle = false,+ } = props;// routerconst router = useRouter();@@ -128,6 +137,7 @@ export const BaseCalendarRoot = observer((props: IBaseCalendarRoot) => {readOnly={!isEditingAllowed || isCompletedCycle}/>)}+ addIssuesToView={addIssuesToView}quickAddCallback={issueStore.quickAddIssue}viewId={viewId}readOnly={!isEditingAllowed || isCompletedCycle}diff --git a/web/components/issues/issue-layouts/calendar/calendar.tsx b/web/components/issues/issue-layouts/calendar/calendar.tsxindex 3089a45c47..3083932673 100644--- a/web/components/issues/issue-layouts/calendar/calendar.tsx+++ b/web/components/issues/issue-layouts/calendar/calendar.tsx@@ -30,6 +30,7 @@ type Props = {data: TIssue,viewId?: string) => Promise<TIssue | undefined>;+ addIssuesToView?: (issueIds: string[]) => Promise<any>;viewId?: string;readOnly?: boolean;};@@ -43,6 +44,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {showWeekends,quickActions,quickAddCallback,+ addIssuesToView,viewId,readOnly = false,} = props;@@ -90,6 +92,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {disableIssueCreation={!enableIssueCreation || !isEditingAllowed}quickActions={quickActions}quickAddCallback={quickAddCallback}+ addIssuesToView={addIssuesToView}viewId={viewId}readOnly={readOnly}/>@@ -106,6 +109,7 @@ export const CalendarChart: React.FC<Props> = observer((props) => {disableIssueCreation={!enableIssueCreation || !isEditingAllowed}quickActions={quickActions}quickAddCallback={quickAddCallback}+ addIssuesToView={addIssuesToView}viewId={viewId}readOnly={readOnly}/>diff --git a/web/components/issues/issue-layouts/calendar/day-tile.tsx b/web/components/issues/issue-layouts/calendar/day-tile.tsxindex 849b967cec..8ac1e460cb 100644--- a/web/components/issues/issue-layouts/calendar/day-tile.tsx+++ b/web/components/issues/issue-layouts/calendar/day-tile.tsx@@ -4,9 +4,10 @@ import { observer } from "mobx-react-lite";// componentsimport { CalendarIssueBlocks, ICalendarDate, CalendarQuickAddIssueForm } from "components/issues";// helpers+import { renderFormattedPayloadDate } from "helpers/date-time.helper";// constantsimport { MONTHS_LIST } from "constants/calendar";-import { renderFormattedPayloadDate } from "helpers/date-time.helper";+// typesimport { ICycleIssuesFilter } from "store/issue/cycle";import { IModuleIssuesFilter } from "store/issue/module";import { IProjectIssuesFilter } from "store/issue/project";@@ -27,6 +28,7 @@ type Props = {data: TIssue,viewId?: string) => Promise<TIssue | undefined>;+ addIssuesToView?: (issueIds: string[]) => Promise<any>;viewId?: string;readOnly?: boolean;};@@ -41,6 +43,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {enableQuickIssueCreate,disableIssueCreation,quickAddCallback,+ addIssuesToView,viewId,readOnly = false,} = props;@@ -112,6 +115,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {target_date: renderFormattedPayloadDate(date.date) ?? undefined,}}quickAddCallback={quickAddCallback}+ addIssuesToView={addIssuesToView}viewId={viewId}onOpen={() => setShowAllIssues(true)}/>diff --git a/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx b/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsxindex 5738e028e7..5f62706dc4 100644--- a/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx+++ b/web/components/issues/issue-layouts/calendar/quick-add-issue-form.tsx@@ -2,20 +2,24 @@ import { useEffect, useRef, useState } from "react";import { observer } from "mobx-react-lite";import { useRouter } from "next/router";import { useForm } from "react-hook-form";+// components+import { ExistingIssuesListModal } from "components/core";// hooks-import { PlusIcon } from "lucide-react";-import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";-import { ISSUE_CREATED } from "constants/event-tracker";-import { createIssuePayload } from "helpers/issue.helper";-import { useEventTracker, useProject } from "hooks/store";+import { useEventTracker, useIssueDetail, useProject } from "hooks/store";import useKeypress from "hooks/use-keypress";import useOutsideClickDetector from "hooks/use-outside-click-detector";// helpers+import { createIssuePayload } from "helpers/issue.helper";// icons+import { PlusIcon } from "lucide-react";// ui+import { TOAST_TYPE, setPromiseToast, setToast, CustomMenu } from "@plane/ui";// types-import { TIssue } from "@plane/types";+import { ISearchIssueResponse, TIssue } from "@plane/types";// constants+import { ISSUE_CREATED } from "constants/event-tracker";+// helper+import { cn } from "helpers/common.helper";type Props = {formKey: keyof TIssue;@@ -28,6 +32,7 @@ type Props = {data: TIssue,viewId?: string) => Promise<TIssue | undefined>;+ addIssuesToView?: (issueIds: string[]) => Promise<any>;viewId?: string;onOpen?: () => void;};@@ -60,21 +65,26 @@ const Inputs = (props: any) => {};export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {- const { formKey, prePopulatedData, quickAddCallback, viewId, onOpen } = props;+ const { formKey, prePopulatedData, quickAddCallback, addIssuesToView, viewId, onOpen } = props;// routerconst router = useRouter();- const { workspaceSlug, projectId } = router.query;+ const { workspaceSlug, projectId, moduleId } = router.query;// store hooksconst { getProjectById } = useProject();const { captureIssueEvent } = useEventTracker();+ const { updateIssue } = useIssueDetail();// refsconst ref = useRef<HTMLDivElement>(null);// statesconst [isOpen, setIsOpen] = useState(false);-+ const [isMenuOpen, setIsMenuOpen] = useState(false);+ const [isExistingIssueModalOpen, setIsExistingIssueModalOpen] = useState(false);// derived valuesconst projectDetail = projectId ? getProjectById(projectId.toString()) : null;+ const ExistingIssuesListModalPayload = moduleId+ ? { module: moduleId.toString(), target_date: "none" }+ : { cycle: true, target_date: "none" };const {reset,@@ -158,13 +168,50 @@ export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {}};- const handleOpen = () => {+ const handleAddIssuesToView = async (data: ISearchIssueResponse[]) => {+ if (!workspaceSlug || !projectId) return;++ const issueIds = data.map((i) => i.id);++ try {+ // To handle all updates in parallel+ await Promise.all(+ data.map((issue) =>+ updateIssue(workspaceSlug.toString(), projectId.toString(), issue.id, prePopulatedData ?? {})+ )+ );+ if (addIssuesToView) {+ await addIssuesToView(issueIds);+ }+ } catch (error) {+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Error!",+ message: "Something went wrong. Please try again.",+ });+ }+ };++ const handleNewIssue = () => {setIsOpen(true);if (onOpen) onOpen();};+ const handleExistingIssue = () => {+ setIsExistingIssueModalOpen(true);+ };return (<>+ {workspaceSlug && projectId && (+ <ExistingIssuesListModal+ workspaceSlug={workspaceSlug.toString()}+ projectId={projectId.toString()}+ isOpen={isExistingIssueModalOpen}+ handleClose={() => setIsExistingIssueModalOpen(false)}+ searchParams={ExistingIssuesListModalPayload}+ handleOnSubmit={handleAddIssuesToView}+ />+ )}{isOpen && (<divref={ref}@@ -182,15 +229,38 @@ export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {)}{!isOpen && (- <div className="hidden rounded border-[0.5px] border-custom-border-200 group-hover:block">- <button- type="button"- className="flex w-full items-center gap-x-[6px] rounded-md px-2 py-1.5 text-custom-primary-100"- onClick={handleOpen}- >- <PlusIcon className="h-3.5 w-3.5 stroke-2" />- <span className="text-sm font-medium text-custom-primary-100">New Issue</span>- </button>+ <div+ className={cn("hidden rounded border-[0.5px] border-custom-border-200 group-hover:block", {+ block: isMenuOpen,+ })}+ >+ {addIssuesToView ? (+ <CustomMenu+ placement="bottom-start"+ menuButtonOnClick={() => setIsMenuOpen(true)}+ onMenuClose={() => setIsMenuOpen(false)}+ className="w-full"+ customButtonClassName="w-full"+ customButton={+ <div className="flex w-full items-center gap-x-[6px] rounded-md px-2 py-1.5 text-custom-primary-100">+ <PlusIcon className="h-3.5 w-3.5 stroke-2 flex-shrink-0" />+ <span className="text-sm font-medium flex-shrink-0 text-custom-primary-100">New Issue</span>+ </div>+ }+ >+ <CustomMenu.MenuItem onClick={handleNewIssue}>New Issue</CustomMenu.MenuItem>+ <CustomMenu.MenuItem onClick={handleExistingIssue}>Add existing issue</CustomMenu.MenuItem>+ </CustomMenu>+ ) : (+ <button+ type="button"+ className="flex w-full items-center gap-x-[6px] rounded-md px-2 py-1.5 text-custom-primary-100"+ onClick={handleNewIssue}+ >+ <PlusIcon className="h-3.5 w-3.5 stroke-2" />+ <span className="text-sm font-medium text-custom-primary-100">New Issue</span>+ </button>+ )}</div>)}</>diff --git a/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx b/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsxindex 7a30d187e9..80a21838d1 100644--- a/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx+++ b/web/components/issues/issue-layouts/calendar/roots/cycle-root.tsx@@ -1,15 +1,16 @@-import { useMemo } from "react";+import { useCallback, useMemo } from "react";import { observer } from "mobx-react-lite";import { useRouter } from "next/router";//hooks-import { CycleIssueQuickActions } from "components/issues";-import { EIssuesStoreType } from "constants/issue";import { useCycle, useIssues } from "hooks/store";// components+import { CycleIssueQuickActions } from "components/issues";+import { BaseCalendarRoot } from "../base-calendar-root";// typesimport { TIssue } from "@plane/types";import { EIssueActions } from "../../types";-import { BaseCalendarRoot } from "../base-calendar-root";+// constants+import { EIssuesStoreType } from "constants/issue";export const CycleCalendarLayout: React.FC = observer(() => {const { issues, issuesFilter } = useIssues(EIssuesStoreType.CYCLE);@@ -46,11 +47,20 @@ export const CycleCalendarLayout: React.FC = observer(() => {const isCompletedCycle =cycleId && currentProjectCompletedCycleIds ? currentProjectCompletedCycleIds.includes(cycleId.toString()) : false;+ const addIssuesToView = useCallback(+ (issueIds: string[]) => {+ if (!workspaceSlug || !projectId || !cycleId) throw new Error();+ return issues.addIssueToCycle(workspaceSlug.toString(), projectId.toString(), cycleId.toString(), issueIds);+ },+ [issues?.addIssueToCycle, workspaceSlug, projectId, cycleId]+ );+return (<BaseCalendarRootissueStore={issues}issuesFilterStore={issuesFilter}QuickActions={CycleIssueQuickActions}+ addIssuesToView={addIssuesToView}issueActions={issueActions}viewId={cycleId.toString()}isCompletedCycle={isCompletedCycle}diff --git a/web/components/issues/issue-layouts/calendar/roots/module-root.tsx b/web/components/issues/issue-layouts/calendar/roots/module-root.tsxindex fd0153fe89..b2e2769ee9 100644--- a/web/components/issues/issue-layouts/calendar/roots/module-root.tsx+++ b/web/components/issues/issue-layouts/calendar/roots/module-root.tsx@@ -1,20 +1,21 @@-import { useMemo } from "react";+import { useCallback, useMemo } from "react";import { observer } from "mobx-react-lite";import { useRouter } from "next/router";-// hoks-import { ModuleIssueQuickActions } from "components/issues";-import { EIssuesStoreType } from "constants/issue";+// hooksimport { useIssues } from "hooks/store";// components+import { ModuleIssueQuickActions } from "components/issues";+import { BaseCalendarRoot } from "../base-calendar-root";// typesimport { TIssue } from "@plane/types";import { EIssueActions } from "../../types";-import { BaseCalendarRoot } from "../base-calendar-root";+// constants+import { EIssuesStoreType } from "constants/issue";export const ModuleCalendarLayout: React.FC = observer(() => {const { issues, issuesFilter } = useIssues(EIssuesStoreType.MODULE);const router = useRouter();- const { workspaceSlug, moduleId } = router.query as {+ const { workspaceSlug, projectId, moduleId } = router.query as {workspaceSlug: string;projectId: string;moduleId: string;@@ -42,12 +43,21 @@ export const ModuleCalendarLayout: React.FC = observer(() => {[issues, workspaceSlug, moduleId]);+ const addIssuesToView = useCallback(+ (issueIds: string[]) => {+ if (!workspaceSlug || !projectId || !moduleId) throw new Error();+ return issues.addIssuesToModule(workspaceSlug.toString(), projectId.toString(), moduleId.toString(), issueIds);+ },+ [issues?.addIssuesToModule, workspaceSlug, projectId, moduleId]+ );+return (<BaseCalendarRootissueStore={issues}issuesFilterStore={issuesFilter}QuickActions={ModuleIssueQuickActions}issueActions={issueActions}+ addIssuesToView={addIssuesToView}viewId={moduleId}/>);diff --git a/web/components/issues/issue-layouts/calendar/week-days.tsx b/web/components/issues/issue-layouts/calendar/week-days.tsxindex 2ce742fe85..ec1d12e593 100644--- a/web/components/issues/issue-layouts/calendar/week-days.tsx+++ b/web/components/issues/issue-layouts/calendar/week-days.tsx@@ -25,6 +25,7 @@ type Props = {data: TIssue,viewId?: string) => Promise<TIssue | undefined>;+ addIssuesToView?: (issueIds: string[]) => Promise<any>;viewId?: string;readOnly?: boolean;};@@ -39,6 +40,7 @@ export const CalendarWeekDays: React.FC<Props> = observer((props) => {enableQuickIssueCreate,disableIssueCreation,quickAddCallback,+ addIssuesToView,viewId,readOnly = false,} = props;@@ -68,6 +70,7 @@ export const CalendarWeekDays: React.FC<Props> = observer((props) => {enableQuickIssueCreate={enableQuickIssueCreate}disableIssueCreation={disableIssueCreation}quickAddCallback={quickAddCallback}+ addIssuesToView={addIssuesToView}viewId={viewId}readOnly={readOnly}/>diff --git a/web/constants/dashboard.ts b/web/constants/dashboard.tsindex 3d11b4f123..3d99a46795 100644--- a/web/constants/dashboard.ts+++ b/web/constants/dashboard.ts@@ -11,7 +11,6 @@ import OverdueIssuesLight from "public/empty-state/dashboard/light/overdue-issueimport UpcomingIssuesLight from "public/empty-state/dashboard/light/upcoming-issues.svg";// typesimport { TIssuesListTypes, TStateGroups } from "@plane/types";-// constantsimport { EUserWorkspaceRoles } from "./workspace";// icons