π₯π₯π₯ 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
[WEB-4363]: Analytics tab improvements #7248
JayashTripathy22a9d48ca39a
diff --git a/web/app/(all)/[workspaceSlug]/(projects)/analytics/header.tsx b/web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/header.tsxsimilarity index 100%rename from web/app/(all)/[workspaceSlug]/(projects)/analytics/header.tsxrename to web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/header.tsxdiff --git a/web/app/(all)/[workspaceSlug]/(projects)/analytics/layout.tsx b/web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/layout.tsxsimilarity index 70%rename from web/app/(all)/[workspaceSlug]/(projects)/analytics/layout.tsxrename to web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/layout.tsxindex 6f087aa568..3a531a7b29 100644--- a/web/app/(all)/[workspaceSlug]/(projects)/analytics/layout.tsx+++ b/web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/layout.tsx@@ -1,10 +1,9 @@"use client";// componentsimport { AppHeader, ContentWrapper } from "@/components/core";-// plane web componentsimport { WorkspaceAnalyticsHeader } from "./header";-export default function WorkspaceAnalyticsLayout({ children }: { children: React.ReactNode }) {+export default function WorkspaceAnalyticsTabLayout({ children }: { children: React.ReactNode }) {return (<><AppHeader header={<WorkspaceAnalyticsHeader />} />diff --git a/web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsx b/web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/page.tsxsimilarity index 87%rename from web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsxrename to web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/page.tsxindex 7e9e0ac9e9..477534a593 100644--- a/web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsx+++ b/web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/page.tsx@@ -16,23 +16,32 @@ import { useCommandPalette, useEventTracker, useProject, useUserPermissions, useimport { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";import { getAnalyticsTabs } from "@/plane-web/components/analytics/tabs";-const AnalyticsPage = observer(() => {+type Props = {+ params: {+ tabId: string;+ };+};++const AnalyticsPage = observer((props: Props) => {+ // props+ const { params } = props;+ const { tabId } = params;++ // hooksconst router = useRouter();- const searchParams = useSearchParams();+// plane importsconst { t } = useTranslation();+// store hooksconst { toggleCreateProjectModal } = useCommandPalette();const { setTrackElement } = useEventTracker();const { workspaceProjectIds, loader } = useProject();const { currentWorkspace } = useWorkspace();const { allowPermissions } = useUserPermissions();+// helper hooksconst resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/onboarding/analytics" });- // derived values- const pageTitle = currentWorkspace?.name- ? t(`workspace_analytics.page_label`, { workspace: currentWorkspace?.name })- : undefined;// permissionsconst canPerformEmptyStateActions = allowPermissions(@@ -40,8 +49,11 @@ const AnalyticsPage = observer(() => {EUserPermissionsLevel.WORKSPACE);+ // derived values+ const pageTitle = currentWorkspace?.name+ ? t(`workspace_analytics.page_label`, { workspace: currentWorkspace?.name })+ : undefined;const ANALYTICS_TABS = useMemo(() => getAnalyticsTabs(t), [t]);-const tabs = useMemo(() =>ANALYTICS_TABS.map((tab) => ({@@ -49,13 +61,13 @@ const AnalyticsPage = observer(() => {label: tab.label,content: <tab.content />,onClick: () => {- router.push(`?tab=${tab.key}`);+ router.push(`/${currentWorkspace?.slug}/analytics/${tab.key}`);},isDisabled: tab.isDisabled,})),- [ANALYTICS_TABS, router]+ [ANALYTICS_TABS, router, currentWorkspace?.slug]);- const defaultTab = searchParams.get("tab") || ANALYTICS_TABS[0].key;+ const defaultTab = tabId || ANALYTICS_TABS[0].key;return (<>@@ -70,8 +82,9 @@ const AnalyticsPage = observer(() => {defaultTab={defaultTab}size="md"tabListContainerClassName="px-6 py-2 border-b border-custom-border-200 flex items-center justify-between"- tabListClassName="my-2 max-w-36"- tabPanelClassName="h-full w-full overflow-hidden overflow-y-auto"+ tabListClassName="my-2 w-auto"+ tabClassName="px-3"+ tabPanelClassName="h-full overflow-hidden overflow-y-auto px-2"storeInLocalStorage={false}actions={<AnalyticsFilterActions />}/>diff --git a/web/next.config.js b/web/next.config.jsindex 41ed049c55..34c3c3a7fc 100644--- a/web/next.config.js+++ b/web/next.config.js@@ -53,6 +53,11 @@ const nextConfig = {destination: "/:workspaceSlug/settings/projects/:projectId/:path*",permanent: true,},+ {+ source: "/:workspaceSlug/analytics",+ destination: "/:workspaceSlug/analytics/overview",+ permanent: true,+ },{source: "/:workspaceSlug/settings/api-tokens",destination: "/:workspaceSlug/settings/account/api-tokens",