Update scheduling parameters and refactor channel endpoints: extend HorizonDays to 7 and RetentionDays to 90 in appsettings.json. Consolidate channel-related endpoint logic by removing obsolete files and enhancing the ShowEndpoints with audience and genre management capabilities. Improve error handling and streamline command handlers for channel operations.

2026-07-26 13:32:13 +03:00
parent c4ef954dea
commit 66040a8841
272 changed files with 27944 additions and 8699 deletions
@@ -1,197 +1,186 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { Link } from '@tanstack/react-router'
-import { useTranslation } from 'react-i18next'
-import { ChevronLeft, RefreshCw } from 'lucide-react'
-import { HttpError } from '@/shared/api/client'
-import { Badge } from '@/shared/ui/badge'
-import { Button } from '@/shared/ui/button'
-import { toast } from '@/shared/ui/toast-store'
-import { listAllMedia } from '@/features/admin/media/api'
-import { listShows } from '@/features/admin/shows/api'
-import { deleteOverride, getChannel, getSchedule, regenerateSchedule, removeChannelAd } from './api'
-import { AddAdForm } from './components/AddAdForm'
-import { AddShowForm } from './components/AddShowForm'
-import { BumperCard } from './components/BumperCard'
-import { ChannelShowRow } from './components/ChannelShowRow'
-import { CollapsibleCard } from './components/CollapsibleCard'
-import { RemoveButton } from './components/fields'
-import { OverrideForm } from './components/OverrideForm'
-import { SchedulePreview } from './components/SchedulePreview'
-import { SettingsCard } from './components/SettingsCard'
-import { formatMinute, formatTime } from './lib/format'
-
-export function ChannelDetail({ channelId }: { channelId: string }) {
-  const { t } = useTranslation()
-  const queryClient = useQueryClient()
-
-  const { data: channel, isLoading } = useQuery({
-    queryKey: ['admin', 'channels', channelId],
-    queryFn: () => getChannel(channelId),
-  })
-  const { data: shows } = useQuery({ queryKey: ['admin', 'shows'], queryFn: listShows })
-  const { data: ready } = useQuery({
-    queryKey: ['admin', 'media', 'ready', 'all'],
-    queryFn: () => listAllMedia({ statuses: ['Ready'] }),
-  })
-  const { data: schedule } = useQuery({
-    queryKey: ['admin', 'channels', channelId, 'schedule'],
-    queryFn: () => getSchedule(channelId, new Date(), new Date(Date.now() + 12 * 3600_000)),
-  })
-
-  const invalidate = () => {
-    void queryClient.invalidateQueries({ queryKey: ['admin', 'channels', channelId] })
-  }
-  const invalidateSchedule = () =>
-    queryClient.invalidateQueries({ queryKey: ['admin', 'channels', channelId, 'schedule'] })
-  const onError = (error: unknown) =>
-    toast.error(error instanceof HttpError ? error.detail : t('common.error'))
-
-  const regenerateMutation = useMutation({
-    mutationFn: () => regenerateSchedule(channelId),
-    onSuccess: () => {
-      toast.success(t('admin.channels.regenerated'))
-      void invalidateSchedule()
-    },
-    onError,
-  })
-
-  if (isLoading || !channel) return <p className="text-muted-foreground">{t('common.loading')}</p>
-
-  const availableShows = shows?.filter((s) => !channel.shows.some((cs) => cs.showId === s.id)) ?? []
-
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex flex-wrap items-center justify-between gap-2">
-        <div className="flex items-center gap-2">
-          <Button asChild size="sm" variant="ghost">
-            <Link to="/admin/channels">
-              <ChevronLeft className="h-4 w-4" />
-              {t('admin.channels.title')}
-            </Link>
-          </Button>
-          <h2 className="crt-glow text-xl font-semibold">{channel.name}</h2>
-          <Badge variant="muted">{channel.slug}</Badge>
-        </div>
-        <Button
-          size="sm"
-          variant="outline"
-          disabled={regenerateMutation.isPending}
-          onClick={() => regenerateMutation.mutate()}
-        >
-          <RefreshCw className="h-4 w-4" />
-          {t('admin.channels.regenerate')}
-        </Button>
-      </div>
-
-      <SettingsCard
-        channel={channel}
-        readyAssets={ready?.items ?? []}
-        onSaved={invalidate}
-        onError={onError}
-      />
-
-      <BumperCard channel={channel} onSaved={invalidate} onError={onError} />
-
-      {/* Шоу канала */}
-      <CollapsibleCard title={t('admin.channels.shows')} contentClassName="flex flex-col gap-3">
-        <AddShowForm
-          channelId={channelId}
-          options={availableShows.map((s) => ({ id: s.id, name: s.name }))}
-          onAdded={invalidate}
-          onError={onError}
-        />
-        <table className="w-full text-sm">
-          <thead className="border-b border-border text-left text-muted-foreground">
-            <tr>
-              <th className="py-2 font-medium">{t('admin.channels.show')}</th>
-              <th className="py-2 font-medium">{t('admin.channels.weight')}</th>
-              <th className="py-2 font-medium">{t('admin.channels.block')}</th>
-              <th className="py-2 font-medium">{t('admin.channels.on')}</th>
-              <th className="py-2 font-medium">{t('common.actions')}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {channel.shows.map((row) => (
-              <ChannelShowRow
-                key={row.id}
-                channelId={channelId}
-                row={row}
-                onChanged={invalidate}
-                onError={onError}
-              />
-            ))}
-            {channel.shows.length === 0 && (
-              <tr>
-                <td className="py-3 text-muted-foreground" colSpan={5}>
-                  {t('admin.channels.noShows')}
-                </td>
-              </tr>
-            )}
-          </tbody>
-        </table>
-      </CollapsibleCard>
-
-      {/* Реклама */}
-      <CollapsibleCard title={t('admin.channels.ads')} contentClassName="flex flex-col gap-3">
-        <AddAdForm
-          channelId={channelId}
-          options={(ready?.items ?? [])
-            .filter((a) => !channel.ads.some((ad) => ad.mediaAssetId === a.id))
-            .map((a) => ({ id: a.id, name: a.originalFileName }))}
-          onAdded={invalidate}
-          onError={onError}
-        />
-        {ready?.truncated && (
-          <p className="text-xs text-amber-500">{t('admin.shows.candidatesTruncated')}</p>
-        )}
-        <ul className="flex flex-col divide-y divide-border">
-          {channel.ads.map((ad) => (
-            <li key={ad.id} className="flex items-center justify-between py-2 text-sm">
-              <span>{ad.assetName ?? '—'}</span>
-              <RemoveButton
-                onClick={() => removeChannelAd(channelId, ad.id).then(invalidate).catch(onError)}
-              />
-            </li>
-          ))}
-          {channel.ads.length === 0 && (
-            <li className="py-2 text-muted-foreground">{t('admin.channels.noAds')}</li>
-          )}
-        </ul>
-      </CollapsibleCard>
-
-      {/* Override'ы / марафоны */}
-      <CollapsibleCard title={t('admin.channels.overrides')} contentClassName="flex flex-col gap-3">
-        <OverrideForm
-          channelId={channelId}
-          options={channel.shows.map((cs) => ({ id: cs.showId, name: cs.showName }))}
-          onCreated={invalidate}
-          onError={onError}
-        />
-        <ul className="flex flex-col divide-y divide-border">
-          {channel.overrides.map((o) => (
-            <li key={o.id} className="flex items-center justify-between py-2 text-sm">
-              <span>
-                <Badge variant="muted">{t(`admin.channels.modes.${o.mode}`)}</Badge>{' '}
-                {o.recurrence === 'Weekly'
-                  ? `${t(`admin.channels.weekdays.${o.dayOfWeek}`)} ${formatMinute(o.startMinute)}–${formatMinute(o.endMinute)}`
-                  : `${formatTime(o.startsAtUtc)} – ${formatTime(o.endsAtUtc)}`}{' '}
-                · {o.shows.map((s) => s.showName).join(', ')}
-              </span>
-              <RemoveButton
-                onClick={() => deleteOverride(channelId, o.id).then(invalidate).catch(onError)}
-              />
-            </li>
-          ))}
-          {channel.overrides.length === 0 && (
-            <li className="py-2 text-muted-foreground">{t('admin.channels.noOverrides')}</li>
-          )}
-        </ul>
-      </CollapsibleCard>
-
-      {/* Предпросмотр расписания */}
-      <CollapsibleCard title={t('admin.channels.schedule')}>
-        <SchedulePreview entries={schedule ?? []} />
-      </CollapsibleCard>
-    </div>
-  )
-}
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { Link } from '@tanstack/react-router'
+import { ChevronLeft, Plus, Send } from 'lucide-react'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { listAllMedia } from '@/features/admin/media/api'
+import { HttpError } from '@/shared/api/client'
+import type { GridLayerDto, SlotDto } from '@/shared/api/types'
+import { Badge } from '@/shared/ui/badge'
+import { Button } from '@/shared/ui/button'
+import { toast } from '@/shared/ui/toast-store'
+import {
+  applyChannelTemplate,
+  createLayer,
+  deleteLayer,
+  getChannel,
+  getChannelTemplate,
+  getSchedule,
+} from './api'
+import { BumperCard } from './components/BumperCard'
+import { CollapsibleCard } from './components/CollapsibleCard'
+import { LayerList, ScheduleGrid } from './components/ScheduleGrid'
+import { SchedulePreview } from './components/SchedulePreview'
+import { SettingsCard } from './components/SettingsCard'
+import { SlotInspector, type SlotDraft } from './components/SlotInspector'
+
+export function ChannelDetail({ channelId }: { channelId: string }) {
+  const { t } = useTranslation()
+  const queryClient = useQueryClient()
+  const [draft, setDraft] = useState<SlotDraft | null>(null)
+  const [activeLayerId, setActiveLayerId] = useState<string | null>(null)
+
+  const { data: channel, isLoading } = useQuery({
+    queryKey: ['admin', 'channels', channelId],
+    queryFn: () => getChannel(channelId),
+  })
+  const { data: template } = useQuery({
+    queryKey: ['admin', 'channels', channelId, 'template'],
+    queryFn: () => getChannelTemplate(channelId),
+  })
+  const { data: ready } = useQuery({
+    queryKey: ['admin', 'media', 'ready', 'all'],
+    queryFn: () => listAllMedia({ statuses: ['Ready'] }),
+  })
+  const { data: schedule } = useQuery({
+    queryKey: ['admin', 'channels', channelId, 'schedule'],
+    queryFn: () => getSchedule(channelId, new Date(), new Date(Date.now() + 12 * 3600_000)),
+  })
+
+  const invalidate = () => {
+    void queryClient.invalidateQueries({ queryKey: ['admin', 'channels', channelId] })
+  }
+  const onError = (error: unknown) =>
+    toast.error(error instanceof HttpError ? error.detail : t('common.error'))
+
+  const applyMutation = useMutation({
+    mutationFn: () => applyChannelTemplate(channelId),
+    onSuccess: (result) => {
+      toast.success(t('admin.channels.applied', { count: result.added }))
+      // Предупреждения показываем по одному: каждое указывает на конкретный слот.
+      for (const warning of result.warnings)
+        toast.error(`${t(`admin.channels.warnings.${warning.kind}`)}: ${warning.details}`)
+      invalidate()
+    },
+    onError,
+  })
+
+  const addLayerMutation = useMutation({
+    mutationFn: () => {
+      const nextPriority = Math.max(0, ...(template?.layers.map((l) => l.priority) ?? [0])) + 10
+      return createLayer(template!.id, {
+        name: t('admin.channels.newLayerName'),
+        priority: nextPriority,
+      })
+    },
+    onSuccess: invalidate,
+    onError,
+  })
+
+  const deleteLayerMutation = useMutation({
+    mutationFn: (layer: GridLayerDto) => deleteLayer(layer.id),
+    onSuccess: invalidate,
+    onError,
+  })
+
+  if (isLoading || !channel) return <p className="text-muted-foreground">{t('common.loading')}</p>
+
+  const layerForNewSlot =
+    activeLayerId ?? template?.layers.find((l) => !l.isBackground)?.id ?? template?.layers[0]?.id
+
+  const openNewSlot = (weekday: number, startMinutes: number) => {
+    if (!layerForNewSlot) return
+    const hh = Math.floor(startMinutes / 60)
+      .toString()
+      .padStart(2, '0')
+    const mm = (startMinutes % 60).toString().padStart(2, '0')
+    setDraft({
+      layerId: layerForNewSlot,
+      slot: null,
+      defaults: { weekday, targetStart: `${hh}:${mm}:00`, title: t('admin.channels.newSlot') },
+    })
+  }
+
+  const openSlot = (slot: SlotDto) => setDraft({ layerId: slot.layerId, slot })
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-wrap items-center justify-between gap-3">
+        <Button asChild size="sm" variant="ghost">
+          <Link to="/admin/channels">
+            <ChevronLeft className="h-4 w-4" />
+            {t('admin.channels.title')}
+          </Link>
+        </Button>
+
+        <div className="flex flex-wrap items-center gap-2">
+          <h2 className="crt-glow text-xl font-semibold">{channel.name}</h2>
+          {channel.number !== null && <Badge variant="muted">№ {channel.number}</Badge>}
+          {!channel.isEnabled && <Badge variant="muted">{t('admin.channels.disabled')}</Badge>}
+        </div>
+      </div>
+
+      {/* Правка правил эфира не двигает — применение отдельной кнопкой. */}
+      {template?.hasPendingChanges && (
+        <div className="flex flex-wrap items-center justify-between gap-3 rounded-md border border-amber-500/50 bg-amber-500/10 px-4 py-2 text-sm">
+          <span>{t('admin.channels.pendingChanges')}</span>
+          <Button size="sm" disabled={applyMutation.isPending} onClick={() => applyMutation.mutate()}>
+            <Send className="h-4 w-4" /> {t('admin.channels.apply')}
+          </Button>
+        </div>
+      )}
+
+      <SettingsCard
+        channel={channel}
+        readyAssets={ready?.items ?? []}
+        onSaved={invalidate}
+        onError={onError}
+      />
+
+      {template && (
+        <CollapsibleCard title={t('admin.channels.grid')} defaultOpen>
+          <div className="grid gap-4 lg:grid-cols-[220px_1fr]">
+            <div className="flex flex-col gap-2">
+              <div className="flex items-center justify-between gap-2">
+                <h3 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">
+                  {t('admin.channels.layers')}
+                </h3>
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  onClick={() => addLayerMutation.mutate()}
+                  disabled={addLayerMutation.isPending}
+                >
+                  <Plus className="h-4 w-4" />
+                </Button>
+              </div>
+              <LayerList
+                template={template}
+                activeLayerId={layerForNewSlot ?? null}
+                onSelect={(layer) => setActiveLayerId(layer.id)}
+                onDelete={(layer) => deleteLayerMutation.mutate(layer)}
+              />
+              <p className="text-xs text-muted-foreground">{t('admin.channels.layersHint')}</p>
+            </div>
+
+            <div className="flex flex-col gap-3">
+              <ScheduleGrid
+                template={template}
+                selectedSlotId={draft?.slot?.id ?? null}
+                onSelectSlot={openSlot}
+                onAddSlot={openNewSlot}
+              />
+              {draft && (
+                <SlotInspector draft={draft} onClose={() => setDraft(null)} onChanged={invalidate} />
+              )}
+            </div>
+          </div>
+        </CollapsibleCard>
+      )}
+
+      <BumperCard channel={channel} onSaved={invalidate} onError={onError} />
+
+      <SchedulePreview entries={schedule ?? []} />
+    </div>
+  )
+}