feat: projects selector replace

2026-01-07 16:08:26 +03:00
parent 7e0c9e368e
commit 646e97df3e
15 changed files with 48 additions and 48 deletions
--- a/app/dashboard/[workspaceId]/analytics/channels/page.tsx
+++ b/app/dashboard/[workspaceId]/analytics/channels/page.tsx
@@ -16,6 +16,7 @@ import {
 import { DashboardHeader } from "@/components/layout/dashboard-header";
 import { useWorkspace } from "@/components/providers/workspace-provider";
 import { demoAwareAnalyticsApi } from "@/lib/demo";
+import { ProjectSelector } from "@/components/project-selector";
 import {
  Card,
  CardContent,
@@ -169,13 +170,16 @@ export default function ChannelsAnalyticsPage() {
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
-        <div>
-          <h1 className="text-2xl font-bold tracking-tight">
-            Аналитика по каналам
-          </h1>
-          <p className="text-muted-foreground">
-            Эффективность каналов размещения
-          </p>
+        <div className="flex items-center justify-between">
+          <div>
+            <h1 className="text-2xl font-bold tracking-tight">
+              Аналитика по каналам
+            </h1>
+            <p className="text-muted-foreground">
+              Эффективность каналов размещения
+            </p>
+          </div>
+          <ProjectSelector />
        </div>

        {loading ? (
--- a/app/dashboard/[workspaceId]/analytics/creatives/page.tsx
+++ b/app/dashboard/[workspaceId]/analytics/creatives/page.tsx
@@ -17,6 +17,7 @@ import {
 import { DashboardHeader } from "@/components/layout/dashboard-header";
 import { useWorkspace } from "@/components/providers/workspace-provider";
 import { demoAwareAnalyticsApi } from "@/lib/demo";
+import { ProjectSelector } from "@/components/project-selector";
 import {
  Card,
  CardContent,
@@ -189,13 +190,16 @@ export default function CreativesAnalyticsPage() {
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
-        <div>
-          <h1 className="text-2xl font-bold tracking-tight">
-            Аналитика по креативам
-          </h1>
-          <p className="text-muted-foreground">
-            Сравнение эффективности рекламных материалов
-          </p>
+        <div className="flex items-center justify-between">
+          <div>
+            <h1 className="text-2xl font-bold tracking-tight">
+              Аналитика по креативам
+            </h1>
+            <p className="text-muted-foreground">
+              Сравнение эффективности рекламных материалов
+            </p>
+          </div>
+          <ProjectSelector />
        </div>

        {loading ? (
--- a/app/dashboard/[workspaceId]/analytics/page.tsx
+++ b/app/dashboard/[workspaceId]/analytics/page.tsx
@@ -19,6 +19,7 @@ import {
 import { DashboardHeader } from "@/components/layout/dashboard-header";
 import { useWorkspace } from "@/components/providers/workspace-provider";
 import { demoAwareAnalyticsApi } from "@/lib/demo";
+import { ProjectSelector } from "@/components/project-selector";
 import {
  Card,
  CardContent,
@@ -26,7 +27,6 @@ import {
  CardHeader,
  CardTitle,
 } from "@/components/ui/card";
-import { Badge } from "@/components/ui/badge";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import type { SpendingAnalytics } from "@/lib/types/api";

@@ -97,13 +97,6 @@ export default function AnalyticsPage() {
      ? (spending.total_cost / spending.total_views) * 1000
      : null;

-  // Selection info text
-  const selectionText = allProjectsSelected 
-    ? "Все проекты" 
-    : selectedProjects.length === 1 
-      ? selectedProjects[0].title 
-      : `${selectedProjects.length} проекта`;
-
  return (
    <>
      <DashboardHeader
@@ -121,9 +114,7 @@ export default function AnalyticsPage() {
              Обзор эффективности рекламных размещений
            </p>
          </div>
-          <Badge variant="outline" className="text-sm">
-            {selectionText}
-          </Badge>
+          <ProjectSelector />
        </div>

        {selectedProjects.length > 1 && !allProjectsSelected && (
--- a/app/dashboard/[workspaceId]/analytics/spending/page.tsx
+++ b/app/dashboard/[workspaceId]/analytics/spending/page.tsx
@@ -20,6 +20,7 @@ import {
 import { DashboardHeader } from "@/components/layout/dashboard-header";
 import { useWorkspace } from "@/components/providers/workspace-provider";
 import { demoAwareAnalyticsApi } from "@/lib/demo";
+import { ProjectSelector } from "@/components/project-selector";
 import {
  Card,
  CardContent,
@@ -288,16 +289,19 @@ export default function SpendingAnalyticsPage() {
            <h1 className="text-2xl font-bold tracking-tight">Динамика расходов</h1>
            <p className="text-muted-foreground">Анализ расходов по периодам</p>
          </div>
-          <Select value={grouping} onValueChange={(v) => setGrouping(v as DateGrouping)}>
-            <SelectTrigger className="w-[180px]">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="day">По дням</SelectItem>
-              <SelectItem value="week">По неделям</SelectItem>
-              <SelectItem value="month">По месяцам</SelectItem>
-            </SelectContent>
-          </Select>
+          <div className="flex items-center gap-2">
+            <ProjectSelector />
+            <Select value={grouping} onValueChange={(v) => setGrouping(v as DateGrouping)}>
+              <SelectTrigger className="w-[180px]">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="day">По дням</SelectItem>
+                <SelectItem value="week">По неделям</SelectItem>
+                <SelectItem value="month">По месяцам</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
        </div>

        {loading ? (
--- a/app/dashboard/[workspaceId]/channels/page.tsx
+++ b/app/dashboard/[workspaceId]/channels/page.tsx
@@ -168,7 +168,6 @@ export default function ChannelsCatalogPage() {
          { label: "Главная", href: `/dashboard/${workspaceId}` },
          { label: "Каталог каналов" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
--- a/app/dashboard/[workspaceId]/creatives/page.tsx
+++ b/app/dashboard/[workspaceId]/creatives/page.tsx
@@ -71,6 +71,7 @@ import {
  DialogTitle,
 } from "@/components/ui/dialog";
 import { BOT_USERNAME } from "@/lib/utils/constants";
+import { ProjectSelector } from "@/components/project-selector";
 import type { Creative, CreativeAnalyticsItem } from "@/lib/types/api";

 // ============================================================================
@@ -287,6 +288,7 @@ export default function CreativesPage() {
              className="pl-10"
            />
          </div>
+          <ProjectSelector />
          <div className="flex items-center gap-2">
            <Checkbox
              id="include-archived"
--- a/app/dashboard/[workspaceId]/page.tsx
+++ b/app/dashboard/[workspaceId]/page.tsx
@@ -35,6 +35,7 @@ type DateRangeType = {
 import { DashboardHeader } from "@/components/layout/dashboard-header";
 import { useWorkspace } from "@/components/providers/workspace-provider";
 import { demoAwareAnalyticsApi } from "@/lib/demo";
+import { ProjectSelector } from "@/components/project-selector";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import {
  ChartContainer,
@@ -300,7 +301,9 @@ export default function DashboardPage() {
            <p className="text-sm text-muted-foreground">Статистика за период</p>
            <p className="text-base font-semibold">{dateRangeLabel}</p>
          </div>
-          <Popover>
+          <div className="flex items-center gap-2">
+            <ProjectSelector />
+            <Popover>
            <PopoverTrigger asChild>
              <Button
                variant="outline"
@@ -336,6 +339,7 @@ export default function DashboardPage() {
              />
            </PopoverContent>
          </Popover>
+          </div>
        </div>

        {/* Строка 1 — компактные показатели */}
--- a/app/dashboard/[workspaceId]/placements/page.tsx
+++ b/app/dashboard/[workspaceId]/placements/page.tsx
@@ -55,6 +55,7 @@ import {
 } from "@/components/ui/tooltip";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
+import { ProjectSelector } from "@/components/project-selector";
 import type { Placement } from "@/lib/types/api";

 // ============================================================================
@@ -498,6 +499,7 @@ export default function PlacementsPage() {
              className="pl-10"
            />
          </div>
+          <ProjectSelector />
          <div className="flex items-center gap-2">
            <Checkbox
              id="include-archived"
--- a/app/dashboard/[workspaceId]/projects/page.tsx
+++ b/app/dashboard/[workspaceId]/projects/page.tsx
@@ -148,7 +148,6 @@ export default function ProjectsPage() {
          { label: "Главная", href: `/dashboard/${currentWorkspace?.id}` },
          { label: "Проекты" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
--- a/app/dashboard/[workspaceId]/purchase-plans/[projectId]/page.tsx
+++ b/app/dashboard/[workspaceId]/purchase-plans/[projectId]/page.tsx
@@ -329,7 +329,7 @@ export default function PurchasePlanDetailPage() {
  if (loading) {
    return (
      <>
-        <DashboardHeader breadcrumbs={[{ label: "Загрузка..." }]} showProjectSelector={false} />
+        <DashboardHeader breadcrumbs={[{ label: "Загрузка..." }]} />
        <div className="flex items-center justify-center py-12">
          <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
        </div>
@@ -345,7 +345,6 @@ export default function PurchasePlanDetailPage() {
          { label: "Планы закупок", href: `/dashboard/${workspaceId}/purchase-plans` },
          { label: project?.title || "План закупок" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
--- a/app/dashboard/[workspaceId]/purchase-plans/page.tsx
+++ b/app/dashboard/[workspaceId]/purchase-plans/page.tsx
@@ -118,7 +118,6 @@ export default function PurchasePlansPage() {
          { label: "Главная", href: `/dashboard/${workspaceId}` },
          { label: "Планы закупок" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
--- a/app/dashboard/[workspaceId]/settings/invites/page.tsx
+++ b/app/dashboard/[workspaceId]/settings/invites/page.tsx
@@ -132,7 +132,6 @@ export default function InvitesPage() {
          { label: "Настройки", href: `/dashboard/${workspaceId}/settings` },
          { label: "Приглашения" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
--- a/app/dashboard/[workspaceId]/settings/members/page.tsx
+++ b/app/dashboard/[workspaceId]/settings/members/page.tsx
@@ -136,7 +136,6 @@ export default function MembersPage() {
          { label: "Настройки", href: `/dashboard/${workspaceId}/settings` },
          { label: "Участники" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4">
--- a/app/dashboard/[workspaceId]/settings/page.tsx
+++ b/app/dashboard/[workspaceId]/settings/page.tsx
@@ -86,7 +86,6 @@ export default function SettingsPage() {
          { label: "Главная", href: `/dashboard/${workspaceId}` },
          { label: "Настройки" },
        ]}
-        showProjectSelector={false}
      />

      <div className="flex flex-1 flex-col gap-4 p-4 pt-0 mt-4 max-w-2xl">
--- a/components/layout/dashboard-header.tsx
+++ b/components/layout/dashboard-header.tsx
@@ -15,7 +15,6 @@ import {
  BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
 import { ThemeToggle } from "@/components/theme-toggle";
-import { ProjectSelector } from "@/components/project-selector";
 import React from "react";

 interface BreadcrumbItemType {
@@ -25,12 +24,10 @@ interface BreadcrumbItemType {

 interface DashboardHeaderProps {
  breadcrumbs?: BreadcrumbItemType[];
-  showProjectSelector?: boolean;
 }

 export const DashboardHeader: React.FC<DashboardHeaderProps> = ({
  breadcrumbs = [],
-  showProjectSelector = true,
 }) => {
  return (
    <header className="flex h-16 shrink-0 items-center gap-2 border-b px-4">
@@ -55,7 +52,6 @@ export const DashboardHeader: React.FC<DashboardHeaderProps> = ({
        </Breadcrumb>
      )}
      <div className="ml-auto flex items-center gap-2">
-        {showProjectSelector && <ProjectSelector />}
        <ThemeToggle />
      </div>
    </header>