fix naming conflicts

apps/client/src/App.tsx

@@ -40,7 +40,7 @@ import WorkspaceApiKeys from "@/ee/api-key/pages/workspace-api-keys";
 import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
 import BasePage from "@/ee/base/pages/base-page.tsx";
 import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
-import PageViewAnalytics from "@/ee/page-view/pages/page-view-analytics.tsx";
+import PageAnalytics from "@/ee/page-analytics/pages/page-analytics.tsx";
 import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
 import TemplateList from "@/ee/template/pages/template-list";
 import TemplateEditor from "@/ee/template/pages/template-editor";
@@ -128,7 +128,7 @@ export default function App() {
             <Route path={"ai"} element={<AiSettings />} />
             <Route path={"ai/mcp"} element={<AiSettings />} />
             <Route path={"audit"} element={<AuditLogs />} />
-            <Route path={"analytics"} element={<PageViewAnalytics />} />
+            <Route path={"analytics"} element={<PageAnalytics />} />
             <Route path={"verifications"} element={<VerifiedPages />} />
             {!isCloud() && <Route path={"license"} element={<License />} />}
             {isCloud() && <Route path={"billing"} element={<Billing />} />}

apps/client/src/components/settings/settings-queries.tsx

@@ -15,10 +15,10 @@ import { getAuditLogs } from "@/ee/audit/services/audit-service";
 import { getVerificationList } from "@/ee/page-verification/services/page-verification-service";
 import { getScimTokens } from "@/ee/scim/services/scim-token-service";
 import {
-  getWorkspacePageViewDailyStats,
-  getWorkspacePageViewTopPages,
-  getWorkspacePageViewTotals,
-} from "@/ee/page-view/services/page-view-analytics-service";
+  getWorkspacePageAnalyticsDailyStats,
+  getWorkspacePageAnalyticsTopPages,
+  getWorkspacePageAnalyticsTotals,
+} from "@/ee/page-analytics/services/page-analytics-service";
 
 export const prefetchWorkspaceMembers = () => {
   const params: QueryParams = { limit: 100, query: "" };
@@ -115,18 +115,18 @@ export const prefetchPageAnalytics = () => {
   const listParams = { ...dateRange, cursor: undefined, limit: 10 };
 
   queryClient.prefetchQuery({
-    queryKey: ["workspace-page-view-totals", dateRange],
-    queryFn: () => getWorkspacePageViewTotals(dateRange),
+    queryKey: ["workspace-page-analytics-totals", dateRange],
+    queryFn: () => getWorkspacePageAnalyticsTotals(dateRange),
   });
 
   queryClient.prefetchQuery({
-    queryKey: ["workspace-page-view-top-pages", listParams],
-    queryFn: () => getWorkspacePageViewTopPages(listParams),
+    queryKey: ["workspace-page-analytics-top-pages", listParams],
+    queryFn: () => getWorkspacePageAnalyticsTopPages(listParams),
   });
 
   queryClient.prefetchQuery({
-    queryKey: ["workspace-page-view-daily-stats", listParams],
-    queryFn: () => getWorkspacePageViewDailyStats(listParams),
+    queryKey: ["workspace-page-analytics-daily-stats", listParams],
+    queryFn: () => getWorkspacePageAnalyticsDailyStats(listParams),
   });
 };
 

apps/client/src/ee/features.ts

@@ -15,7 +15,7 @@ export const Feature = {
   SCIM: 'scim',
   PAGE_VERIFICATION: 'page:verification',
   AUDIT_LOGS: 'audit:logs',
-  PAGE_ANALYTICS: 'analytics:page-views',
+  PAGE_ANALYTICS: 'analytics:page-analytics',
   RETENTION: 'retention',
   SHARING_CONTROLS: 'sharing:controls',
   TEMPLATES: 'templates',

apps/client/src/ee/page-analytics/pages/page-analytics.tsx

@@ -16,10 +16,10 @@ import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import {
-  useWorkspacePageViewDailyStatsQuery,
-  useWorkspacePageViewTopPagesQuery,
-  useWorkspacePageViewTotalsQuery,
-} from "@/ee/page-view/queries/page-view-analytics-query";
+  useWorkspacePageAnalyticsDailyStatsQuery,
+  useWorkspacePageAnalyticsTopPagesQuery,
+  useWorkspacePageAnalyticsTotalsQuery,
+} from "@/ee/page-analytics/queries/page-analytics-query";
 import { Link } from "react-router-dom";
 import { formatLocalized, useDateFnsLocale } from "@/lib/date-locale";
 
@@ -39,7 +39,7 @@ function formatNumber(value: number | null | undefined): string {
   return Number(value ?? 0).toLocaleString();
 }
 
-export default function PageViewAnalytics() {
+export default function PageAnalytics() {
   const { t } = useTranslation();
   const locale = useDateFnsLocale();
   const [rangePreset, setRangePreset] = useState<RangePreset>("30");
@@ -97,11 +97,11 @@ export default function PageViewAnalytics() {
     [dateRange, dailyCursor]
   );
 
-  const { data: totalsData } = useWorkspacePageViewTotalsQuery(dateRange);
+  const { data: totalsData } = useWorkspacePageAnalyticsTotalsQuery(dateRange);
   const { data: topPagesData, isLoading: isTopPagesLoading } =
-    useWorkspacePageViewTopPagesQuery(topPagesParams);
+    useWorkspacePageAnalyticsTopPagesQuery(topPagesParams);
   const { data: dailyData, isLoading: isDailyLoading } =
-    useWorkspacePageViewDailyStatsQuery(dailyParams);
+    useWorkspacePageAnalyticsDailyStatsQuery(dailyParams);
 
   const handleRangeChange = (value: RangePreset) => {
     if (value) {

apps/client/src/ee/page-analytics/queries/page-analytics-query.ts

@@ -0,0 +1,44 @@
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import {
+  getWorkspacePageAnalyticsDailyStats,
+  getWorkspacePageAnalyticsTopPages,
+  getWorkspacePageAnalyticsTotals,
+} from "@/ee/page-analytics/services/page-analytics-service";
+import type { IPagination } from "@/lib/types";
+import type {
+  WorkspaceAnalyticsDailyStat,
+  WorkspaceAnalyticsListParams,
+  WorkspaceAnalyticsParams,
+  WorkspaceAnalyticsTopPage,
+  WorkspaceAnalyticsTotals,
+} from "@/ee/page-analytics/types/page-analytics.types";
+
+export function useWorkspacePageAnalyticsTotalsQuery(
+  params?: WorkspaceAnalyticsParams,
+) {
+  return useQuery<WorkspaceAnalyticsTotals, Error>({
+    queryKey: ["workspace-page-analytics-totals", params],
+    queryFn: () => getWorkspacePageAnalyticsTotals(params),
+    placeholderData: keepPreviousData,
+  });
+}
+
+export function useWorkspacePageAnalyticsDailyStatsQuery(
+  params?: WorkspaceAnalyticsListParams,
+) {
+  return useQuery<IPagination<WorkspaceAnalyticsDailyStat>, Error>({
+    queryKey: ["workspace-page-analytics-daily-stats", params],
+    queryFn: () => getWorkspacePageAnalyticsDailyStats(params),
+    placeholderData: keepPreviousData,
+  });
+}
+
+export function useWorkspacePageAnalyticsTopPagesQuery(
+  params?: WorkspaceAnalyticsListParams,
+) {
+  return useQuery<IPagination<WorkspaceAnalyticsTopPage>, Error>({
+    queryKey: ["workspace-page-analytics-top-pages", params],
+    queryFn: () => getWorkspacePageAnalyticsTopPages(params),
+    placeholderData: keepPreviousData,
+  });
+}

apps/client/src/ee/page-analytics/services/page-analytics-service.ts

@@ -6,25 +6,25 @@ import type {
   WorkspaceAnalyticsParams,
   WorkspaceAnalyticsTopPage,
   WorkspaceAnalyticsTotals,
-} from "@/ee/page-view/types/page-view-analytics.types";
+} from "@/ee/page-analytics/types/page-analytics.types";
 
-export async function getWorkspacePageViewTotals(
+export async function getWorkspacePageAnalyticsTotals(
   params?: WorkspaceAnalyticsParams,
 ): Promise<WorkspaceAnalyticsTotals> {
-  const req = await api.post("/page-views/workspace-stats", params);
+  const req = await api.post("/page-analytics/workspace-stats", params);
   return req.data;
 }
 
-export async function getWorkspacePageViewDailyStats(
+export async function getWorkspacePageAnalyticsDailyStats(
   params?: WorkspaceAnalyticsListParams,
 ): Promise<IPagination<WorkspaceAnalyticsDailyStat>> {
-  const req = await api.post("/page-views/workspace-daily-stats", params);
+  const req = await api.post("/page-analytics/workspace-daily-stats", params);
   return req.data;
 }
 
-export async function getWorkspacePageViewTopPages(
+export async function getWorkspacePageAnalyticsTopPages(
   params?: WorkspaceAnalyticsListParams,
 ): Promise<IPagination<WorkspaceAnalyticsTopPage>> {
-  const req = await api.post("/page-views/workspace-top-pages", params);
+  const req = await api.post("/page-analytics/workspace-top-pages", params);
   return req.data;
 }

apps/client/src/ee/page-view/queries/page-view-analytics-query.ts

@@ -1,44 +0,0 @@
-import { keepPreviousData, useQuery } from "@tanstack/react-query";
-import {
-  getWorkspacePageViewDailyStats,
-  getWorkspacePageViewTopPages,
-  getWorkspacePageViewTotals,
-} from "@/ee/page-view/services/page-view-analytics-service";
-import type { IPagination } from "@/lib/types";
-import type {
-  WorkspaceAnalyticsDailyStat,
-  WorkspaceAnalyticsListParams,
-  WorkspaceAnalyticsParams,
-  WorkspaceAnalyticsTopPage,
-  WorkspaceAnalyticsTotals,
-} from "@/ee/page-view/types/page-view-analytics.types";
-
-export function useWorkspacePageViewTotalsQuery(
-  params?: WorkspaceAnalyticsParams,
-) {
-  return useQuery<WorkspaceAnalyticsTotals, Error>({
-    queryKey: ["workspace-page-view-totals", params],
-    queryFn: () => getWorkspacePageViewTotals(params),
-    placeholderData: keepPreviousData,
-  });
-}
-
-export function useWorkspacePageViewDailyStatsQuery(
-  params?: WorkspaceAnalyticsListParams,
-) {
-  return useQuery<IPagination<WorkspaceAnalyticsDailyStat>, Error>({
-    queryKey: ["workspace-page-view-daily-stats", params],
-    queryFn: () => getWorkspacePageViewDailyStats(params),
-    placeholderData: keepPreviousData,
-  });
-}
-
-export function useWorkspacePageViewTopPagesQuery(
-  params?: WorkspaceAnalyticsListParams,
-) {
-  return useQuery<IPagination<WorkspaceAnalyticsTopPage>, Error>({
-    queryKey: ["workspace-page-view-top-pages", params],
-    queryFn: () => getWorkspacePageViewTopPages(params),
-    placeholderData: keepPreviousData,
-  });
-}