🔥🔥🔥 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-4323] refactor: Analytics refactor (#7213)
JayashTripathy0fa9c8b0156d
diff --git a/packages/constants/src/analytics/common.ts b/packages/constants/src/analytics/common.tsindex cf0624e913..4ac8995238 100644--- a/packages/constants/src/analytics/common.ts+++ b/packages/constants/src/analytics/common.ts@@ -11,7 +11,7 @@ export interface IInsightField {};}-export const insightsFields: Record<TAnalyticsTabsBase, IInsightField[]> = {+export const ANALYTICS_INSIGHTS_FIELDS: Record<TAnalyticsTabsBase, IInsightField[]> = {overview: [{key: "total_users",diff --git a/packages/i18n/src/locales/ru/translations.json b/packages/i18n/src/locales/ru/translations.jsonindex d4067bd725..4dcb5d0e67 100644--- a/packages/i18n/src/locales/ru/translations.json+++ b/packages/i18n/src/locales/ru/translations.json@@ -881,7 +881,8 @@"completed": "Завершено","in_progress": "В процессе","planned": "Запланировано",- "paused": "На паузе"+ "paused": "На паузе",+ "no_of": "Количество {entity}"},"chart": {"x_axis": "Ось X",diff --git a/packages/propel/src/charts/bar-chart/root.tsx b/packages/propel/src/charts/bar-chart/root.tsxindex e3dbe1d8c2..8826a55cf7 100644--- a/packages/propel/src/charts/bar-chart/root.tsx+++ b/packages/propel/src/charts/bar-chart/root.tsx@@ -124,8 +124,8 @@ export const BarChart = React.memo(<K extends string, T extends string>(props: Tvalue: yAxis.label,angle: -90,position: "bottom",- offset: -24,- dx: -16,+ offset: yAxis.offset ?? -24,+ dx: yAxis.dx ?? -16,className: AXIS_LABEL_CLASSNAME,}}tick={(props) => <CustomYAxisTick {...props} />}diff --git a/packages/types/src/analytics.d.ts b/packages/types/src/analytics.d.tsindex dbcf52f36d..80c773fa2a 100644--- a/packages/types/src/analytics.d.ts+++ b/packages/types/src/analytics.d.ts@@ -4,6 +4,12 @@ import { Row } from "@tanstack/react-table";export type TAnalyticsTabsBase = "overview" | "work-items";export type TAnalyticsGraphsBase = "projects" | "work-items" | "custom-work-items";+export interface AnalyticsTab {+ key: TAnalyticsTabsBase;+ label: string;+ content: React.FC;+ isDisabled: boolean;+}export type TAnalyticsFilterParams = {project_ids?: string;cycle_id?: string;diff --git a/web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsx b/web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsxindex 389a80a901..7e9e0ac9e9 100644--- a/web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsx+++ b/web/app/(all)/[workspaceSlug]/(projects)/analytics/page.tsx@@ -14,7 +14,7 @@ import { ComicBoxButton, DetailedEmptyState } from "@/components/empty-state";// hooksimport { useCommandPalette, useEventTracker, useProject, useUserPermissions, useWorkspace } from "@/hooks/store";import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";-import { ANALYTICS_TABS } from "@/plane-web/components/analytics/tabs";+import { getAnalyticsTabs } from "@/plane-web/components/analytics/tabs";const AnalyticsPage = observer(() => {const router = useRouter();@@ -40,17 +40,20 @@ const AnalyticsPage = observer(() => {EUserPermissionsLevel.WORKSPACE);+ const ANALYTICS_TABS = useMemo(() => getAnalyticsTabs(t), [t]);+const tabs = useMemo(() =>ANALYTICS_TABS.map((tab) => ({key: tab.key,- label: t(tab.i18nKey),+ label: tab.label,content: <tab.content />,onClick: () => {router.push(`?tab=${tab.key}`);},+ isDisabled: tab.isDisabled,})),- [router, t]+ [ANALYTICS_TABS, router]);const defaultTab = searchParams.get("tab") || ANALYTICS_TABS[0].key;diff --git a/web/ce/components/analytics/tabs.ts b/web/ce/components/analytics/tabs.tsdeleted file mode 100644index 6f978a3c68..0000000000--- a/web/ce/components/analytics/tabs.ts+++ /dev/null@@ -1,12 +0,0 @@-import { TAnalyticsTabsBase } from "@plane/types";-import { Overview } from "@/components/analytics/overview";-import { WorkItems } from "@/components/analytics/work-items";-export const ANALYTICS_TABS: {- key: TAnalyticsTabsBase;- i18nKey: string;- content: React.FC;- isExtended?: boolean;-}[] = [- { key: "overview", i18nKey: "common.overview", content: Overview },- { key: "work-items", i18nKey: "sidebar.work_items", content: WorkItems },-];diff --git a/web/ce/components/analytics/tabs.tsx b/web/ce/components/analytics/tabs.tsxnew file mode 100644index 0000000000..eb8344c054--- /dev/null+++ b/web/ce/components/analytics/tabs.tsx@@ -0,0 +1,8 @@+import { AnalyticsTab } from "@plane/types";+import { Overview } from "@/components/analytics/overview";+import { WorkItems } from "@/components/analytics/work-items";++export const getAnalyticsTabs = (t: (key: string, params?: Record<string, any>) => string): AnalyticsTab[] => [+ { key: "overview", label: t("common.overview"), content: Overview, isDisabled: false },+ { key: "work-items", label: t("sidebar.work_items"), content: WorkItems, isDisabled: false },+];diff --git a/web/core/components/analytics/analytics-wrapper.tsx b/web/core/components/analytics/analytics-wrapper.tsxindex d6193a2b32..c86edb950f 100644--- a/web/core/components/analytics/analytics-wrapper.tsx+++ b/web/core/components/analytics/analytics-wrapper.tsx@@ -1,19 +1,20 @@import React from "react";// plane package imports+import { useTranslation } from "@plane/i18n";import { cn } from "@plane/utils";type Props = {- title: string;+ i18nTitle: string;children: React.ReactNode;className?: string;};const AnalyticsWrapper: React.FC<Props> = (props) => {- const { title, children, className } = props;-+ const { i18nTitle, children, className } = props;+ const { t } = useTranslation();return (<div className={cn("px-6 py-4", className)}>- <h1 className={"mb-4 text-2xl font-bold md:mb-6"}>{title}</h1>+ <h1 className={"mb-4 text-2xl font-bold md:mb-6"}>{t(i18nTitle)}</h1>{children}</div>);diff --git a/web/core/components/analytics/insight-table/data-table.tsx b/web/core/components/analytics/insight-table/data-table.tsxindex 35dc3b365e..8b1c1bab28 100644--- a/web/core/components/analytics/insight-table/data-table.tsx+++ b/web/core/components/analytics/insight-table/data-table.tsx@@ -131,7 +131,7 @@ export function DataTable<TData, TValue>({ columns, data, searchPlaceholder, act{table.getHeaderGroups().map((headerGroup) => (<TableRow key={headerGroup.id}>{headerGroup.headers.map((header) => (- <TableHead key={header.id} colSpan={header.colSpan}>+ <TableHead key={header.id} colSpan={header.colSpan} className="whitespace-nowrap">{header.isPlaceholder? null: (flexRender(header.column.columnDef.header, header.getContext()) as any)}diff --git a/web/core/components/analytics/overview/root.tsx b/web/core/components/analytics/overview/root.tsxindex 3856353aa5..b10bf32de7 100644--- a/web/core/components/analytics/overview/root.tsx+++ b/web/core/components/analytics/overview/root.tsx@@ -5,7 +5,7 @@ import ActiveProjects from "./active-projects";import ProjectInsights from "./project-insights";const Overview: React.FC = () => (- <AnalyticsWrapper title="Overview">+ <AnalyticsWrapper i18nTitle="common.overview"><div className="flex flex-col gap-14"><TotalInsights analyticsType="overview" /><div className="grid grid-cols-1 gap-14 md:grid-cols-5 ">diff --git a/web/core/components/analytics/total-insights.tsx b/web/core/components/analytics/total-insights.tsxindex 61f3e7205b..a5412dca38 100644--- a/web/core/components/analytics/total-insights.tsx+++ b/web/core/components/analytics/total-insights.tsx@@ -2,7 +2,7 @@import { observer } from "mobx-react-lite";import { useParams } from "next/navigation";import useSWR from "swr";-import { IInsightField, insightsFields } from "@plane/constants";+import { IInsightField, ANALYTICS_INSIGHTS_FIELDS } from "@plane/constants";import { useTranslation } from "@plane/i18n";import { IAnalyticsResponse, TAnalyticsTabsBase } from "@plane/types";//hooks@@ -80,13 +80,13 @@ const TotalInsights: React.FC<{className={cn("grid grid-cols-1 gap-8 sm:grid-cols-2 md:gap-10",!peekView- ? insightsFields[analyticsType]?.length % 5 === 0+ ? ANALYTICS_INSIGHTS_FIELDS[analyticsType]?.length % 5 === 0? "gap-10 lg:grid-cols-5": "gap-8 lg:grid-cols-4": "grid-cols-2")}>- {insightsFields[analyticsType]?.map((item) => (+ {ANALYTICS_INSIGHTS_FIELDS[analyticsType]?.map((item) => (<InsightCardkey={`${analyticsType}-${item.key}`}isLoading={isLoading}diff --git a/web/core/components/analytics/work-items/created-vs-resolved.tsx b/web/core/components/analytics/work-items/created-vs-resolved.tsxindex d5deb80e75..5db79a8158 100644--- a/web/core/components/analytics/work-items/created-vs-resolved.tsx+++ b/web/core/components/analytics/work-items/created-vs-resolved.tsx@@ -104,9 +104,9 @@ const CreatedVsResolved = observer(() => {}}yAxis={{key: "count",- label: t("no_of", { entity: isEpic ? t("epics") : t("work_items") }),- offset: -30,- dx: -22,+ label: t("common.no_of", { entity: isEpic ? t("epics") : t("work_items") }),+ offset: -60,+ dx: -24,}}legend={{align: "left",diff --git a/web/core/components/analytics/work-items/priority-chart.tsx b/web/core/components/analytics/work-items/priority-chart.tsxindex 354044bda7..5c00699783 100644--- a/web/core/components/analytics/work-items/priority-chart.tsx+++ b/web/core/components/analytics/work-items/priority-chart.tsx@@ -216,8 +216,8 @@ const PriorityChart = observer((props: Props) => {}}yAxis={{key: "count",- label: t("no_of", { entity: yAxisLabel.replace("_", " ") }),- offset: -40,+ label: t("common.no_of", { entity: yAxisLabel.replace("_", " ") }),+ offset: -60,dx: -26,}}/>diff --git a/web/core/components/analytics/work-items/root.tsx b/web/core/components/analytics/work-items/root.tsxindex 80e8aef620..c30a36d594 100644--- a/web/core/components/analytics/work-items/root.tsx+++ b/web/core/components/analytics/work-items/root.tsx@@ -6,7 +6,7 @@ import CustomizedInsights from "./customized-insights";import WorkItemsInsightTable from "./workitems-insight-table";const WorkItems: React.FC = () => (- <AnalyticsWrapper title="Work Items">+ <AnalyticsWrapper i18nTitle="sidebar.work_items"><div className="flex flex-col gap-14"><TotalInsights analyticsType="work-items" /><CreatedVsResolved />