π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
chore: fix breadcrumbs inconsistency. (#4574)
Prateek Shourya571d35cd8b9d
diff --git a/web/components/headers/project-inbox.tsx b/web/components/headers/project-inbox.tsxindex d61e2492db..082720358c 100644--- a/web/components/headers/project-inbox.tsx+++ b/web/components/headers/project-inbox.tsx@@ -46,7 +46,7 @@ export const ProjectInboxHeader: FC = observer(() => {<Breadcrumbs.BreadcrumbItemtype="text"link={- <BreadcrumbLink label="Inbox Issues" icon={<LayersIcon className="h-4 w-4 text-custom-text-300" />} />+ <BreadcrumbLink label="Inbox" icon={<LayersIcon className="h-4 w-4 text-custom-text-300" />} />}/></Breadcrumbs>diff --git a/web/components/headers/project-settings.tsx b/web/components/headers/project-settings.tsxindex f25bfe8040..36b9cd2472 100644--- a/web/components/headers/project-settings.tsx+++ b/web/components/headers/project-settings.tsx@@ -2,22 +2,17 @@ import { FC } from "react";import { observer } from "mobx-react";import { useRouter } from "next/router";// ui+import { Settings } from "lucide-react";import { Breadcrumbs, CustomMenu } from "@plane/ui";-// helper+// componentsimport { BreadcrumbLink } from "@/components/common";import { ProjectLogo } from "@/components/project";+// constantsimport { EUserProjectRoles, PROJECT_SETTINGS_LINKS } from "@/constants/project";// hooksimport { useProject, useUser } from "@/hooks/store";-// constants-// components--export interface IProjectSettingHeader {- title: string;-}-export const ProjectSettingHeader: FC<IProjectSettingHeader> = observer((props) => {- const { title } = props;+export const ProjectSettingHeader: FC = observer(() => {// routerconst router = useRouter();const { workspaceSlug, projectId } = router.query;@@ -52,7 +47,12 @@ export const ProjectSettingHeader: FC<IProjectSettingHeader> = observer((props)}/><div className="hidden sm:hidden md:block lg:block">- <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label={title} />} />+ <Breadcrumbs.BreadcrumbItem+ type="text"+ link={+ <BreadcrumbLink label="Settings" icon={<Settings className="h-4 w-4 text-custom-text-300" />} />+ }+ /></div></Breadcrumbs></div>@@ -62,7 +62,7 @@ export const ProjectSettingHeader: FC<IProjectSettingHeader> = observer((props)maxHeight="lg"customButton={<span className="text-xs px-1.5 py-1 border rounded-md text-custom-text-200 border-custom-border-300">- {title}+ Settings</span>}placement="bottom-start"diff --git a/web/components/headers/workspace-settings.tsx b/web/components/headers/workspace-settings.tsxindex c73d06547c..2d3e9649e1 100644--- a/web/components/headers/workspace-settings.tsx+++ b/web/components/headers/workspace-settings.tsx@@ -1,21 +1,15 @@import { FC } from "react";-import { observer } from "mobx-react";-import { useRouter } from "next/router";+import { observer } from "mobx-react";;import { Settings } from "lucide-react";// uiimport { Breadcrumbs } from "@plane/ui";// componentsimport { BreadcrumbLink } from "@/components/common";+// hooks+import { useWorkspace } from "@/hooks/store";-export interface IWorkspaceSettingHeader {- title: string;-}--export const WorkspaceSettingHeader: FC<IWorkspaceSettingHeader> = observer((props) => {- const { title } = props;- const router = useRouter();-- const { workspaceSlug } = router.query;+export const WorkspaceSettingHeader: FC = observer(() => {+ const { currentWorkspace } = useWorkspace();return (<div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">@@ -26,13 +20,13 @@ export const WorkspaceSettingHeader: FC<IWorkspaceSettingHeader> = observer((protype="text"link={<BreadcrumbLink- href={`/${workspaceSlug}/settings`}- label="Settings"+ href={`/${currentWorkspace?.slug}/settings`}+ label={currentWorkspace?.name ?? "Workspace"}icon={<Settings className="h-4 w-4 text-custom-text-300" />}/>}/>- <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label={title} />} />+ <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label="Settings" />} /></Breadcrumbs></div></div>diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsxindex 0dfc55d023..060520fafb 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/automations.tsx@@ -63,7 +63,7 @@ const AutomationSettingsPage: NextPageWithLayout = observer(() => {AutomationSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<ProjectSettingHeader title="Automations Settings" />} withProjectWrapper>+ <AppLayout header={<ProjectSettingHeader />} withProjectWrapper><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsxindex 5872ed3227..83bd4fd259 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx@@ -35,7 +35,7 @@ const EstimatesSettingsPage: NextPageWithLayout = observer(() => {EstimatesSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<ProjectSettingHeader title="Estimates Settings" />} withProjectWrapper>+ <AppLayout header={<ProjectSettingHeader />} withProjectWrapper><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsxindex a9bffc2e2a..a55b58beb2 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx@@ -54,7 +54,7 @@ const FeaturesSettingsPage: NextPageWithLayout = observer(() => {FeaturesSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<ProjectSettingHeader title="Features Settings" />} withProjectWrapper>+ <AppLayout header={<ProjectSettingHeader />} withProjectWrapper><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsxindex 9a9db7f515..b07be48a5e 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx@@ -93,7 +93,7 @@ const GeneralSettingsPage: NextPageWithLayout = observer(() => {GeneralSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<ProjectSettingHeader title="General Settings" />} withProjectWrapper>+ <AppLayout header={<ProjectSettingHeader />} withProjectWrapper><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsxindex cf13b6d257..5c26443055 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx@@ -45,7 +45,7 @@ const LabelsSettingsPage: NextPageWithLayout = observer(() => {LabelsSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout withProjectWrapper header={<ProjectSettingHeader title="Labels Settings" />}>+ <AppLayout withProjectWrapper header={<ProjectSettingHeader />}><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsxindex dcc46ed2d5..6d60c0e763 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx@@ -31,7 +31,7 @@ const MembersSettingsPage: NextPageWithLayout = observer(() => {MembersSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<ProjectSettingHeader title="Members Settings" />} withProjectWrapper>+ <AppLayout header={<ProjectSettingHeader />} withProjectWrapper><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsxindex 19d1c03550..3a696cf8e9 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx@@ -32,7 +32,7 @@ const StatesSettingsPage: NextPageWithLayout = observer(() => {StatesSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout withProjectWrapper header={<ProjectSettingHeader title="States Settings" />}>+ <AppLayout withProjectWrapper header={<ProjectSettingHeader />}><ProjectSettingLayout>{page}</ProjectSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/api-tokens.tsx b/web/pages/[workspaceSlug]/settings/api-tokens.tsxindex 87ef162197..464c5e3736 100644--- a/web/pages/[workspaceSlug]/settings/api-tokens.tsx+++ b/web/pages/[workspaceSlug]/settings/api-tokens.tsx@@ -99,7 +99,7 @@ const ApiTokensPage: NextPageWithLayout = observer(() => {ApiTokensPage.getLayout = function getLayout(page: React.ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="API Tokens" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/billing.tsx b/web/pages/[workspaceSlug]/settings/billing.tsxindex 4bfe4ac416..583a78b17c 100644--- a/web/pages/[workspaceSlug]/settings/billing.tsx+++ b/web/pages/[workspaceSlug]/settings/billing.tsx@@ -59,7 +59,7 @@ const BillingSettingsPage: NextPageWithLayout = observer(() => {BillingSettingsPage.getLayout = function getLayout(page: React.ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Billing & Plans Settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/exports.tsx b/web/pages/[workspaceSlug]/settings/exports.tsxindex 9f462e6656..730f34e497 100644--- a/web/pages/[workspaceSlug]/settings/exports.tsx+++ b/web/pages/[workspaceSlug]/settings/exports.tsx@@ -50,7 +50,7 @@ const ExportsPage: NextPageWithLayout = observer(() => {ExportsPage.getLayout = function getLayout(page: React.ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Export Settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/imports.tsx b/web/pages/[workspaceSlug]/settings/imports.tsxindex d1f6573b48..2eda7cce24 100644--- a/web/pages/[workspaceSlug]/settings/imports.tsx+++ b/web/pages/[workspaceSlug]/settings/imports.tsx@@ -1,17 +1,17 @@import { observer } from "mobx-react";+// components+import { PageHead } from "@/components/core";+import { WorkspaceSettingHeader } from "@/components/headers";+import IntegrationGuide from "@/components/integration/guide";+// constants+import { EUserWorkspaceRoles } from "@/constants/workspace";// hooks-import { PageHead } from "components/core";-import { WorkspaceSettingHeader } from "components/headers";-import IntegrationGuide from "components/integration/guide";-import { EUserWorkspaceRoles } from "constants/workspace";-import { useUser, useWorkspace } from "hooks/store";+import { useUser, useWorkspace } from "@/hooks/store";// layouts-import { AppLayout } from "layouts/app-layout";-import { WorkspaceSettingLayout } from "layouts/settings-layout";-// components+import { AppLayout } from "@/layouts/app-layout";+import { WorkspaceSettingLayout } from "@/layouts/settings-layout";// types-import { NextPageWithLayout } from "lib/types";-// constants+import { NextPageWithLayout } from "@/lib/types";const ImportsPage: NextPageWithLayout = observer(() => {// store hooks@@ -49,7 +49,7 @@ const ImportsPage: NextPageWithLayout = observer(() => {ImportsPage.getLayout = function getLayout(page: React.ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Import Settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/index.tsx b/web/pages/[workspaceSlug]/settings/index.tsxindex dcd8a710bc..cbe92de615 100644--- a/web/pages/[workspaceSlug]/settings/index.tsx+++ b/web/pages/[workspaceSlug]/settings/index.tsx@@ -28,7 +28,7 @@ const WorkspaceSettingsPage: NextPageWithLayout = observer(() => {WorkspaceSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="General Settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/integrations.tsx b/web/pages/[workspaceSlug]/settings/integrations.tsxindex 9f06b92eec..702ca58847 100644--- a/web/pages/[workspaceSlug]/settings/integrations.tsx+++ b/web/pages/[workspaceSlug]/settings/integrations.tsx@@ -2,25 +2,23 @@ import { ReactElement } from "react";import { observer } from "mobx-react";import { useRouter } from "next/router";import useSWR from "swr";+// components+import { PageHead } from "@/components/core";+import { WorkspaceSettingHeader } from "@/components/headers";+import { SingleIntegrationCard } from "@/components/integration";+import { IntegrationAndImportExportBanner, IntegrationsSettingsLoader } from "@/components/ui";+// constants+import { APP_INTEGRATIONS } from "@/constants/fetch-keys";+import { EUserWorkspaceRoles } from "@/constants/workspace";// hooks-// services+import { useUser, useWorkspace } from "@/hooks/store";// layouts-// components-import { PageHead } from "components/core";-import { WorkspaceSettingHeader } from "components/headers";-import { SingleIntegrationCard } from "components/integration";-// ui-import { IntegrationAndImportExportBanner, IntegrationsSettingsLoader } from "components/ui";+import { AppLayout } from "@/layouts/app-layout";+import { WorkspaceSettingLayout } from "@/layouts/settings-layout";// types-// fetch-keys-import { APP_INTEGRATIONS } from "constants/fetch-keys";-// constants-import { EUserWorkspaceRoles } from "constants/workspace";-import { useUser, useWorkspace } from "hooks/store";-import { AppLayout } from "layouts/app-layout";-import { WorkspaceSettingLayout } from "layouts/settings-layout";-import { NextPageWithLayout } from "lib/types";-import { IntegrationService } from "services/integrations";+import { NextPageWithLayout } from "@/lib/types";+// services+import { IntegrationService } from "@/services/integrations";const integrationService = new IntegrationService();@@ -73,7 +71,7 @@ const WorkspaceIntegrationsPage: NextPageWithLayout = observer(() => {WorkspaceIntegrationsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Integrations Settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/members.tsx b/web/pages/[workspaceSlug]/settings/members.tsxindex e64a3e66f9..e01528ddc1 100644--- a/web/pages/[workspaceSlug]/settings/members.tsx+++ b/web/pages/[workspaceSlug]/settings/members.tsx@@ -122,7 +122,7 @@ const WorkspaceMembersSettingsPage: NextPageWithLayout = observer(() => {WorkspaceMembersSettingsPage.getLayout = function getLayout(page: ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Members Settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx b/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsxindex c326588ac0..71a16ea8ba 100644--- a/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx+++ b/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx@@ -107,7 +107,7 @@ const WebhookDetailsPage: NextPageWithLayout = observer(() => {WebhookDetailsPage.getLayout = function getLayout(page: React.ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Webhook settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);diff --git a/web/pages/[workspaceSlug]/settings/webhooks/index.tsx b/web/pages/[workspaceSlug]/settings/webhooks/index.tsxindex 05ac3a2b51..6046df7e15 100644--- a/web/pages/[workspaceSlug]/settings/webhooks/index.tsx+++ b/web/pages/[workspaceSlug]/settings/webhooks/index.tsx@@ -102,7 +102,7 @@ const WebhooksListPage: NextPageWithLayout = observer(() => {WebhooksListPage.getLayout = function getLayout(page: React.ReactElement) {return (- <AppLayout header={<WorkspaceSettingHeader title="Webhook settings" />}>+ <AppLayout header={<WorkspaceSettingHeader />}><WorkspaceSettingLayout>{page}</WorkspaceSettingLayout></AppLayout>);