diff --git a/web/core/components/workspace/sidebar/projects-list-item.tsx b/web/core/components/workspace/sidebar/projects-list-item.tsx index 33c4947d2..ad53af182 100644 --- a/web/core/components/workspace/sidebar/projects-list-item.tsx +++ b/web/core/components/workspace/sidebar/projects-list-item.tsx @@ -351,11 +351,11 @@ export const SidebarProjectsListItem: React.FC = observer((props) => { className="grid place-items-center p-0.5 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 rounded" onClick={() => setIsMenuActive(!isMenuActive)} > - + } className={cn( - "opacity-0 pointer-events-none flex-shrink-0 mr-1 group-hover/project-item:opacity-100 group-hover/project-item:pointer-events-auto", + "opacity-0 pointer-events-none flex-shrink-0 group-hover/project-item:opacity-100 group-hover/project-item:pointer-events-auto", { "opacity-100 pointer-events-auto": isMenuActive, } @@ -404,7 +404,6 @@ export const SidebarProjectsListItem: React.FC = observer((props) => { Copy link - {!isViewerOrGuest && ( diff --git a/web/core/components/workspace/sidebar/projects-list.tsx b/web/core/components/workspace/sidebar/projects-list.tsx index 6602028ea..07ef1c797 100644 --- a/web/core/components/workspace/sidebar/projects-list.tsx +++ b/web/core/components/workspace/sidebar/projects-list.tsx @@ -220,21 +220,23 @@ export const SidebarProjectsList: FC = observer(() => { {isCollapsed ? : section.title} - {!isCollapsed && isAuthorizedUser && ( + {!isCollapsed && (
- - - + {isAuthorizedUser && ( + + + + )} { {isAuthorizedUser && joinedProjects?.length === 0 && ( )}
diff --git a/web/core/components/workspace/sidebar/quick-actions.tsx b/web/core/components/workspace/sidebar/quick-actions.tsx index 1f63c4798..eebc03917 100644 --- a/web/core/components/workspace/sidebar/quick-actions.tsx +++ b/web/core/components/workspace/sidebar/quick-actions.tsx @@ -8,11 +8,10 @@ import { TIssue } from "@plane/types"; import { CreateUpdateIssueModal } from "@/components/issues"; // constants import { EIssuesStoreType } from "@/constants/issue"; -import { EUserWorkspaceRoles } from "@/constants/workspace"; // helpers import { cn } from "@/helpers/common.helper"; // hooks -import { useAppTheme, useCommandPalette, useEventTracker, useProject, useUser } from "@/hooks/store"; +import { useAppTheme, useCommandPalette, useEventTracker, useProject } from "@/hooks/store"; import useLocalStorage from "@/hooks/use-local-storage"; export const SidebarQuickActions = observer(() => { @@ -30,16 +29,11 @@ export const SidebarQuickActions = observer(() => { const { sidebarCollapsed: isSidebarCollapsed } = useAppTheme(); const { setTrackElement } = useEventTracker(); const { joinedProjectIds } = useProject(); - const { - membership: { currentWorkspaceRole }, - } = useUser(); // local storage const { storedValue, setValue } = useLocalStorage>>("draftedIssue", {}); // derived values const disabled = joinedProjectIds.length === 0; const workspaceDraftIssue = workspaceSlug ? storedValue?.[workspaceSlug] ?? undefined : undefined; - // auth - const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER; const handleMouseEnter = () => { // if enter before time out clear the timeout @@ -74,66 +68,64 @@ export const SidebarQuickActions = observer(() => { "flex-col gap-0": isSidebarCollapsed, })} > - {isAuthorizedUser && ( -
+ - {!disabled && workspaceDraftIssue && ( - <> - {!isSidebarCollapsed && ( - - )} - {isDraftButtonOpen && ( -
-
- -
-
- )} - + } )} -
- )} + onClick={() => { + setTrackElement("APP_SIDEBAR_QUICK_ACTIONS"); + toggleCreateIssueModal(true, EIssuesStoreType.PROJECT); + }} + disabled={disabled} + > + + {!isSidebarCollapsed && New issue} + + {!disabled && workspaceDraftIssue && ( + <> + {!isSidebarCollapsed && ( + + )} + {isDraftButtonOpen && ( +
+
+ +
+
+ )} + + )} +