Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: merge conflicts resolved

sriram veeraghanta473dfc7a5b2b
diff --cc web/components/core/filters/date-filter-modal.tsx
index d1eedc7494,3e2f3ff6ad..1b7b7aaed0
--- a/web/components/core/filters/date-filter-modal.tsx
+++ b/web/components/core/filters/date-filter-modal.tsx
@@@ -7,8 -7,8 +7,8 @@@ import { X } from "lucide-react"
// ui
import { Button } from "@plane/ui";
// helpers
- import { renderFormattedPayloadDate, renderFormattedDate } from "helpers/date-time.helper";
+import { DateFilterSelect } from "./date-filter-select";
+ import { renderFormattedPayloadDate, renderFormattedDate, getDate } from "helpers/date-time.helper";
type Props = {
title: string;
diff --cc web/components/cycles/active-cycle/root.tsx
index dd5d65f7ef,b5d6523ed5..d11c694d5c
--- a/web/components/cycles/active-cycle/root.tsx
+++ b/web/components/cycles/active-cycle/root.tsx
@@@ -28,9 -27,13 +28,14 @@@ import { EmptyState } from "components/
// icons
import { ArrowRight, CalendarCheck, CalendarDays, Star, Target } from "lucide-react";
// helpers
- import { renderFormattedDate, findHowManyDaysLeft, renderFormattedDateWithoutYear } from "helpers/date-time.helper";
+ import {
+ renderFormattedDate,
+ findHowManyDaysLeft,
+ renderFormattedDateWithoutYear,
+ getDate,
+ } from "helpers/date-time.helper";
import { truncateText } from "helpers/string.helper";
+import { cn } from "helpers/common.helper";
// types
import { ICycle, TCycleGroups } from "@plane/types";
// constants
@@@ -90,42 -97,18 +95,42 @@@ export const ActiveCycleRoot: React.FC<
</Loader>
);
- if (!activeCycle)
- return (
- <EmptyState
- title={emptyStateDetail.title}
- description={emptyStateDetail.description}
- image={emptyStateImage}
- size="sm"
- />
- );
+ if (!activeCycle) {
+ // show empty state if no active cycle is present
+ if (currentProjectUpcomingCycleIds?.length === 0)
+ return <EmptyState type={EmptyStateType.PROJECT_CYCLE_ACTIVE} size="sm" />;
+ // show upcoming cycles list, if present
+ else
+ return (
+ <>
+ <div className="h-52 w-full grid place-items-center mb-6">
+ <div className="text-center">
+ <h5 className="text-xl font-medium mb-1">No active cycle</h5>
+ <p className="text-custom-text-400 text-base">
+ Create new cycles to find them here or check
+ <br />
+ {"'"}All{"'"} cycles tab to see all cycles or{" "}
+ <button
+ type="button"
+ className="text-custom-primary-100 font-medium"
+ onClick={() =>
+ updateDisplayFilters(projectId, {
+ active_tab: "all",
+ })
+ }
+ >
+ click here
+ </button>
+ </p>
+ </div>
+ </div>
+ <UpcomingCyclesList />
+ </>
+ );
+ }
- const endDate = new Date(activeCycle.end_date ?? "");
- const startDate = new Date(activeCycle.start_date ?? "");
+ const endDate = getDate(activeCycle.end_date);
+ const startDate = getDate(activeCycle.start_date);
const daysLeft = findHowManyDaysLeft(activeCycle.end_date) ?? 0;
const cycleStatus = activeCycle.status.toLowerCase() as TCycleGroups;
@@@ -349,8 -327,8 +354,12 @@@
buttonVariant="background-with-text"
/>
{issue.target_date && (
- <Tooltip tooltipHeading="Target Date" tooltipContent={renderFormattedDate(issue.target_date)} isMobile={isMobile}>
- <Tooltip tooltipHeading="Target Date" tooltipContent={renderFormattedDate(issue.target_date)}>
- <div className="h-full flex items-center gap-1.5 rounded text-xs px-2 py-0.5 bg-custom-background-80 cursor-not-allowed">
++ <Tooltip
++ tooltipHeading="Target Date"
++ tooltipContent={renderFormattedDate(issue.target_date)}
++ isMobile={isMobile}
++ >
+ <div className="flex h-full cursor-not-allowed items-center gap-1.5 rounded bg-custom-background-80 px-2 py-0.5 text-xs">
<CalendarCheck className="h-3 w-3 flex-shrink-0" />
<span className="text-xs">{renderFormattedDateWithoutYear(issue.target_date)}</span>
</div>
diff --cc web/components/cycles/board/cycles-board-card.tsx
index c8ac630e7c,2b3e4bdc83..c1558c5b36
--- a/web/components/cycles/board/cycles-board-card.tsx
+++ b/web/components/cycles/board/cycles-board-card.tsx
@@@ -1,22 -1,23 +1,24 @@@
-import { FC, MouseEvent, useState } from "react";
-import { useRouter } from "next/router";
-import Link from "next/link";
+import { FC, MouseEvent } from "react";
import { observer } from "mobx-react";
+import Link from "next/link";
+import { useRouter } from "next/router";
// hooks
-import { useEventTracker, useCycle, useUser, useMember } from "hooks/store";
-import useToast from "hooks/use-toast";
+import { usePlatformOS } from "hooks/use-platform-os";
// components
-import { CycleCreateUpdateModal, CycleDeleteModal } from "components/cycles";
+import { Info, Star } from "lucide-react";
+import { Avatar, AvatarGroup, Tooltip, LayersIcon, CycleGroupIcon, setPromiseToast } from "@plane/ui";
+import { CycleQuickActions } from "components/cycles";
// ui
-import { Avatar, AvatarGroup, CustomMenu, Tooltip, LayersIcon, CycleGroupIcon } from "@plane/ui";
// icons
-import { Info, LinkIcon, Pencil, Star, Trash2 } from "lucide-react";
// helpers
+ import { findHowManyDaysLeft, getDate, renderFormattedDate } from "helpers/date-time.helper";
-import { copyTextToClipboard } from "helpers/string.helper";
++// import { copyTextToClipboard } from "helpers/string.helper";
+ // constants
import { CYCLE_STATUS } from "constants/cycle";
-import { EUserWorkspaceRoles } from "constants/workspace";
import { CYCLE_FAVORITED, CYCLE_UNFAVORITED } from "constants/event-tracker";
+import { EUserWorkspaceRoles } from "constants/workspace";
- import { findHowManyDaysLeft, renderFormattedDate } from "helpers/date-time.helper";
+// constants
+import { useEventTracker, useCycle, useUser, useMember } from "hooks/store";
//.types
import { TCycleGroups } from "@plane/types";
@@@ -45,8 -49,9 +47,9 @@@ export const CyclesBoardCard: FC<ICycle
if (!cycleDetails) return null;
const cycleStatus = cycleDetails.status.toLocaleLowerCase();
- const endDate = new Date(cycleDetails.end_date ?? "");
- const startDate = new Date(cycleDetails.start_date ?? "");
- const isCompleted = cycleStatus === "completed";
++ // const isCompleted = cycleStatus === "completed";
+ const endDate = getDate(cycleDetails.end_date);
+ const startDate = getDate(cycleDetails.start_date);
const isDateValid = cycleDetails.start_date || cycleDetails.end_date;
const isEditingAllowed = !!currentProjectRole && currentProjectRole >= EUserWorkspaceRoles.MEMBER;
diff --cc web/components/cycles/form.tsx
index d470b1bb93,9941d551d4..17953248a9
--- a/web/components/cycles/form.tsx
+++ b/web/components/cycles/form.tsx
@@@ -1,12 -1,11 +1,12 @@@
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
// components
+import { Button, Input, TextArea } from "@plane/ui";
import { DateRangeDropdown, ProjectDropdown } from "components/dropdowns";
// ui
-import { Button, Input, TextArea } from "@plane/ui";
// helpers
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
+import { shouldRenderProject } from "helpers/project.helper";
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
// types
import { ICycle } from "@plane/types";
diff --cc web/components/cycles/gantt-chart/cycles-list-layout.tsx
index 094fbea7bf,1467743198..6c439331dd
--- a/web/components/cycles/gantt-chart/cycles-list-layout.tsx
+++ b/web/components/cycles/gantt-chart/cycles-list-layout.tsx
@@@ -1,14 -1,16 +1,15 @@@
import { FC } from "react";
-import { useRouter } from "next/router";
import { observer } from "mobx-react-lite";
+import { useRouter } from "next/router";
// hooks
-import { useCycle, useUser } from "hooks/store";
-// components
-import { GanttChartRoot, IBlockUpdateData, CycleGanttSidebar } from "components/gantt-chart";
import { CycleGanttBlock } from "components/cycles";
+import { GanttChartRoot, IBlockUpdateData, CycleGanttSidebar } from "components/gantt-chart";
+import { useCycle } from "hooks/store";
+// components
// types
import { ICycle } from "@plane/types";
+ import { getDate } from "helpers/date-time.helper";
// constants
-import { EUserProjectRoles } from "constants/project";
type Props = {
workspaceSlug: string;
diff --cc web/components/cycles/list/cycles-list-item.tsx
index 8a5cee5352,98cf7b1aa3..cb1373a379
--- a/web/components/cycles/list/cycles-list-item.tsx
+++ b/web/components/cycles/list/cycles-list-item.tsx
@@@ -1,24 -1,25 +1,30 @@@
-import { FC, MouseEvent, useState } from "react";
+import { FC, MouseEvent } from "react";
+import { observer } from "mobx-react";
import Link from "next/link";
import { useRouter } from "next/router";
-import { observer } from "mobx-react";
// hooks
-import { useEventTracker, useCycle, useUser, useMember } from "hooks/store";
-import useToast from "hooks/use-toast";
+import { usePlatformOS } from "hooks/use-platform-os";
+import { Check, Info, Star, User2 } from "lucide-react";
+import { Tooltip, CircularProgressIndicator, CycleGroupIcon, AvatarGroup, Avatar, setPromiseToast } from "@plane/ui";
+import { CycleQuickActions } from "components/cycles";
+ // components
-import { CycleCreateUpdateModal, CycleDeleteModal } from "components/cycles";
++// import { CycleCreateUpdateModal, CycleDeleteModal } from "components/cycles";
+ // ui
-import { CustomMenu, Tooltip, CircularProgressIndicator, CycleGroupIcon, AvatarGroup, Avatar } from "@plane/ui";
+ // icons
-import { Check, Info, LinkIcon, Pencil, Star, Trash2, User2 } from "lucide-react";
+ // helpers
+ import { findHowManyDaysLeft, getDate, renderFormattedDate } from "helpers/date-time.helper";
-import { copyTextToClipboard } from "helpers/string.helper";
+ // constants
import { CYCLE_STATUS } from "constants/cycle";
-import { EUserWorkspaceRoles } from "constants/workspace";
+import { CYCLE_FAVORITED, CYCLE_UNFAVORITED } from "constants/event-tracker";
- import { findHowManyDaysLeft, renderFormattedDate } from "helpers/date-time.helper";
+import { useEventTracker, useCycle, useUser, useMember } from "hooks/store";
+// components
+// ui
+// icons
+// helpers
+// constants
// types
import { TCycleGroups } from "@plane/types";
-import { CYCLE_FAVORITED, CYCLE_UNFAVORITED } from "constants/event-tracker";
+import { EUserProjectRoles } from "constants/project";
type TCyclesListItem = {
cycleId: string;
@@@ -119,10 -137,10 +125,10 @@@ export const CyclesListItem: FC<TCycles
// TODO: change this logic once backend fix the response
const cycleStatus = cycleDetails.status ? (cycleDetails.status.toLocaleLowerCase() as TCycleGroups) : "draft";
const isCompleted = cycleStatus === "completed";
- const endDate = new Date(cycleDetails.end_date ?? "");
- const startDate = new Date(cycleDetails.start_date ?? "");
+ const endDate = getDate(cycleDetails.end_date);
+ const startDate = getDate(cycleDetails.start_date);
- const isEditingAllowed = !!currentProjectRole && currentProjectRole >= EUserWorkspaceRoles.MEMBER;
+ const isEditingAllowed = !!currentProjectRole && currentProjectRole >= EUserProjectRoles.MEMBER;
const cycleTotalIssues =
cycleDetails.backlog_issues +
diff --cc web/components/cycles/sidebar.tsx
index bdbe206fc8,56f137f8d3..f13427012c
--- a/web/components/cycles/sidebar.tsx
+++ b/web/components/cycles/sidebar.tsx
@@@ -12,20 -13,21 +12,20 @@@ import { Avatar, CustomMenu, Loader, La
import { SidebarProgressStats } from "components/core";
import ProgressChart from "components/core/sidebar/progress-chart";
import { CycleDeleteModal } from "components/cycles/delete-modal";
-// ui
-import { Avatar, CustomMenu, Loader, LayersIcon } from "@plane/ui";
-// icons
-import { ChevronDown, LinkIcon, Trash2, UserCircle2, AlertCircle, ChevronRight, CalendarClock } from "lucide-react";
+import { DateRangeDropdown } from "components/dropdowns";
+// constants
+import { CYCLE_STATUS } from "constants/cycle";
+import { CYCLE_UPDATED } from "constants/event-tracker";
+import { EUserWorkspaceRoles } from "constants/workspace";
// helpers
- import { findHowManyDaysLeft, renderFormattedPayloadDate } from "helpers/date-time.helper";
- import { copyUrlToClipboard } from "helpers/string.helper";
+// hooks
+import { useEventTracker, useCycle, useUser, useMember } from "hooks/store";
+// services
+import { CycleService } from "services/cycle.service";
+ import { findHowManyDaysLeft, getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
+ import { copyUrlToClipboard } from "helpers/string.helper";
// types
import { ICycle } from "@plane/types";
-// constants
-import { EUserWorkspaceRoles } from "constants/workspace";
-import { CYCLE_UPDATED } from "constants/event-tracker";
-// fetch-keys
-import { CYCLE_STATUS } from "constants/cycle";
-import { DateRangeDropdown } from "components/dropdowns";
type Props = {
cycleId: string;
diff --cc web/components/dashboard/widgets/issue-panels/issue-list-item.tsx
index a5279f715b,b269423c6f..47efb4d215
--- a/web/components/dashboard/widgets/issue-panels/issue-list-item.tsx
+++ b/web/components/dashboard/widgets/issue-panels/issue-list-item.tsx
@@@ -4,8 -4,8 +4,8 @@@ import { observer } from "mobx-react-li
// ui
import { Avatar, AvatarGroup, ControlLink, PriorityIcon } from "@plane/ui";
// helpers
- import { findTotalDaysInRange, renderFormattedDate } from "helpers/date-time.helper";
+import { useIssueDetail, useMember, useProject } from "hooks/store";
+ import { findTotalDaysInRange, getDate, renderFormattedDate } from "helpers/date-time.helper";
// types
import { TIssue, TWidgetIssue } from "@plane/types";
diff --cc web/components/dropdowns/date.tsx
index 049bf22502,80d2731fd5..4b09fc99f4
--- a/web/components/dropdowns/date.tsx
+++ b/web/components/dropdowns/date.tsx
@@@ -1,20 -1,20 +1,20 @@@
import React, { useRef, useState } from "react";
-import { Combobox } from "@headlessui/react";
import { DayPicker, Matcher } from "react-day-picker";
import { usePopper } from "react-popper";
+import { Combobox } from "@headlessui/react";
import { CalendarDays, X } from "lucide-react";
- // hooks
++// helpers
+import { cn } from "helpers/common.helper";
- import { renderFormattedDate } from "helpers/date-time.helper";
++import { renderFormattedDate, getDate } from "helpers/date-time.helper";
+ // hooks
import { useDropdownKeyDown } from "hooks/use-dropdown-key-down";
import useOutsideClickDetector from "hooks/use-outside-click-detector";
// components
import { DropdownButton } from "./buttons";
--// helpers
-import { getDate, renderFormattedDate } from "helpers/date-time.helper";
-import { cn } from "helpers/common.helper";
// types
+import { BUTTON_VARIANTS_WITH_TEXT } from "./constants";
import { TDropdownProps } from "./types";
// constants
-import { BUTTON_VARIANTS_WITH_TEXT } from "./constants";
type Props = TDropdownProps & {
clearIconClassName?: string;
diff --cc web/components/gantt-chart/views/month-view.ts
index 1e7e6d8781,8978dc3174..f2d54a9f8a
--- a/web/components/gantt-chart/views/month-view.ts
+++ b/web/components/gantt-chart/views/month-view.ts
@@@ -1,7 -1,8 +1,8 @@@
// types
+import { weeks, months } from "../data";
+ import { findTotalDaysInRange } from "helpers/date-time.helper";
import { ChartDataType, IGanttBlock } from "../types";
// data
-import { weeks, months } from "../data";
// helpers
import { generateDate, getWeekNumberByDate, getNumberOfDaysInMonth, getDatesBetweenTwoDates } from "./helpers";
@@@ -173,12 -174,13 +174,13 @@@ export const getMonthChartItemPositionW
itemStartDate.setHours(0, 0, 0, 0);
itemTargetDate.setHours(0, 0, 0, 0);
- // position code starts
- const positionTimeDifference: number = startDate.getTime() - itemStartDate.getTime();
- const positionDaysDifference: number = Math.abs(Math.floor(positionTimeDifference / (1000 * 60 * 60 * 24)));
+ const positionDaysDifference = findTotalDaysInRange(startDate, itemStartDate, false);
+
+ if (!positionDaysDifference) return;
+
scrollPosition = positionDaysDifference * chartData.data.width;
- var diffMonths = (itemStartDate.getFullYear() - startDate.getFullYear()) * 12;
+ let diffMonths = (itemStartDate.getFullYear() - startDate.getFullYear()) * 12;
diffMonths -= startDate.getMonth();
diffMonths += itemStartDate.getMonth();
diff --cc web/components/inbox/inbox-issue-actions.tsx
index 661bc2d724,aba20ba3c6..5d921dcd1f
--- a/web/components/inbox/inbox-issue-actions.tsx
+++ b/web/components/inbox/inbox-issue-actions.tsx
@@@ -14,12 -13,16 +14,14 @@@ import
DeleteInboxIssueModal,
SelectDuplicateInboxIssueModal,
} from "components/inbox";
-// ui
-import { Button } from "@plane/ui";
-// icons
-import { CheckCircle2, ChevronDown, ChevronUp, Clock, FileStack, Trash2, XCircle } from "lucide-react";
-// types
-import type { TInboxStatus, TInboxDetailedStatus } from "@plane/types";
-import { EUserProjectRoles } from "constants/project";
import { ISSUE_DELETED } from "constants/event-tracker";
+import { EUserProjectRoles } from "constants/project";
+// hooks
+import { useUser, useInboxIssues, useIssueDetail, useWorkspace, useEventTracker } from "hooks/store";
+// types
+import type { TInboxDetailedStatus } from "@plane/types";
+ //helpers
+ import { getDate } from "helpers/date-time.helper";
type TInboxIssueActionsHeader = {
workspaceSlug: string;
diff --cc web/components/issues/issue-detail/inbox/sidebar.tsx
index bf9e833cee,2b4da03538..b7cc0b7b0d
--- a/web/components/issues/issue-detail/inbox/sidebar.tsx
+++ b/web/components/issues/issue-detail/inbox/sidebar.tsx
@@@ -2,14 -2,14 +2,14 @@@ import React from "react"
import { observer } from "mobx-react-lite";
import { CalendarCheck2, Signal, Tag } from "lucide-react";
// hooks
-import { useIssueDetail, useProject, useProjectState } from "hooks/store";
// components
-import { IssueLabel, TIssueOperations } from "components/issues";
+import { DoubleCircleIcon, StateGroupIcon, UserGroupIcon } from "@plane/ui";
import { DateDropdown, PriorityDropdown, MemberDropdown, StateDropdown } from "components/dropdowns";
+import { IssueLabel, TIssueOperations } from "components/issues";
// icons
-import { DoubleCircleIcon, StateGroupIcon, UserGroupIcon } from "@plane/ui";
// helper
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
+import { useIssueDetail, useProject, useProjectState } from "hooks/store";
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
type Props = {
workspaceSlug: string;
diff --cc web/components/issues/issue-detail/sidebar.tsx
index 7eac649b30,8f565653aa..15b3e39f42
--- a/web/components/issues/issue-detail/sidebar.tsx
+++ b/web/components/issues/issue-detail/sidebar.tsx
@@@ -41,19 -28,19 +41,21 @@@ import
IssueLabel,
ArchiveIssueModal,
} from "components/issues";
- import { STATE_GROUPS } from "constants/state";
- // types
-// components
-import { IssueSubscription } from "./subscription";
-import { DateDropdown, EstimateDropdown, PriorityDropdown, MemberDropdown, StateDropdown } from "components/dropdowns";
-// icons
-import { ArchiveIcon, ContrastIcon, DiceIcon, DoubleCircleIcon, RelatedIcon, Tooltip, UserGroupIcon } from "@plane/ui";
+ // helpers
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
+ import { copyTextToClipboard } from "helpers/string.helper";
import { cn } from "helpers/common.helper";
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
import { shouldHighlightIssueDueDate } from "helpers/issue.helper";
- import { copyTextToClipboard } from "helpers/string.helper";
+ // types
+ import type { TIssueOperations } from "./root";
+ import { STATE_GROUPS } from "constants/state";
++// types
+import { useEstimate, useIssueDetail, useProject, useProjectState, useUser } from "hooks/store";
+// components
- import type { TIssueOperations } from "./root";
+import { IssueSubscription } from "./subscription";
+// icons
+// helpers
+// types
type Props = {
workspaceSlug: string;
diff --cc web/components/issues/issue-layouts/properties/all-properties.tsx
index 12666561cf,ba4917febf..3da83ca07f
--- a/web/components/issues/issue-layouts/properties/all-properties.tsx
+++ b/web/components/issues/issue-layouts/properties/all-properties.tsx
@@@ -14,20 -18,15 +14,24 @@@ import
CycleDropdown,
StateDropdown,
} from "components/dropdowns";
+ // helpers
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
-import { shouldHighlightIssueDueDate } from "helpers/issue.helper";
++
+ import { cn } from "helpers/common.helper";
+ // types
+ import { TIssue, IIssueDisplayProperties, TIssuePriorities } from "@plane/types";
+ // constants
import { ISSUE_UPDATED } from "constants/event-tracker";
import { EIssuesStoreType } from "constants/issue";
- import { cn } from "helpers/common.helper";
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
+import { shouldHighlightIssueDueDate } from "helpers/issue.helper";
+import { useEventTracker, useEstimate, useLabel, useIssues, useProjectState } from "hooks/store";
+import { usePlatformOS } from "hooks/use-platform-os";
+// components
- import { TIssue, IIssueDisplayProperties, TIssuePriorities } from "@plane/types";
+import { IssuePropertyLabels } from "../properties/labels";
+import { WithDisplayPropertiesHOC } from "../properties/with-display-properties-HOC";
+// helpers
+// types
+// constants
export interface IIssueProperties {
issue: TIssue;
diff --cc web/components/issues/issue-layouts/spreadsheet/columns/due-date-column.tsx
index adc4a971b1,cc45dc7b4d..202cbb8d5f
--- a/web/components/issues/issue-layouts/spreadsheet/columns/due-date-column.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/columns/due-date-column.tsx
@@@ -6,9 -7,8 +6,9 @@@ import { CalendarCheck2 } from "lucide-
import { DateDropdown } from "components/dropdowns";
// helpers
import { cn } from "helpers/common.helper";
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
- import { shouldHighlightIssueDueDate } from "helpers/issue.helper";
+import { useProjectState } from "hooks/store";
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
+ import { shouldHighlightIssueDueDate } from "helpers/issue.helper";
// types
import { TIssue } from "@plane/types";
diff --cc web/components/issues/issue-modal/form.tsx
index 7e38acc1cd,d18d53f1bf..e203652643
--- a/web/components/issues/issue-modal/form.tsx
+++ b/web/components/issues/issue-modal/form.tsx
@@@ -18,19 -26,10 +18,19 @@@ import
MemberDropdown,
StateDropdown,
} from "components/dropdowns";
-//ui
-import { Button, CustomMenu, Input, Loader, ToggleSwitch } from "@plane/ui";
+import { ParentIssuesListModal } from "components/issues";
+import { IssueLabelSelect } from "components/issues/select";
+import { CreateLabelModal } from "components/labels";
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
+import { useApplication, useEstimate, useIssueDetail, useMention, useProject, useWorkspace } from "hooks/store";
+// services
+import { AIService } from "services/ai.service";
+import { FileService } from "services/file.service";
+// components
+// ui
// helpers
-import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
+import { getChangedIssuefields } from "helpers/issue.helper";
+import { shouldRenderProject } from "helpers/project.helper";
++import { renderFormattedPayloadDate, getDate } from "helpers/date-time.helper";
// types
import type { TIssue, ISearchIssueResponse } from "@plane/types";
diff --cc web/components/issues/peek-overview/properties.tsx
index ba00755f41,d7723a5e07..f8e9aeb5a5
--- a/web/components/issues/peek-overview/properties.tsx
+++ b/web/components/issues/peek-overview/properties.tsx
@@@ -12,9 -12,9 +12,10 @@@ import
CalendarCheck2,
} from "lucide-react";
// hooks
-import { useIssueDetail, useProject, useProjectState } from "hooks/store";
// ui icons
import { DiceIcon, DoubleCircleIcon, UserGroupIcon, ContrastIcon, RelatedIcon } from "@plane/ui";
++// components
+import { DateDropdown, EstimateDropdown, PriorityDropdown, MemberDropdown, StateDropdown } from "components/dropdowns";
import {
IssueLinkRoot,
IssueCycleSelect,
@@@ -24,12 -24,12 +25,11 @@@
TIssueOperations,
IssueRelationSelect,
} from "components/issues";
-import { DateDropdown, EstimateDropdown, PriorityDropdown, MemberDropdown, StateDropdown } from "components/dropdowns";
--// components
- import { cn } from "helpers/common.helper";
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
// helpers
+ import { cn } from "helpers/common.helper";
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
import { shouldHighlightIssueDueDate } from "helpers/issue.helper";
+import { useIssueDetail, useProject, useProjectState } from "hooks/store";
interface IPeekOverviewProperties {
workspaceSlug: string;
diff --cc web/components/modules/form.tsx
index 8fa657b991,ead8c06594..e51aeecfff
--- a/web/components/modules/form.tsx
+++ b/web/components/modules/form.tsx
@@@ -1,13 -1,12 +1,13 @@@
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
--// components
-import { ModuleStatusSelect } from "components/modules";
-import { DateRangeDropdown, ProjectDropdown, MemberDropdown } from "components/dropdowns";
+ // ui
import { Button, Input, TextArea } from "@plane/ui";
++// components
+import { DateRangeDropdown, ProjectDropdown, MemberDropdown } from "components/dropdowns";
+import { ModuleStatusSelect } from "components/modules";
- // ui
// helpers
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
+import { shouldRenderProject } from "helpers/project.helper";
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
// types
import { IModule } from "@plane/types";
diff --cc web/components/modules/gantt-chart/modules-list-layout.tsx
index 6c680e1caf,9e2748ec54..eaf7016ca4
--- a/web/components/modules/gantt-chart/modules-list-layout.tsx
+++ b/web/components/modules/gantt-chart/modules-list-layout.tsx
@@@ -4,9 -4,10 +4,10 @@@ import { useRouter } from "next/router"
// components
import { GanttChartRoot, IBlockUpdateData, ModuleGanttSidebar } from "components/gantt-chart";
import { ModuleGanttBlock } from "components/modules";
+import { useModule, useProject } from "hooks/store";
// types
import { IModule } from "@plane/types";
+ import { getDate } from "helpers/date-time.helper";
export const ModulesListGanttChartView: React.FC = observer(() => {
// router
diff --cc web/components/modules/module-card-item.tsx
index 8ef3fe0246,1fee481ce5..c59cbbc296
--- a/web/components/modules/module-card-item.tsx
+++ b/web/components/modules/module-card-item.tsx
@@@ -1,22 -1,22 +1,22 @@@
import React, { useState } from "react";
+import { observer } from "mobx-react-lite";
import Link from "next/link";
import { useRouter } from "next/router";
-import { observer } from "mobx-react-lite";
import { Info, LinkIcon, Pencil, Star, Trash2 } from "lucide-react";
--// hooks
-import { useEventTracker, useMember, useModule, useUser } from "hooks/store";
-import useToast from "hooks/use-toast";
++// ui
+import { Avatar, AvatarGroup, CustomMenu, LayersIcon, Tooltip, TOAST_TYPE, setToast, setPromiseToast } from "@plane/ui";
+ // components
import { CreateUpdateModuleModal, DeleteModuleModal } from "components/modules";
-// ui
-import { Avatar, AvatarGroup, CustomMenu, LayersIcon, Tooltip } from "@plane/ui";
-// helpers
-import { copyUrlToClipboard } from "helpers/string.helper";
-import { getDate, renderFormattedDate } from "helpers/date-time.helper";
+ // constants
+import { MODULE_FAVORITED, MODULE_UNFAVORITED } from "constants/event-tracker";
import { MODULE_STATUS } from "constants/module";
import { EUserProjectRoles } from "constants/project";
- import { renderFormattedDate } from "helpers/date-time.helper";
-import { MODULE_FAVORITED, MODULE_UNFAVORITED } from "constants/event-tracker";
++// helpers
+import { copyUrlToClipboard } from "helpers/string.helper";
++import { getDate, renderFormattedDate } from "helpers/date-time.helper";
++// hooks
+import { useEventTracker, useMember, useModule, useUser } from "hooks/store";
+import { usePlatformOS } from "hooks/use-platform-os";
- // components
- // ui
- // helpers
- // constants
type Props = {
moduleId: string;
diff --cc web/components/modules/module-list-item.tsx
index 0b28712b06,1a9b6ac3f9..26d7fea12f
--- a/web/components/modules/module-list-item.tsx
+++ b/web/components/modules/module-list-item.tsx
@@@ -1,31 -1,22 +1,34 @@@
import React, { useState } from "react";
+import { observer } from "mobx-react-lite";
import Link from "next/link";
import { useRouter } from "next/router";
-import { observer } from "mobx-react-lite";
import { Check, Info, LinkIcon, Pencil, Star, Trash2, User2 } from "lucide-react";
--// hooks
-import { useModule, useUser, useEventTracker, useMember } from "hooks/store";
-import useToast from "hooks/use-toast";
-// components
-import { CreateUpdateModuleModal, DeleteModuleModal } from "components/modules";
+ // ui
-import { Avatar, AvatarGroup, CircularProgressIndicator, CustomMenu, Tooltip } from "@plane/ui";
+import {
+ Avatar,
+ AvatarGroup,
+ CircularProgressIndicator,
+ CustomMenu,
+ Tooltip,
+ TOAST_TYPE,
+ setToast,
+ setPromiseToast,
+} from "@plane/ui";
+import { CreateUpdateModuleModal, DeleteModuleModal } from "components/modules";
+import { MODULE_FAVORITED, MODULE_UNFAVORITED } from "constants/event-tracker";
+ // helpers
+ import { copyUrlToClipboard } from "helpers/string.helper";
+ import { getDate, renderFormattedDate } from "helpers/date-time.helper";
+ // constants
import { MODULE_STATUS } from "constants/module";
import { EUserProjectRoles } from "constants/project";
- import { renderFormattedDate } from "helpers/date-time.helper";
- import { copyUrlToClipboard } from "helpers/string.helper";
-import { MODULE_FAVORITED, MODULE_UNFAVORITED } from "constants/event-tracker";
++// hooks
+import { useModule, useUser, useEventTracker, useMember } from "hooks/store";
+import { usePlatformOS } from "hooks/use-platform-os";
+// components
+// ui
+// helpers
+// constants
type Props = {
moduleId: string;
diff --cc web/components/modules/sidebar.tsx
index 55be14a60a,1dbc71977f..885fad7455
--- a/web/components/modules/sidebar.tsx
+++ b/web/components/modules/sidebar.tsx
@@@ -14,33 -14,25 +14,33 @@@ import
Trash2,
UserCircle2,
} from "lucide-react";
-// hooks
-import { useModule, useUser, useEventTracker } from "hooks/store";
-import useToast from "hooks/use-toast";
+// ui
+import {
+ CustomMenu,
+ Loader,
+ LayersIcon,
+ CustomSelect,
+ ModuleStatusIcon,
+ UserGroupIcon,
+ TOAST_TYPE,
+ setToast,
+} from "@plane/ui";
// components
import { LinkModal, LinksList, SidebarProgressStats } from "components/core";
-import { DeleteModuleModal } from "components/modules";
import ProgressChart from "components/core/sidebar/progress-chart";
import { DateRangeDropdown, MemberDropdown } from "components/dropdowns";
-// ui
-import { CustomMenu, Loader, LayersIcon, CustomSelect, ModuleStatusIcon, UserGroupIcon } from "@plane/ui";
+import { DeleteModuleModal } from "components/modules";
+// constant
+import { MODULE_LINK_CREATED, MODULE_LINK_DELETED, MODULE_LINK_UPDATED, MODULE_UPDATED } from "constants/event-tracker";
+import { MODULE_STATUS } from "constants/module";
+import { EUserProjectRoles } from "constants/project";
// helpers
- import { renderFormattedPayloadDate } from "helpers/date-time.helper";
+ import { getDate, renderFormattedPayloadDate } from "helpers/date-time.helper";
import { copyUrlToClipboard } from "helpers/string.helper";
+// hooks
+import { useModule, useUser, useEventTracker } from "hooks/store";
// types
import { ILinkDetails, IModule, ModuleLink } from "@plane/types";
-// constant
-import { MODULE_STATUS } from "constants/module";
-import { EUserProjectRoles } from "constants/project";
-import { MODULE_LINK_CREATED, MODULE_LINK_DELETED, MODULE_LINK_UPDATED, MODULE_UPDATED } from "constants/event-tracker";
const defaultValues: Partial<IModule> = {
lead_id: "",
diff --cc web/helpers/filter.helper.ts
index d8804cabd7,624106ce33..2b8212f025
--- a/web/helpers/filter.helper.ts
+++ b/web/helpers/filter.helper.ts
@@@ -1,15 -1,9 +1,19 @@@
-// types
-import { IIssueFilterOptions } from "@plane/types";
import differenceInCalendarDays from "date-fns/differenceInCalendarDays";
++// helpers
+ import { getDate } from "./date-time.helper";
++// types
++// import { IIssueFilterOptions } from "@plane/types";
+
+type TFilters = {
+ [key: string]: string[] | null;
+};
-export const calculateTotalFilters = (filters: IIssueFilterOptions): number =>
+/**
+ * @description calculates the total number of filters applied
+ * @param {TFilters} filters
+ * @returns {number}
+ */
+export const calculateTotalFilters = (filters: TFilters): number =>
filters && Object.keys(filters).length > 0
? Object.keys(filters)
.map((key) =>
diff --cc web/helpers/issue.helper.ts
index cba9ced8d4,2af90481df..6615dcd4b0
--- a/web/helpers/issue.helper.ts
+++ b/web/helpers/issue.helper.ts
@@@ -1,12 -1,9 +1,13 @@@
-import { v4 as uuidv4 } from "uuid";
import differenceInCalendarDays from "date-fns/differenceInCalendarDays";
+import { v4 as uuidv4 } from "uuid";
// helpers
-import { getDate } from "./date-time.helper";
++import { getDate } from "helpers/date-time.helper";
+ import { orderArrayBy } from "helpers/array.helper";
// types
+import { IGanttBlock } from "components/gantt-chart";
+// constants
+import { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "constants/issue";
+import { STATE_GROUPS } from "constants/state";
- import { orderArrayBy } from "helpers/array.helper";
import {
TIssue,
TIssueGroupByOptions,
@@@ -168,37 -171,6 +171,37 @@@ export const renderIssueBlocksStructur
data: block,
id: block.id,
sort_order: block.sort_order,
- start_date: block.start_date ? new Date(block.start_date) : null,
- target_date: block.target_date ? new Date(block.target_date) : null,
+ start_date: getDate(block.start_date),
+ target_date: getDate(block.target_date),
}));
+
+export function getChangedIssuefields(formData: Partial<TIssue>, dirtyFields: { [key: string]: boolean | undefined }) {
+ const changedFields: Partial<TIssue> = {};
+
+ const dirtyFieldKeys = Object.keys(dirtyFields) as (keyof TIssue)[];
+ for (const dirtyField of dirtyFieldKeys) {
+ if (!!dirtyFields[dirtyField]) {
+ changedFields[dirtyField] = formData[dirtyField];
+ }
+ }
+
+ return changedFields;
+}
+
+export const formatTextList = (TextArray: string[]): string => {
+ const count = TextArray.length;
+ switch (count) {
+ case 0:
+ return "";
+ case 1:
+ return TextArray[0];
+ case 2:
+ return `${TextArray[0]} and ${TextArray[1]}`;
+ case 3:
+ return `${TextArray.slice(0, 2).join(", ")}, and ${TextArray[2]}`;
+ case 4:
+ return `${TextArray.slice(0, 3).join(", ")}, and ${TextArray[3]}`;
+ default:
+ return `${TextArray.slice(0, 3).join(", ")}, and +${count - 3} more`;
+ }
+};
diff --cc web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
index 16dba79b39,b7041d7c63..7560727021
--- a/web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
@@@ -1,33 -1,35 +1,34 @@@
-import { Sparkle } from "lucide-react";
+import { ReactElement, useEffect, useRef, useState } from "react";
+import { DocumentEditorWithRef, DocumentReadOnlyEditorWithRef } from "@plane/document-editor";
import { observer } from "mobx-react-lite";
-import useSWR from "swr";
import { useRouter } from "next/router";
-import { ReactElement, useEffect, useRef, useState } from "react";
import { Controller, useForm } from "react-hook-form";
+import useSWR from "swr";
+import { Sparkle } from "lucide-react";
// hooks
+import { Spinner, TOAST_TYPE, setToast } from "@plane/ui";
+import { GptAssistantPopover, PageHead } from "components/core";
+import { PageDetailsHeader } from "components/headers/page-details";
+import { IssuePeekOverview } from "components/issues";
+import { EUserProjectRoles } from "constants/project";
import { useApplication, usePage, useUser, useWorkspace } from "hooks/store";
+import { useProjectPages } from "hooks/store/use-project-specific-pages";
import useReloadConfirmations from "hooks/use-reload-confirmation";
-import useToast from "hooks/use-toast";
// services
+import { AppLayout } from "layouts/app-layout";
+import { NextPageWithLayout } from "lib/types";
import { FileService } from "services/file.service";
// layouts
-import { AppLayout } from "layouts/app-layout";
// components
-import { GptAssistantPopover, PageHead } from "components/core";
-import { PageDetailsHeader } from "components/headers/page-details";
// ui
-import { DocumentEditorWithRef, DocumentReadOnlyEditorWithRef } from "@plane/document-editor";
-import { Spinner } from "@plane/ui";
// assets
// helpers
+ import { getDate } from "helpers/date-time.helper";
// types
import { IPage } from "@plane/types";
-import { NextPageWithLayout } from "lib/types";
// fetch-keys
// constants
-import { EUserProjectRoles } from "constants/project";
-import { useProjectPages } from "hooks/store/use-project-specific-pages";
-import { IssuePeekOverview } from "components/issues";
// services
const fileService = new FileService();
diff --cc web/store/cycle.store.ts
index 71cb8f9247,a9058d7ac6..938264318d
--- a/web/store/cycle.store.ts
+++ b/web/store/cycle.store.ts
@@@ -1,20 -1,23 +1,22 @@@
import { isFuture, isPast, isToday } from "date-fns";
import set from "lodash/set";
import sortBy from "lodash/sortBy";
-// types
+import { action, computed, observable, makeObservable, runInAction } from "mobx";
+import { computedFn } from "mobx-utils";
- // types
- // mobx
+ // helpers
+ import { getDate } from "helpers/date-time.helper";
-// mobx
++import { orderCycles, shouldFilterCycle } from "helpers/cycle.helper";
// services
-import { ICycle, CycleDateCheckData } from "@plane/types";
+import { CycleService } from "services/cycle.service";
+import { IssueService } from "services/issue";
+import { ProjectService } from "services/project";
+ // mobx
import { RootStore } from "store/root.store";
-// services
-import { ProjectService } from "services/project";
-import { IssueService } from "services/issue";
-import { CycleService } from "services/cycle.service";
++// types
+import { ICycle, CycleDateCheckData } from "@plane/types";
- import { orderCycles, shouldFilterCycle } from "helpers/cycle.helper";
export interface ICycleStore {
- //Loaders
+ // loaders
loader: boolean;
// observables
fetchedMap: Record<string, boolean>;