From eb2b5f40e07d625fec5209d7093f58dc4995ad4e Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Fri, 7 Mar 2025 16:51:39 +0530 Subject: [PATCH] cherry-pick: bugfixes in 1.8.2 from preview --- .../components/workspace/sidebar/projects-list.tsx | 4 +--- .../epics/details/sidebar/activity/comment-block.tsx | 9 ++++++++- .../details/sidebar/activity/comment-block.tsx | 10 ++++++++-- .../overview/sidebar/comments/comment-block.tsx | 9 ++++++++- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/web/core/components/workspace/sidebar/projects-list.tsx b/web/core/components/workspace/sidebar/projects-list.tsx index f3e9f36fa5..bde475f486 100644 --- a/web/core/components/workspace/sidebar/projects-list.tsx +++ b/web/core/components/workspace/sidebar/projects-list.tsx @@ -26,11 +26,9 @@ import { useAppTheme, useCommandPalette, useEventTracker, useProject, useUserPer import { TProject } from "@/plane-web/types"; export const SidebarProjectsList: FC = observer(() => { - // get local storage data for isFavoriteProjectsListOpen and isAllProjectsListOpen - const isAllProjectsListOpenInLocalStorage = localStorage.getItem("isAllProjectsListOpen"); // states - const [isAllProjectsListOpen, setIsAllProjectsListOpen] = useState(isAllProjectsListOpenInLocalStorage === "true"); + const [isAllProjectsListOpen, setIsAllProjectsListOpen] = useState(true); const [isProjectModalOpen, setIsProjectModalOpen] = useState(false); const [isScrolled, setIsScrolled] = useState(false); // scroll animation state // refs diff --git a/web/ee/components/epics/details/sidebar/activity/comment-block.tsx b/web/ee/components/epics/details/sidebar/activity/comment-block.tsx index 6c38f25770..9cca3526b5 100644 --- a/web/ee/components/epics/details/sidebar/activity/comment-block.tsx +++ b/web/ee/components/epics/details/sidebar/activity/comment-block.tsx @@ -1,7 +1,9 @@ import { FC, ReactNode } from "react"; import { observer } from "mobx-react"; +// plane imports import { TIssueComment } from "@plane/types"; import { Avatar } from "@plane/ui"; +import { getFileURL } from "@plane/utils"; // helpers import { renderFormattedDate } from "@/helpers/date-time.helper"; // hooks @@ -23,7 +25,12 @@ export const IssueCommentBlock: FC = observer((props) => { return (
- +
diff --git a/web/ee/components/initiatives/details/sidebar/activity/comment-block.tsx b/web/ee/components/initiatives/details/sidebar/activity/comment-block.tsx index b3fdcdedf6..0353fedc41 100644 --- a/web/ee/components/initiatives/details/sidebar/activity/comment-block.tsx +++ b/web/ee/components/initiatives/details/sidebar/activity/comment-block.tsx @@ -1,7 +1,7 @@ import { FC, ReactNode } from "react"; import { observer } from "mobx-react"; import { Avatar } from "@plane/ui"; -import { renderFormattedDate } from "@plane/utils"; +import { getFileURL, renderFormattedDate } from "@plane/utils"; // hooks import { useMember } from "@/hooks/store"; // Plane-web @@ -18,12 +18,18 @@ export const IssueCommentBlock: FC = observer((props) = const { getUserDetails } = useMember(); const userDetails = getUserDetails(comment?.actor); + if (!comment || !userDetails) return <>; return (
- +
diff --git a/web/ee/components/teamspaces/overview/sidebar/comments/comment-block.tsx b/web/ee/components/teamspaces/overview/sidebar/comments/comment-block.tsx index 8e88d91ea7..a0ba358e94 100644 --- a/web/ee/components/teamspaces/overview/sidebar/comments/comment-block.tsx +++ b/web/ee/components/teamspaces/overview/sidebar/comments/comment-block.tsx @@ -1,6 +1,8 @@ import { FC, ReactNode } from "react"; import { observer } from "mobx-react"; +// plane imports import { Avatar } from "@plane/ui"; +import { getFileURL } from "@plane/utils"; // helpers import { renderFormattedDate } from "@/helpers/date-time.helper"; // hooks @@ -24,7 +26,12 @@ export const TeamspaceCommentBlock: FC = observer((props return (
- +