diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx index 37eab6a22..564d06dc1 100644 --- a/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx +++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx @@ -3,8 +3,7 @@ // ui import { FC } from "react"; import { observer } from "mobx-react"; -import Link from "next/link"; -import { useParams } from "next/navigation"; +import { useParams, useRouter } from "next/navigation"; import { ChevronDown, PanelRight } from "lucide-react"; import { PROFILE_VIEWER_TAB, PROFILE_ADMINS_TAB, EUserPermissions, EUserPermissionsLevel } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; @@ -29,6 +28,7 @@ export const UserProfileHeader: FC = observer((props) => { const { userProjectsData, type = undefined, showProfileIssuesFilter } = props; // router const { workspaceSlug, userId } = useParams(); + const router = useRouter(); // store hooks const { toggleProfileSidebar, profileSidebarCollapsed } = useAppTheme(); const { data: currentUser } = useUser(); @@ -83,14 +83,12 @@ export const UserProfileHeader: FC = observer((props) => { > <> {tabsList.map((tab) => ( - - - {t(tab.i18n_label)} - + router.push(`/${workspaceSlug}/profile/${userId}/${tab.route}`)} + > + {t(tab.i18n_label)} ))} diff --git a/apps/web/core/components/issues/issue-detail/parent/sibling-item.tsx b/apps/web/core/components/issues/issue-detail/parent/sibling-item.tsx index d03bf7af4..667b22a94 100644 --- a/apps/web/core/components/issues/issue-detail/parent/sibling-item.tsx +++ b/apps/web/core/components/issues/issue-detail/parent/sibling-item.tsx @@ -2,7 +2,6 @@ import { FC } from "react"; import { observer } from "mobx-react"; -import Link from "next/link"; // ui import { CustomMenu } from "@plane/ui"; // helpers @@ -42,8 +41,11 @@ export const IssueParentSiblingItem: FC = observer((pro return ( <> - - + window.open(workItemLink, "_blank", "noopener,noreferrer")} + > +
{issueDetail.project_id && projectDetails?.identifier && ( = observer((pro textContainerClassName="text-xs" /> )} - +
); diff --git a/apps/web/core/components/workspace/sidebar/help-menu.tsx b/apps/web/core/components/workspace/sidebar/help-menu.tsx index 4a513aed7..eddcd8fc0 100644 --- a/apps/web/core/components/workspace/sidebar/help-menu.tsx +++ b/apps/web/core/components/workspace/sidebar/help-menu.tsx @@ -65,15 +65,13 @@ export const HelpMenu: React.FC = observer(() => { maxHeight="lg" closeOnSelect > - - + window.open("https://go.plane.so/p-docs", "_blank", "noopener,noreferrer")} + > + {config?.intercom_app_id && config?.is_intercom_enabled && ( @@ -87,15 +85,11 @@ export const HelpMenu: React.FC = observer(() => { )} - - + window.open("mailto:sales@plane.so", "_blank", "noopener,noreferrer")}> +
@@ -116,14 +110,12 @@ export const HelpMenu: React.FC = observer(() => { {t("whats_new")} - - + window.open("https://go.plane.so/p-discord", "_blank", "noopener,noreferrer")} + > +
diff --git a/apps/web/core/components/workspace/sidebar/help-section.tsx b/apps/web/core/components/workspace/sidebar/help-section.tsx index be132c963..886609666 100644 --- a/apps/web/core/components/workspace/sidebar/help-section.tsx +++ b/apps/web/core/components/workspace/sidebar/help-section.tsx @@ -68,15 +68,11 @@ export const SidebarHelpSection: React.FC = observer( maxHeight="lg" closeOnSelect > - - + window.open("https://go.plane.so/p-docs", "_blank")}> + {config?.intercom_app_id && config?.is_intercom_enabled && ( @@ -90,15 +86,11 @@ export const SidebarHelpSection: React.FC = observer( )} - - + window.open("mailto:sales@plane.so", "_blank")}> +
@@ -119,14 +111,10 @@ export const SidebarHelpSection: React.FC = observer( {t("whats_new")} - - + window.open("https://go.plane.so/p-discord", "_blank")}> +
diff --git a/apps/web/core/components/workspace/sidebar/help-section/root.tsx b/apps/web/core/components/workspace/sidebar/help-section/root.tsx index b73ae35ee..9618fc9b1 100644 --- a/apps/web/core/components/workspace/sidebar/help-section/root.tsx +++ b/apps/web/core/components/workspace/sidebar/help-section/root.tsx @@ -52,15 +52,11 @@ export const HelpMenuRoot = observer(() => { maxHeight="lg" closeOnSelect > - - + window.open("https://go.plane.so/p-docs", "_blank")}> + {config?.intercom_app_id && config?.is_intercom_enabled && ( @@ -74,15 +70,11 @@ export const HelpMenuRoot = observer(() => { )} - - + window.open("mailto:sales@plane.so", "_blank")}> +
@@ -103,14 +95,12 @@ export const HelpMenuRoot = observer(() => { {t("whats_new")} - - + window.open("https://go.plane.so/p-discord", "_blank", "noopener,noreferrer")} + > +
diff --git a/apps/web/core/components/workspace/sidebar/workspace-menu-header.tsx b/apps/web/core/components/workspace/sidebar/workspace-menu-header.tsx index bda8343ba..3adbd3789 100644 --- a/apps/web/core/components/workspace/sidebar/workspace-menu-header.tsx +++ b/apps/web/core/components/workspace/sidebar/workspace-menu-header.tsx @@ -1,7 +1,6 @@ import { FC, useState, useRef } from "react"; import { observer } from "mobx-react"; -import Link from "next/link"; -import { useParams } from "next/navigation"; +import { useParams, useRouter } from "next/navigation"; import { MoreHorizontal, ArchiveIcon, ChevronRight, Settings } from "lucide-react"; import { Disclosure } from "@headlessui/react"; // plane imports @@ -27,6 +26,7 @@ export const SidebarWorkspaceMenuHeader: FC = o const actionSectionRef = useRef(null); // hooks const { workspaceSlug } = useParams(); + const router = useRouter(); const { allowPermissions } = useUserPermissions(); const { t } = useTranslation(); @@ -66,23 +66,19 @@ export const SidebarWorkspaceMenuHeader: FC = o customButtonClassName="grid place-items-center" placement="bottom-start" > - - -
- - {t("archives")} -
- + router.push(`/${workspaceSlug}/projects/archives`)}> +
+ + {t("archives")} +
{isAdmin && ( - - -
- - {t("settings")} -
- + router.push(`/${workspaceSlug}/settings`)}> +
+ + {t("settings")} +
)}