π₯π₯π₯ 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-1336] fix: issue dates conflict in the calendar layout (#4480)
Aaryan Khandelwal4c16ed8b2348
diff --git a/apiserver/plane/app/views/search.py b/apiserver/plane/app/views/search.pyindex 4a4ffd826d..93bab2de31 100644--- a/apiserver/plane/app/views/search.py+++ b/apiserver/plane/app/views/search.py@@ -289,6 +289,7 @@ class IssueSearchEndpoint(BaseAPIView):issues.values("name","id",+ "start_date","sequence_id","project__name","project__identifier",diff --git a/packages/types/src/project/projects.d.ts b/packages/types/src/project/projects.d.tsindex 157ecb16e5..459d9f0e2f 100644--- a/packages/types/src/project/projects.d.ts+++ b/packages/types/src/project/projects.d.ts@@ -147,6 +147,7 @@ export interface ISearchIssueResponse {project__identifier: string;project__name: string;sequence_id: number;+ start_date: string | null;state__color: string;state__group: TStateGroups;state__name: string;diff --git a/web/components/core/modals/existing-issues-list-modal.tsx b/web/components/core/modals/existing-issues-list-modal.tsxindex 93e2c2ea78..63c0b17a0d 100644--- a/web/components/core/modals/existing-issues-list-modal.tsx+++ b/web/components/core/modals/existing-issues-list-modal.tsx@@ -1,17 +1,17 @@import React, { useEffect, useState } from "react";import { Rocket, Search, X } from "lucide-react";import { Combobox, Dialog, Transition } from "@headlessui/react";+// typesimport { ISearchIssueResponse, TProjectIssuesSearchParams } from "@plane/types";-// services+// uiimport { Button, Loader, ToggleSwitch, Tooltip, TOAST_TYPE, setToast } from "@plane/ui";+// hooksimport useDebounce from "@/hooks/use-debounce";import { usePlatformOS } from "@/hooks/use-platform-os";+// servicesimport { ProjectService } from "@/services/project";-// hooks// componentsimport { IssueSearchModalEmptyState } from "./issue-search-modal-empty-state";-// ui-// typestype Props = {workspaceSlug: string | undefined;@@ -21,6 +21,7 @@ type Props = {searchParams: Partial<TProjectIssuesSearchParams>;handleOnSubmit: (data: ISearchIssueResponse[]) => Promise<void>;workspaceLevelToggle?: boolean;+ shouldHideIssue?: (issue: ISearchIssueResponse) => boolean;};const projectService = new ProjectService();@@ -34,6 +35,7 @@ export const ExistingIssuesListModal: React.FC<Props> = (props) => {searchParams,handleOnSubmit,workspaceLevelToggle = false,+ shouldHideIssue,} = props;// statesconst [isLoading, setIsLoading] = useState(false);@@ -87,6 +89,8 @@ export const ExistingIssuesListModal: React.FC<Props> = (props) => {});}, [debouncedSearchTerm, isOpen, isWorkspaceLevel, projectId, workspaceSlug]);+ const filteredIssues = issues.filter((issue) => !shouldHideIssue?.(issue));+return (<><Transition.Root show={isOpen} as={React.Fragment} afterLeave={() => setSearchTerm("")} appear>@@ -207,16 +211,16 @@ export const ExistingIssuesListModal: React.FC<Props> = (props) => {</Loader>) : (<>- {issues.length === 0 ? (+ {filteredIssues.length === 0 ? (<IssueSearchModalEmptyStatedebouncedSearchTerm={debouncedSearchTerm}isSearching={isSearching}- issues={issues}+ issues={filteredIssues}searchTerm={searchTerm}/>) : (- <ul className={`text-sm text-custom-text-100 ${issues.length > 0 ? "p-2" : ""}`}>- {issues.map((issue) => {+ <ul className={`text-sm text-custom-text-100 ${filteredIssues.length > 0 ? "p-2" : ""}`}>+ {filteredIssues.map((issue) => {const selected = selectedIssues.some((i) => i.id === issue.id);return (diff --git a/web/components/issues/issue-layouts/calendar/day-tile.tsx b/web/components/issues/issue-layouts/calendar/day-tile.tsxindex 7dfcfdcac9..d9461e1f67 100644--- a/web/components/issues/issue-layouts/calendar/day-tile.tsx+++ b/web/components/issues/issue-layouts/calendar/day-tile.tsx@@ -1,9 +1,12 @@import { useEffect, useRef, useState } from "react";import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";+import { differenceInCalendarDays } from "date-fns";import { observer } from "mobx-react-lite";// typesimport { TGroupedIssues, TIssue, TIssueMap } from "@plane/types";+// ui+import { TOAST_TYPE, setToast } from "@plane/ui";// componentsimport { CalendarIssueBlocks, ICalendarDate } from "@/components/issues";import { highlightIssueOnDrop } from "@/components/issues/issue-layouts/utils";@@ -91,6 +94,23 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {setIsDraggingOver(false);const sourceData = source?.data as { id: string; date: string } | undefined;const destinationData = self?.data as { date: string } | undefined;+ if (!sourceData || !destinationData) return;++ const issueDetails = issues?.[sourceData?.id];+ if (issueDetails?.start_date) {+ const issueStartDate = new Date(issueDetails.start_date);+ const targetDate = new Date(destinationData?.date);+ const diffInDays = differenceInCalendarDays(targetDate, issueStartDate);+ if (diffInDays < 0) {+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "Error!",+ message: "Due date cannot be before the start date of the issue.",+ });+ return;+ }+ }+handleDragAndDrop(sourceData?.id, sourceData?.date, destinationData?.date);setShowAllIssues(true);highlightIssueOnDrop(source?.element?.id, false);@@ -107,7 +127,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {const isToday = date.date.toDateString() === new Date().toDateString();const isSelectedDate = date.date.toDateString() == selectedDate.toDateString();- const isWeekend = date.date.getDay() === 0 || date.date.getDay() === 6;+ const isWeekend = [0, 6].includes(date.date.getDay());const isMonthLayout = calendarLayout === "month";const normalBackground = isWeekend ? "bg-custom-background-90" : "bg-custom-background-100";@@ -124,11 +144,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {? "font-medium": "text-custom-text-300": "font-medium" // if week layout, highlight all days- } ${- date.date.getDay() === 0 || date.date.getDay() === 6- ? "bg-custom-background-90"- : "bg-custom-background-100"- } `}+ } ${isWeekend ? "bg-custom-background-90" : "bg-custom-background-100"} `}>{date.date.getDate() === 1 && MONTHS_LIST[date.date.getMonth() + 1].shortTitle + " "}{isToday ? (@@ -143,9 +159,12 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {{/* content */}<div className="h-full w-full hidden md:block"><div- className={`h-full w-full select-none ${- isDraggingOver ? `${draggingOverBackground} opacity-70` : normalBackground- } ${isMonthLayout ? "min-h-[5rem]" : ""}`}+ className={cn(+ `h-full w-full select-none ${isDraggingOver ? `${draggingOverBackground} opacity-70` : normalBackground}`,+ {+ "min-h-[5rem]": isMonthLayout,+ }+ )}><CalendarIssueBlocksdate={date.date}@@ -177,7 +196,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {)}><div- className={cn("flex h-6 w-6 items-center justify-center rounded-full ", {+ className={cn("size-6 flex items-center justify-center rounded-full", {"bg-custom-primary-100 text-white": isSelectedDate,"bg-custom-primary-100/10 text-custom-primary-100 ": isToday && !isSelectedDate,})}@@ -185,7 +204,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {{date.date.getDate()}</div>- {totalIssues > 0 && <div className="mt-1 flex h-1.5 w-1.5 flex-shrink-0 rounded bg-custom-primary-100" />}+ {totalIssues > 0 && <div className="mt-1 size-1.5 flex flex-shrink-0 rounded bg-custom-primary-100" />}</div></div></>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 ea75e77488..7e77a63ab9 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@@ -1,25 +1,24 @@import { useEffect, useRef, useState } from "react";+import { differenceInCalendarDays } from "date-fns";import { observer } from "mobx-react";import { useRouter } from "next/router";import { useForm } from "react-hook-form";-// componentsimport { PlusIcon } from "lucide-react";+// typesimport { ISearchIssueResponse, TIssue } from "@plane/types";+// uiimport { TOAST_TYPE, setPromiseToast, setToast, CustomMenu } from "@plane/ui";+// componentsimport { ExistingIssuesListModal } from "@/components/core";-// hooks+// constantsimport { ISSUE_CREATED } from "@/constants/event-tracker";+// helpersimport { cn } from "@/helpers/common.helper";import { createIssuePayload } from "@/helpers/issue.helper";+// hooksimport { useEventTracker, useIssueDetail, useProject } from "@/hooks/store";import useKeypress from "@/hooks/use-keypress";import useOutsideClickDetector from "@/hooks/use-outside-click-detector";-// helpers-// icons-// ui-// types-// constants-// helpertype Props = {formKey: keyof TIssue;@@ -182,9 +181,7 @@ export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {updateIssue(workspaceSlug.toString(), projectId.toString(), issue.id, prePopulatedData ?? {})));- if (addIssuesToView) {- await addIssuesToView(issueIds);- }+ await addIssuesToView?.(issueIds);} catch (error) {setToast({type: TOAST_TYPE.ERROR,@@ -212,6 +209,15 @@ export const CalendarQuickAddIssueForm: React.FC<Props> = observer((props) => {handleClose={() => setIsExistingIssueModalOpen(false)}searchParams={ExistingIssuesListModalPayload}handleOnSubmit={handleAddIssuesToView}+ shouldHideIssue={(issue) => {+ if (issue.start_date && prePopulatedData?.target_date) {+ const issueStartDate = new Date(issue.start_date);+ const targetDate = new Date(prePopulatedData.target_date);+ const diffInDays = differenceInCalendarDays(targetDate, issueStartDate);+ if (diffInDays < 0) return true;+ }+ return false;+ }}/>)}{isOpen && (