From 1079dd3c38d6b850890c2344b1fb0dfddb83481e Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 15 Jan 2025 09:27:52 +0530 Subject: [PATCH 1/4] chore: empty state config updated --- web/core/constants/empty-state.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/web/core/constants/empty-state.ts b/web/core/constants/empty-state.ts index 2ec4cb417c3..7ba5a19255c 100644 --- a/web/core/constants/empty-state.ts +++ b/web/core/constants/empty-state.ts @@ -83,6 +83,9 @@ export enum EmptyStateType { ISSUE_RELATION_EMPTY_STATE = "issue-relation-empty-state", ISSUE_COMMENT_EMPTY_STATE = "issue-comment-empty-state", + EPIC_RELATION_SEARCH_EMPTY_STATE = "epic-relation-search-empty-state", + EPIC_RELATION_EMPTY_STATE = "epic-relation-empty-state", + NOTIFICATION_DETAIL_EMPTY_STATE = "notification-detail-empty-state", NOTIFICATION_ALL_EMPTY_STATE = "notification-all-empty-state", NOTIFICATION_MENTIONS_EMPTY_STATE = "notification-mentions-empty-state", @@ -639,7 +642,7 @@ const emptyStateDetails = { }, [EmptyStateType.ISSUE_RELATION_SEARCH_EMPTY_STATE]: { key: EmptyStateType.ISSUE_RELATION_SEARCH_EMPTY_STATE, - title: "No maching issues found", + title: "No matching issues found", path: "/empty-state/search/search", }, [EmptyStateType.ISSUE_RELATION_EMPTY_STATE]: { @@ -647,6 +650,18 @@ const emptyStateDetails = { title: "No issues found", path: "/empty-state/search/issues", }, + + [EmptyStateType.EPIC_RELATION_SEARCH_EMPTY_STATE]: { + key: EmptyStateType.EPIC_RELATION_SEARCH_EMPTY_STATE, + title: "No matching epics found", + path: "/empty-state/search/search", + }, + [EmptyStateType.EPIC_RELATION_EMPTY_STATE]: { + key: EmptyStateType.EPIC_RELATION_EMPTY_STATE, + title: "No epics found", + path: "/empty-state/search/issues", + }, + [EmptyStateType.ISSUE_COMMENT_EMPTY_STATE]: { key: EmptyStateType.ISSUE_COMMENT_EMPTY_STATE, title: "No comments yet", From 7507f8f5af7a9fbb4c17dd63c4358bff09110d29 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 15 Jan 2025 10:09:15 +0530 Subject: [PATCH 2/4] chore: code refactor --- web/core/components/dropdowns/date-range.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/core/components/dropdowns/date-range.tsx b/web/core/components/dropdowns/date-range.tsx index 453215e9947..5d5f2339d77 100644 --- a/web/core/components/dropdowns/date-range.tsx +++ b/web/core/components/dropdowns/date-range.tsx @@ -50,6 +50,7 @@ type Props = { to: Date | undefined; }; renderByDefault?: boolean; + renderPlaceholder?: boolean; }; export const DateRangeDropdown: React.FC = (props) => { @@ -82,6 +83,7 @@ export const DateRangeDropdown: React.FC = (props) => { tabIndex, value, renderByDefault = true, + renderPlaceholder = true, } = props; // states const [isOpen, setIsOpen] = useState(false); @@ -167,14 +169,14 @@ export const DateRangeDropdown: React.FC = (props) => { className={cn("h-full flex items-center justify-center gap-1 rounded-sm flex-grow", buttonFromDateClassName)} > {!hideIcon.from && icon} - {dateRange.from ? renderFormattedDate(dateRange.from) : placeholder.from} + {dateRange.from ? renderFormattedDate(dateRange.from) : renderPlaceholder ? placeholder.from : ""} {!hideIcon.to && icon} - {dateRange.to ? renderFormattedDate(dateRange.to) : placeholder.to} + {dateRange.to ? renderFormattedDate(dateRange.to) : renderPlaceholder ? placeholder.to : ""} From a895f185ee5c548dabf92adf983687e9b797f4d5 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 15 Jan 2025 12:02:22 +0530 Subject: [PATCH 3/4] chore: date range picker icon updated --- web/core/components/dropdowns/date-range.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web/core/components/dropdowns/date-range.tsx b/web/core/components/dropdowns/date-range.tsx index 5d5f2339d77..a7914701f3c 100644 --- a/web/core/components/dropdowns/date-range.tsx +++ b/web/core/components/dropdowns/date-range.tsx @@ -4,7 +4,7 @@ import React, { useEffect, useRef, useState } from "react"; import { Placement } from "@popperjs/core"; import { DateRange, DayPicker, Matcher } from "react-day-picker"; import { usePopper } from "react-popper"; -import { ArrowRight, CalendarDays } from "lucide-react"; +import { ArrowRight, CalendarCheck2, CalendarDays } from "lucide-react"; import { Combobox } from "@headlessui/react"; // ui import { Button, ComboDropDown } from "@plane/ui"; @@ -33,7 +33,6 @@ type Props = { from?: boolean; to?: boolean; }; - icon?: React.ReactNode; minDate?: Date; maxDate?: Date; onSelect: (range: DateRange | undefined) => void; @@ -69,7 +68,6 @@ export const DateRangeDropdown: React.FC = (props) => { from: true, to: true, }, - icon = , minDate, maxDate, onSelect, @@ -168,14 +166,14 @@ export const DateRangeDropdown: React.FC = (props) => { - {!hideIcon.from && icon} + {!hideIcon.from && } {dateRange.from ? renderFormattedDate(dateRange.from) : renderPlaceholder ? placeholder.from : ""} - {!hideIcon.to && icon} + {!hideIcon.to && } {dateRange.to ? renderFormattedDate(dateRange.to) : renderPlaceholder ? placeholder.to : ""} From b849e6840c401243cd33372cca5ed15d407cb910 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Wed, 15 Jan 2025 12:45:17 +0530 Subject: [PATCH 4/4] fix: tree map content css --- web/core/components/core/charts/tree-map/map-content.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/core/components/core/charts/tree-map/map-content.tsx b/web/core/components/core/charts/tree-map/map-content.tsx index e2f2959f74f..e7e1bfae165 100644 --- a/web/core/components/core/charts/tree-map/map-content.tsx +++ b/web/core/components/core/charts/tree-map/map-content.tsx @@ -196,7 +196,7 @@ export const CustomTreeMapContent: React.FC = ({ L${pX},${pY + LAYOUT.RADIUS} Q${pX},${pY} ${pX + LAYOUT.RADIUS},${pY} `} - className={cn("transition-colors duration-200 hover:opacity-90 cursor-pointer", fillClassName)} + className={cn("transition-colors duration-200 hover:opacity-90", fillClassName)} fill={fillColor ?? "currentColor"} /> @@ -269,7 +269,7 @@ export const CustomTreeMapContent: React.FC = ({ return ( - + {renderContent()} );