+ {report.scenarios.scenarios_collapse_reason}
+
+ )}
{/* 6.1 Прогноз по горизонтам */}
diff --git a/frontend/src/components/site-finder/ptica/scenarios/ScenarioCards.tsx b/frontend/src/components/site-finder/ptica/scenarios/ScenarioCards.tsx
index a14d8737..db86f0c1 100644
--- a/frontend/src/components/site-finder/ptica/scenarios/ScenarioCards.tsx
+++ b/frontend/src/components/site-finder/ptica/scenarios/ScenarioCards.tsx
@@ -5,10 +5,22 @@
* report.scenarios.by_scenario. Each card shows the deficit-index (big, signed,
* colour by sign) at the target horizon, the demand/supply projection, and the
* months-of-inventory (MOI). Mirrors the §22 light ScenariosBlock field mapping.
+ *
+ * #1871 P1 — when backend `compute_scenarios` collapses three scenarios into
+ * one (failed §9.6 β rate-sensitivity gate → demand_normalization returns
+ * coefficient=1.0 across the envelope), we render ONE «Базовый» card + a
+ * caveat note instead of three visually-identical copies. Caveat text is the
+ * source-of-truth backend constant `_COLLAPSE_REASON_LOW_BETA`, NEVER hardcoded.
*/
import styles from "@/app/site-finder/analysis/[cad]/ptica/ptica.module.css";
-import type { ReportScenarios, ScenariosSummary } from "@/types/forecast";
+import type {
+ DemandSupplyForecast,
+ ReportScenarios,
+ ScenarioForecast,
+ ScenarioKey,
+ ScenariosSummary,
+} from "@/types/forecast";
import {
DEFICIT_BALANCE_EPS,
SCENARIO_ACCENT,
@@ -43,6 +55,74 @@ const ACCENT_CLASS = {
cons: styles.scAccentCons,
} as const;
+interface ScenarioCardData {
+ value: number | null;
+ horizon: number | null;
+}
+
+function ScenarioBaseCard({
+ scenarioKey,
+ sc,
+ di,
+ fc,
+ targetHorizon,
+}: {
+ scenarioKey: ScenarioKey;
+ sc: ScenarioForecast | undefined;
+ di: ScenarioCardData;
+ fc: DemandSupplyForecast | null;
+ targetHorizon: number;
+}) {
+ // Suppress unused-when-collapsed warning: `sc` is part of the contract so
+ // future card surfaces (rate-path) can read it without re-plumbing props.
+ void sc;
+ const labelHorizon = di.horizon ?? targetHorizon;
+ const value = di.value;
+ const tone = value != null ? deficitTone(value) : "neutral";
+ const word =
+ value != null
+ ? Math.abs(value) < DEFICIT_BALANCE_EPS
+ ? "баланс"
+ : deficitWord(value)
+ : "нет данных";
+
+ return (
+
+
{SCENARIO_RU[scenarioKey]}
+
+ {value != null ? fmtSignedDeficit(value) : "—"}
+
+
+
+ Дефицит-индекс ({labelHorizon} мес)
+
+ {word}
+
+
+ Прогноз спроса
+
+ {fc ? `${fmtInt(fc.projected_demand_units)} кв` : "—"}
+
+
+
+ Прогноз предложения
+
+ {fc ? `${fmtInt(fc.projected_supply_units)} кв` : "—"}
+
+
+
+ Месяцев запаса (MOI)
+
+ {fc ? fmtNum(fc.months_of_inventory, 1) : "—"}
+
+
+
{SCENARIO_HINT[scenarioKey]}
+
+ );
+}
+
export function ScenarioCards({
scenarios,
scenariosSummary,
@@ -60,6 +140,36 @@ export function ScenarioCards({
);
}
+ // #1871 P1 — collapse: ONE «Базовый» card + caveat from backend. Caveat
+ // string comes from `scenarios.scenarios_collapse_reason` only — never
+ // hardcoded here (backend `_COLLAPSE_REASON_LOW_BETA` is source of truth).
+ if (scenarios.scenarios_collapsed === true) {
+ const sc = scenarios.by_scenario.base;
+ const di = deficitForScenario(
+ "base",
+ scenarios,
+ scenariosSummary,
+ targetHorizon,
+ );
+ const fc = sc ? pickHorizonForecast(sc.forecasts, targetHorizon) : null;
+ return (
+
+
+ {scenarios.scenarios_collapse_reason && (
+
+ {scenarios.scenarios_collapse_reason}
+
+ )}
+
+ );
+ }
+
return (
{present.map((key) => {
@@ -71,51 +181,15 @@ export function ScenarioCards({
targetHorizon,
);
const fc = sc ? pickHorizonForecast(sc.forecasts, targetHorizon) : null;
- const labelHorizon = di.horizon ?? targetHorizon;
- const value = di.value;
- const tone = value != null ? deficitTone(value) : "neutral";
- const word =
- value != null
- ? Math.abs(value) < DEFICIT_BALANCE_EPS
- ? "баланс"
- : deficitWord(value)
- : "нет данных";
-
return (
-
-
{SCENARIO_RU[key]}
-
- {value != null ? fmtSignedDeficit(value) : "—"}
-
-
-
- Дефицит-индекс ({labelHorizon} мес)
-
- {word}
-
-
- Прогноз спроса
-
- {fc ? `${fmtInt(fc.projected_demand_units)} кв` : "—"}
-
-
-
- Прогноз предложения
-
- {fc ? `${fmtInt(fc.projected_supply_units)} кв` : "—"}
-
-
-
- Месяцев запаса (MOI)
-
- {fc ? fmtNum(fc.months_of_inventory, 1) : "—"}
-
-
-
{SCENARIO_HINT[key]}
-
diff --git a/frontend/src/components/site-finder/ptica/scenarios/ScenarioCompareTable.tsx b/frontend/src/components/site-finder/ptica/scenarios/ScenarioCompareTable.tsx
index d76602db..615c2e94 100644
--- a/frontend/src/components/site-finder/ptica/scenarios/ScenarioCompareTable.tsx
+++ b/frontend/src/components/site-finder/ptica/scenarios/ScenarioCompareTable.tsx
@@ -46,6 +46,12 @@ export function ScenarioCompareTable({
scenariosSummary,
targetHorizon,
}: Props) {
+ // #1871 P1 — when backend collapses 3 scenarios into one, the compare-table
+ // row-per-scenario layout is meaningless (three identical rows). The
+ // ScenarioCards block above already shows the single «Базовый» card + the
+ // backend-sourced caveat — render nothing here.
+ if (scenarios.scenarios_collapsed === true) return null;
+
const present = SCENARIO_ORDER.filter(
(k) => scenarios.by_scenario[k] != null || scenariosSummary != null,
);
diff --git a/frontend/src/types/forecast.ts b/frontend/src/types/forecast.ts
index d8f4f47d..afbcbd56 100644
--- a/frontend/src/types/forecast.ts
+++ b/frontend/src/types/forecast.ts
@@ -150,6 +150,12 @@ export interface ScenarioForecast {
export interface ReportScenarios {
summary: string | null;
by_scenario: Partial
>;
+ /** #1871 P1 — true когда demand_normalization gate отбил β rate-sensitivity и
+ * conservative/base/aggressive дают идентичный projected_demand_units на всех
+ * горизонтах. UI рендерит ОДНУ карточку «Базовый» + caveat вместо трёх копий. */
+ scenarios_collapsed?: boolean;
+ /** Полное русское предложение-причина (готовое к рендеру). null когда не схлопнуто. */
+ scenarios_collapse_reason?: string | null;
}
// ── Confidence ───────────────────────────────────────────────────────────────