feat: settings page update

app/dashboard/[workspaceId]/purchase-plans/[projectId]/page.tsx

@@ -1699,7 +1699,7 @@ export default function PurchasePlanDetailPage() {
             onClick={() => setFiltersOpen(true)}
           >
             <Filter className="h-4 w-4 mr-1" />
-            Фильтры
+            Фильтры и сортировка
             {hasActiveFilters && (
               <span className="ml-1 px-1.5 py-0.5 text-xs bg-primary-foreground/20 rounded">
                 ✓

app/dashboard/[workspaceId]/settings/page.tsx

@@ -59,28 +59,7 @@ import {
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog";
 import type { WorkspaceMember, WorkspaceInvite, PermissionKey } from "@/lib/types/api";
-
+import { PERMISSION_LABELS, ALL_PERMISSIONS } from "@/lib/types/api";
-// ============================================================================
-// Constants
-// ============================================================================
-
-const PERMISSION_LABELS: Record<PermissionKey, string> = {
-  admin_full: "Полный доступ",
-  projects_read: "Просмотр проектов",
-  projects_write: "Редактирование проектов",
-  placements_read: "Просмотр размещений",
-  placements_write: "Редактирование размещений",
-  analytics_read: "Просмотр аналитики",
-};
-
-const ALL_PERMISSIONS: PermissionKey[] = [
-  "admin_full",
-  "projects_read",
-  "projects_write",
-  "placements_read",
-  "placements_write",
-  "analytics_read",
-];
 
 // ============================================================================
 // Component

components/filters-modal.tsx

@@ -226,10 +226,10 @@ export function FiltersModal({
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <Filter className="h-5 w-5" />
-            Фильтры
+            Фильтры и сортировка
           </DialogTitle>
           <DialogDescription>
-            Настройте фильтры для каналов и размещений
+            Настройте фильтры и сортировку для каналов и размещений
           </DialogDescription>
         </DialogHeader>
 
@@ -254,7 +254,6 @@ export function FiltersModal({
                 : "border-transparent text-muted-foreground hover:text-foreground"
             )}
           >
-            <ArrowUpDown className="h-4 w-4" />
             Размещения
           </button>
         </div>
@@ -553,11 +552,13 @@ export function FiltersModal({
                 </div>
               </div>
 
-              <div className="space-y-3 pt-2 border-t">
+              <div className="pt-4 mt-4 border-t">
-                <Label className="text-sm font-medium flex items-center gap-2">
+                <div className="flex items-center gap-2 mb-3">
-                  <ArrowUpDown className="h-4 w-4" />
+                  <ArrowUpDown className="h-4 w-4 text-muted-foreground" />
-                  Сортировка внутри каналов
+                  <h3 className="text-sm font-semibold">Сортировка</h3>
-                </Label>
+                </div>
+                <div className="space-y-3">
+                  <Label className="text-xs text-muted-foreground">Сортировать размещения внутри каналов</Label>
                   <div className="flex gap-2 items-center">
                     <Select
                       value={filters.sort?.field || ""}
@@ -634,6 +635,7 @@ export function FiltersModal({
                   </div>
                 </div>
               </div>
+            </div>
           )}
         </div>
 

components/layout/app-sidebar.tsx

@@ -100,7 +100,7 @@ interface NavItem {
   url: string;
   icon?: LucideIcon;
   isActive?: boolean;
-  requiredPermission?: "projects_read" | "placements_read" | "analytics_read" | "admin_full";
+  requiredPermission?: "admin_full" | "projects_read" | "projects_write" | "creatives_read" | "creatives_write" | "placements_read" | "placements_write" | "analytics_read" | "analytics_without_clicks" | "analytics_own_creatives";
   tooltip?: string;
   items?: {
     title: string;
@@ -404,8 +404,8 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
       });
     }
 
-    // 5. Аналитика — только подразделы
+    // 5. Аналитика — проверяем любой из аналитических доступов
-    if (hasPermission("analytics_read")) {
+    if (hasPermission("analytics_read") || hasPermission("analytics_without_clicks") || hasPermission("analytics_own_creatives")) {
       items.push({
         title: "Аналитика",
         url: buildRoute.analytics(workspaceId),

components/providers/workspace-provider.tsx

@@ -53,7 +53,7 @@ interface WorkspaceContextType {
 
   // Permissions
   permissions: Permission[];
-  hasPermission: (key: PermissionKey, projectId?: string) => boolean;
+  hasPermission: (key: PermissionKey, projectId?: string, creativeId?: string, placementId?: string) => boolean;
   isAdmin: boolean;
   // Check if user is admin in a specific workspace
   isWorkspaceAdmin: (workspaceId: string) => Promise<boolean>;
@@ -141,7 +141,7 @@ export const WorkspaceProvider: React.FC<WorkspaceProviderProps> = ({
   const isAdmin = permissions.some((p) => p.key === "admin_full");
 
   const hasPermission = useCallback(
-    (key: PermissionKey, projectId?: string): boolean => {
+    (key: PermissionKey, projectId?: string, creativeId?: string, placementId?: string): boolean => {
       // Admin has all permissions
       if (isAdmin) return true;
 
@@ -154,13 +154,30 @@ export const WorkspaceProvider: React.FC<WorkspaceProviderProps> = ({
 
       // If projectId provided, check if it's in scopes
       if (projectId) {
-        return permission.scopes.some(
+        const hasProjectScope = permission.scopes.some(
           (s) => s.type === "project" && s.id === projectId
         );
+        if (hasProjectScope) return true;
       }
 
-      // Permission exists but is scoped - need projectId to verify
+      // If creativeId provided, check if it's in scopes
-      return true;
+      if (creativeId) {
+        const hasCreativeScope = permission.scopes.some(
+          (s) => s.type === "creative" && s.id === creativeId
+        );
+        if (hasCreativeScope) return true;
+      }
+
+      // If placementId provided, check if it's in scopes
+      if (placementId) {
+        const hasPlacementScope = permission.scopes.some(
+          (s) => s.type === "placement" && s.id === placementId
+        );
+        if (hasPlacementScope) return true;
+      }
+
+      // Permission exists but is scoped and no matching scope found
+      return false;
     },
     [permissions, isAdmin]
   );

lib/types/api.ts

@@ -64,11 +64,15 @@ export type PermissionKey =
   | "admin_full"
   | "projects_read"
   | "projects_write"
+  | "creatives_read"
+  | "creatives_write"
   | "placements_read"
   | "placements_write"
-  | "analytics_read";
+  | "analytics_read"
+  | "analytics_without_clicks"
+  | "analytics_own_creatives";
 
-export type PermissionScopeType = "project";
+export type PermissionScopeType = "project" | "creative" | "placement";
 
 export interface PermissionScope {
   type: PermissionScopeType;
@@ -80,6 +84,32 @@ export interface Permission {
   scopes?: PermissionScope[];
 }
 
+export const PERMISSION_LABELS: Record<PermissionKey, string> = {
+  admin_full: "Полный доступ",
+  projects_read: "Просмотр проектов",
+  projects_write: "Редактирование проектов",
+  creatives_read: "Просмотр креативов",
+  creatives_write: "Создание/редактирование креативов",
+  placements_read: "Просмотр планов закупок",
+  placements_write: "Создание/редактирование закупок",
+  analytics_read: "Полный доступ к статистике",
+  analytics_without_clicks: "Статистика без переходов",
+  analytics_own_creatives: "Статистика только своих креативов",
+};
+
+export const ALL_PERMISSIONS: PermissionKey[] = [
+  "admin_full",
+  "projects_read",
+  "projects_write",
+  "creatives_read",
+  "creatives_write",
+  "placements_read",
+  "placements_write",
+  "analytics_read",
+  "analytics_without_clicks",
+  "analytics_own_creatives",
+];
+
 export interface WorkspaceMemberUser {
   id: string; // user_id
   telegram_id: number;