Merge pull request 'main' (#3) from main into dev

Reviewed-on: #3

src/components/MetricWidget.tsx

@@ -0,0 +1,17 @@
+import type { CurrentItem } from '../entities/current/types';
+import { formatNumber } from '../utils/format';
+
+type MetricWidgetProps = {
+  item: CurrentItem;
+};
+
+export function MetricWidget({ item }: MetricWidgetProps) {
+  const title = item.name?.trim() || item.tag;
+
+  return (
+    <article className="metric-widget" title={`${title} (${item.tag})`}>
+      <span className="metric-widget__tag">{title}</span>
+      <strong className="metric-widget__value">{formatNumber(item.value)}</strong>
+    </article>
+  );
+}

src/components/MetricWidgetsContainer.tsx

@@ -0,0 +1,7 @@
+import type { PropsWithChildren } from 'react';
+
+type MetricWidgetsContainerProps = PropsWithChildren;
+
+export function MetricWidgetsContainer({ children }: MetricWidgetsContainerProps) {
+  return <div className="metric-widgets-grid">{children}</div>;
+}

src/entities/current/api.ts

@@ -1,4 +1,4 @@
-import { getJson } from '../../shared/api/http';
+import { buildApiUrl, getJson } from '../../shared/api/http';
 import { cloudApiUrl } from '../../shared/config/env';
 import type { CurrentResponse } from './types';
 
@@ -9,8 +9,5 @@ export function getCurrent(edge: string, tags?: string[]): Promise<CurrentRespon
 
 /** Формирует URL SSE-потока текущих значений. */
 export function getCurrentEventsUrl(edge: string, tags?: string[]): string {
-  const url = new URL('/current/events', cloudApiUrl);
+  return buildApiUrl(cloudApiUrl, '/current/events', { edge, tags });
-  url.searchParams.set('edge', edge);
-  tags?.forEach((tag) => url.searchParams.append('tags', tag));
-  return url.toString();
 }

src/features/edge-detail/components/IndicatorsView.tsx

@@ -1,9 +1,7 @@
-import { useMemo, useState } from 'react';
 import { Search } from 'lucide-react';
 import type { CurrentItem } from '../../../entities/current/types';
-import { MetricCard } from '../../../components/MetricCard';
+import { MetricWidget } from '../../../components/MetricWidget';
-import { formatNumber } from '../../../utils/format';
+import { MetricWidgetsContainer } from '../../../components/MetricWidgetsContainer';
-import { getMetricStatus } from '../../../utils/metricStatus';
 
 type IndicatorsViewProps = {
   error: unknown;
@@ -26,19 +24,6 @@ export function IndicatorsView({
   onSearchChange,
   onToggleTag,
 }: IndicatorsViewProps) {
-  const [displayMode, setDisplayMode] = useState<'overview' | 'cards'>('overview');
-  const itemStatuses = useMemo(() => {
-    const now = Date.now();
-    return items.map((item) => ({ item, statusInfo: getMetricStatus(item, now) }));
-  }, [items]);
-  const statusCounts = itemStatuses.reduce(
-    (counts, { statusInfo }) => {
-      counts[statusInfo.status] += 1;
-      return counts;
-    },
-    { normal: 0, warning: 0, critical: 0 },
-  );
-
   return (
     <section className="tags-section">
       <div className="section-header">
@@ -50,22 +35,6 @@ export function IndicatorsView({
           <h2>Текущие значения</h2>
         </div>
         <div className="indicator-controls">
-          <div className="view-switch" aria-label="Режим отображения показателей">
-            <button
-              type="button"
-              className={displayMode === 'overview' ? 'view-switch__button--active' : ''}
-              onClick={() => setDisplayMode('overview')}
-            >
-              Картина
-            </button>
-            <button
-              type="button"
-              className={displayMode === 'cards' ? 'view-switch__button--active' : ''}
-              onClick={() => setDisplayMode('cards')}
-            >
-              Карточки
-            </button>
-          </div>
           <label className="search-box">
             <Search size={16} />
             <input value={search} onChange={(event) => onSearchChange(event.target.value)} placeholder="Поиск показателя" />
@@ -78,18 +47,6 @@ export function IndicatorsView({
           <span>Всего</span>
           <strong>{items.length}</strong>
         </div>
-        <div>
-          <span>В норме</span>
-          <strong>{statusCounts.normal}</strong>
-        </div>
-        <div>
-          <span>Предупреждение</span>
-          <strong>{statusCounts.warning}</strong>
-        </div>
-        <div>
-          <span>Критично</span>
-          <strong>{statusCounts.critical}</strong>
-        </div>
         <div>
           <span>На графике</span>
           <strong>{selectedTags.length}</strong>
@@ -98,35 +55,44 @@ export function IndicatorsView({
 
       {isError ? (
         <div className="empty-panel">Не удалось загрузить текущие значения: {String(error)}</div>
-      ) : displayMode === 'overview' ? (
-        <div className="metric-mosaic">
-          {itemStatuses.map(({ item, statusInfo }) => (
-            <button
-              key={`${item.edge}:${item.tag}`}
-              type="button"
-              className={`metric-tile metric-tile--${statusInfo.status} ${selectedTags.includes(item.tag) ? 'metric-tile--selected' : ''}`}
-              title={`${getTagLabel(item.tag)} (${item.tag}): ${formatNumber(item.value)} · ${statusInfo.label}`}
-              onClick={() => onToggleTag(item.tag)}
-            >
-              <span className="metric-tile__status" />
-              <span className="metric-tile__tag">{getTagLabel(item.tag)}</span>
-              <strong>{formatNumber(item.value)}</strong>
-            </button>
-          ))}
-        </div>
       ) : (
-        <div className="metric-grid">
+        <>
-          {itemStatuses.map(({ item, statusInfo }) => (
+          {/* displayMode === 'overview' ? (
-            <MetricCard
+            <div className="metric-mosaic">
-              key={`${item.edge}:${item.tag}`}
+              {itemStatuses.map(({ item, statusInfo }) => (
-              item={item}
+                <button
-              displayName={getTagLabel(item.tag)}
+                  key={`${item.edge}:${item.tag}`}
-              statusInfo={statusInfo}
+                  type="button"
-              selected={selectedTags.includes(item.tag)}
+                  className={`metric-tile metric-tile--${statusInfo.status} ${selectedTags.includes(item.tag) ? 'metric-tile--selected' : ''}`}
-              onToggle={onToggleTag}
+                  title={`${getTagLabel(item.tag)} (${item.tag}): ${formatNumber(item.value)} · ${statusInfo.label}`}
-            />
+                  onClick={() => onToggleTag(item.tag)}
-          ))}
+                >
-        </div>
+                  <span className="metric-tile__status" />
+                  <span className="metric-tile__tag">{getTagLabel(item.tag)}</span>
+                  <strong>{formatNumber(item.value)}</strong>
+                </button>
+              ))}
+            </div>
+          ) : (
+            <div className="metric-grid">
+              {itemStatuses.map(({ item, statusInfo }) => (
+                <MetricCard
+                  key={`${item.edge}:${item.tag}`}
+                  item={item}
+                  displayName={getTagLabel(item.tag)}
+                  statusInfo={statusInfo}
+                  selected={selectedTags.includes(item.tag)}
+                  onToggle={onToggleTag}
+                />
+              ))}
+            </div>
+          ) */}
+          <MetricWidgetsContainer>
+            {items.map((item) => (
+              <MetricWidget key={item.tag} item={item} />
+            ))}
+          </MetricWidgetsContainer>
+        </>
       )}
     </section>
   );

src/shared/api/http.ts

@@ -1,5 +1,38 @@
 export type QueryParamValue = string | number | string[] | undefined;
 
+function joinUrl(baseUrl: string, path: string): string {
+  const base = baseUrl.replace(/\/$/, '');
+  const endpoint = path.startsWith('/') ? path : `/${path}`;
+  return `${base}${endpoint}`;
+}
+
+function appendQueryParams(url: string, params?: Record<string, QueryParamValue>): string {
+  const searchParams = new URLSearchParams();
+
+  Object.entries(params ?? {}).forEach(([key, value]) => {
+    if (Array.isArray(value)) {
+      value.forEach((item) => searchParams.append(key, item));
+      return;
+    }
+
+    if (value !== undefined && value !== '') {
+      searchParams.set(key, String(value));
+    }
+  });
+
+  const query = searchParams.toString();
+  return query ? `${url}?${query}` : url;
+}
+
+/** Собирает URL API из base, пути и query-параметров. */
+export function buildApiUrl(
+  baseUrl: string,
+  path: string,
+  params?: Record<string, QueryParamValue>,
+): string {
+  return appendQueryParams(joinUrl(baseUrl, path), params);
+}
+
 /** Выполняет GET-запрос и добавляет query-параметры в едином формате для всех API. */
 export async function getJson<T>(
   baseUrl: string,
@@ -7,18 +40,7 @@ export async function getJson<T>(
   params?: Record<string, QueryParamValue>,
   init?: RequestInit,
 ): Promise<T> {
-  const url = new URL(path, baseUrl);
+  const url = buildApiUrl(baseUrl, path, params);
-
-  Object.entries(params ?? {}).forEach(([key, value]) => {
-    if (Array.isArray(value)) {
-      value.forEach((item) => url.searchParams.append(key, item));
-      return;
-    }
-
-    if (value !== undefined && value !== '') {
-      url.searchParams.set(key, String(value));
-    }
-  });
 
   const response = await fetch(url, init);
   if (!response.ok) {

src/styles/components/metrics.css

@@ -4,6 +4,53 @@
   gap: 12px;
 }
 
+.metric-widgets-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+  gap: 10px;
+}
+
+.metric-widget {
+  min-width: 0;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 12px;
+  border: 1px solid rgba(88, 103, 121, 0.42);
+  border-radius: 8px;
+  background:
+    linear-gradient(180deg, rgba(255, 255, 255, 0.03), transparent 28%),
+    linear-gradient(145deg, rgba(6, 9, 14, 0.98), rgba(2, 4, 8, 0.96));
+  box-shadow:
+    inset 0 1px 0 rgba(255, 255, 255, 0.05),
+    0 6px 14px rgba(0, 0, 0, 0.28);
+}
+
+.metric-widget__tag {
+  flex: 0 0 auto;
+  min-width: 0;
+  color: #cbd5e1;
+  font-size: 0.74rem;
+  font-weight: 600;
+  line-height: 1.35;
+  white-space: normal;
+  overflow-wrap: anywhere;
+  word-break: break-word;
+}
+
+.metric-widget__value {
+  margin-top: auto;
+  align-self: flex-end;
+  min-width: 0;
+  color: #f8fafc;
+  font-size: 1.1rem;
+  font-weight: 700;
+  font-variant-numeric: tabular-nums;
+  line-height: 1.2;
+  text-align: right;
+}
+
 .metric-mosaic {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(82px, 1fr));

vite.config.ts

@@ -8,8 +8,12 @@ export default defineConfig({
   },
   server: {
     port: 5173,
-  },
+    proxy: {
-  preview: {
+      '/api': {
-    port: 4173,
+        target: 'https://beta.backend.drill.greact.ru',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, ''),
+      },
+    },
   },
 });