refactor(campaign-ui): align workspace layouts

2026-07-20 20:09:11 +02:00
parent 0c4f198802
commit 78f52a36d4
6 changed files with 410 additions and 45 deletions
--- a/webui/src/features/campaigns/CampaignAuditPage.tsx
+++ b/webui/src/features/campaigns/CampaignAuditPage.tsx
@@ -19,7 +19,7 @@ export default function CampaignAuditPage({ settings, campaignId }: {settings: A
          <VersionLine version={version} versions={data.versions} loadedAt={version?.updated_at} />
        </div>
        <div className="button-row compact-actions">
-          <Button onClick={reload} disabled={loading}>i18n:govoplan-campaign.reload.cce71553</Button>
+          <Button onClick={() => void reload({ force: true })} disabled={loading}>Discard</Button>
        </div>
      </div>

--- a/webui/src/features/campaigns/CampaignFieldsPage.tsx
+++ b/webui/src/features/campaigns/CampaignFieldsPage.tsx
@@ -22,7 +22,7 @@ export default function CampaignFieldsPage({ settings, campaignId }: {settings:

  const version = data.currentVersion;
  const locked = isAuditLockedVersion(version, data.campaign?.current_version_id);
-  const { draft, setDraft, displayDraft, dirty, saveState, setSaveState, localError, setLocalError, markDirty, saveDraft } = useCampaignDraftEditor({
+  const { draft, setDraft, displayDraft, dirty, saveState, setSaveState, localError, setLocalError, markDirty, discardDraft, saveDraft } = useCampaignDraftEditor({
    settings,
    campaignId,
    version,
@@ -157,7 +157,7 @@ export default function CampaignFieldsPage({ settings, campaignId }: {settings:
          <VersionLine version={version} versions={data.versions} status={saveState} />
        </div>
        <div className="button-row compact-actions">
-          <Button onClick={reload} disabled={loading}>i18n:govoplan-campaign.reload.cce71553</Button>
+          <Button onClick={() => void discardDraft()} disabled={loading}>Discard</Button>
          <Button variant="primary" onClick={saveFields} disabled={!canSave}>i18n:govoplan-campaign.save.efc007a3</Button>
        </div>
      </div>
--- a/webui/src/features/campaigns/CampaignJsonView.tsx
+++ b/webui/src/features/campaigns/CampaignJsonView.tsx
@@ -24,7 +24,7 @@ export default function CampaignJsonView({ settings, campaignId }: {settings: Ap
          <VersionLine version={version} versions={data.versions} loadedAt={version?.updated_at} />
        </div>
        <div className="button-row compact-actions">
-          <Button onClick={reload} disabled={loading}>i18n:govoplan-campaign.reload.cce71553</Button>
+          <Button onClick={() => void reload({ force: true })} disabled={loading}>Discard</Button>
          <Button onClick={() => downloadJson(filename, campaignJson)} disabled={!version}>i18n:govoplan-campaign.download_json.d296a30a</Button>
        </div>
      </div>
--- a/webui/src/features/campaigns/CampaignListPage.tsx
+++ b/webui/src/features/campaigns/CampaignListPage.tsx
@@ -149,7 +149,7 @@ export default function CampaignListPage({ settings }: {settings: ApiSettings;})
          <p className="mono-small">{lastLoadedAt ? i18nMessage("i18n:govoplan-campaign.last_loaded_value.35ef046a", { value0: lastLoadedAt }) : "i18n:govoplan-campaign.not_loaded_yet.9968c191"}</p>
        </div>
        <div className="button-row compact-actions">
-          <Button onClick={load} disabled={loading}>i18n:govoplan-campaign.reload.cce71553</Button>
+          <Button onClick={() => void load(null)} disabled={loading}>Discard</Button>
          <Button variant="primary" onClick={create} disabled={creating}>
            {creating ? "i18n:govoplan-campaign.creating.94d7d8ee" : "i18n:govoplan-campaign.new_campaign.aaf9a8a4"}
          </Button>
--- a/webui/src/features/campaigns/CampaignOverviewPage.tsx
+++ b/webui/src/features/campaigns/CampaignOverviewPage.tsx
@@ -131,6 +131,19 @@ export default function CampaignOverviewPage({ settings, campaignId }: {settings
    }
  }

+  async function discardOverview() {
+    if (campaign) {
+      setIdentity({
+        external_id: campaign.external_id ?? "",
+        name: campaign.name ?? "",
+        status: campaign.status ?? "",
+        description: campaign.description ?? ""
+      });
+      setIdentityDirty(false);
+    }
+    await reload({ force: true });
+  }
+
  return (
    <div className="content-pad workspace-data-page">
      <div className="page-heading split workspace-heading">
@@ -139,8 +152,7 @@ export default function CampaignOverviewPage({ settings, campaignId }: {settings
          <p className="mono-small">i18n:govoplan-campaign.campaign_overview_version_independent_identity_a.ebaf1113</p>
        </div>
        <div className="button-row compact-actions">
-          <Button onClick={reload} disabled={loading || savingIdentity || lockBusy}>i18n:govoplan-campaign.reload.cce71553</Button>
-          <Link to="wizard/create"><Button>i18n:govoplan-campaign.edit_with_wizard.672a7d1a</Button></Link>
+          <Button onClick={() => void discardOverview()} disabled={loading || savingIdentity || lockBusy}>Discard</Button>
          <Button variant="primary" onClick={() => void saveIdentity()} disabled={!campaign || !identityDirty || savingIdentity}>{savingIdentity ? "i18n:govoplan-campaign.saving.56a2285c" : "i18n:govoplan-campaign.save.efc007a3"}</Button>
        </div>
      </div>
@@ -149,13 +161,6 @@ export default function CampaignOverviewPage({ settings, campaignId }: {settings
      {message && <DismissibleAlert tone="success" resetKey={message} floating>{message}</DismissibleAlert>}

      <LoadingFrame loading={loading} label="i18n:govoplan-campaign.loading_campaign_overview.ffa1adf0">
-        <div className="metric-grid campaign-overview-metrics current-version-metrics">
-          <MetricCard label="i18n:govoplan-campaign.version.2da600bf" value={data.currentVersion?.version_number ? `#${data.currentVersion.version_number}` : "—"} tone="neutral" />
-          <MetricCard label="i18n:govoplan-campaign.fields.e8b68527" value={versionMetrics.fieldCount} tone="info" />
-          <MetricCard label="i18n:govoplan-campaign.recipients.78cbf8eb" value={versionMetrics.recipientCount} tone="neutral" detail="i18n:govoplan-campaign.active_inline_recipients.8ba58f6e" />
-          <MetricCard label="i18n:govoplan-campaign.template_health.22e14b59" value={versionMetrics.templateHealthValue} tone={versionMetrics.templateHealthTone} detail={versionMetrics.templateHealthDetail} />
-        </div>
-
        <div className="metric-grid campaign-overview-metrics">
          <MetricCard label="i18n:govoplan-campaign.queueable.ea776f8d" value={data.summary?.cards?.queueable ?? "—"} tone="good" detail="i18n:govoplan-campaign.ready_or_warning.4dcce676" />
          <MetricCard label="i18n:govoplan-campaign.needs_attention.a126722e" value={data.summary?.cards?.needs_attention ?? "—"} tone="warning" detail="i18n:govoplan-campaign.review_first.741ac781" />
@@ -163,23 +168,10 @@ export default function CampaignOverviewPage({ settings, campaignId }: {settings
          <MetricCard label="i18n:govoplan-campaign.failed.09fef5d8" value={data.summary?.cards?.failed ?? "—"} tone="danger" detail="i18n:govoplan-campaign.smtp_failures.00b33b85" />
        </div>

-        <Card title="i18n:govoplan-campaign.current_version_state.f581778f" actions={<Link
-          to={`send?version=${campaign?.current_version_id}`}
-          className={`btn btn-primary`}
-          aria-label={i18nMessage("i18n:govoplan-campaign.open_curent_version.cc1cd678", {})}
-          title={i18nMessage("i18n:govoplan-campaign.open_curent_version.cc1cd678", {})}>
-          
-              i18n:govoplan-campaign.open.cf9b7706
-            </Link>}>
-          <div className="summary-grid overview-summary-grid">
-            <SummaryTile label="i18n:govoplan-campaign.validation_errors.e54ca4fe" value={summaryValue(data.currentVersion?.validation_summary, ["error_count", "errors", "blocked"])} />
-            <SummaryTile label="i18n:govoplan-campaign.warnings.1430f976" value={summaryValue(data.currentVersion?.validation_summary, ["warning_count", "warnings"])} />
-            <SummaryTile label="i18n:govoplan-campaign.built_messages.1fb804f2" value={summaryValue(data.currentVersion?.build_summary, ["built_count", "built", "messages_built"])} />
-            <SummaryTile label="i18n:govoplan-campaign.jobs_total.98da65bc" value={data.summary?.cards?.jobs_total ?? "—"} />
-          </div>
-        </Card>
-
-        <Card title="i18n:govoplan-campaign.campaign_identity.a00ca574" collapsible>
+        <Card
+          title="i18n:govoplan-campaign.campaign_identity.a00ca574"
+          collapsible
+          actions={<Link to="wizard/create"><Button>i18n:govoplan-campaign.edit_with_wizard.672a7d1a</Button></Link>}>
          <div className="form-grid campaign-identity-grid">
            <FormField label="i18n:govoplan-campaign.campaign_id.4c4ed79e">
              <input value={identity.external_id} onChange={(event) => patchIdentity("external_id", event.target.value)} />
@@ -198,8 +190,27 @@ export default function CampaignOverviewPage({ settings, campaignId }: {settings
          </div>
        </Card>

-        <Card title="i18n:govoplan-campaign.version_history.91f86581" collapsible>
-          <div className="admin-table-surface">
+        <Card title="Versions" collapsible actions={<Link
+          to={`send?version=${campaign?.current_version_id}`}
+          className={`btn btn-primary`}
+          aria-label={i18nMessage("i18n:govoplan-campaign.open_curent_version.cc1cd678", {})}
+          title={i18nMessage("i18n:govoplan-campaign.open_curent_version.cc1cd678", {})}>
+
+              i18n:govoplan-campaign.open.cf9b7706
+            </Link>}>
+          <div className="metric-grid inside campaign-versions-metrics">
+            <MetricCard label="i18n:govoplan-campaign.version.2da600bf" value={data.currentVersion?.version_number ? `#${data.currentVersion.version_number}` : "—"} tone="neutral" />
+            <MetricCard label="i18n:govoplan-campaign.fields.e8b68527" value={versionMetrics.fieldCount} tone="info" />
+            <MetricCard label="i18n:govoplan-campaign.recipients.78cbf8eb" value={versionMetrics.recipientCount} tone="neutral" detail="i18n:govoplan-campaign.active_inline_recipients.8ba58f6e" />
+            <MetricCard label="i18n:govoplan-campaign.template_health.22e14b59" value={versionMetrics.templateHealthValue} tone={versionMetrics.templateHealthTone} detail={versionMetrics.templateHealthDetail} />
+          </div>
+          <div className="summary-grid overview-summary-grid">
+            <SummaryTile label="i18n:govoplan-campaign.validation_errors.e54ca4fe" value={summaryValue(data.currentVersion?.validation_summary, ["error_count", "errors", "blocked"])} />
+            <SummaryTile label="i18n:govoplan-campaign.warnings.1430f976" value={summaryValue(data.currentVersion?.validation_summary, ["warning_count", "warnings"])} />
+            <SummaryTile label="i18n:govoplan-campaign.built_messages.1fb804f2" value={summaryValue(data.currentVersion?.build_summary, ["built_count", "built", "messages_built"])} />
+            <SummaryTile label="i18n:govoplan-campaign.jobs_total.98da65bc" value={data.summary?.cards?.jobs_total ?? "—"} />
+          </div>
+          <div className="admin-table-surface version-history-table-surface">
            <DataGrid
              id={`campaign-${campaignId}-versions`}
              rows={versions}
--- a/webui/src/styles/campaign-workspace.css
+++ b/webui/src/styles/campaign-workspace.css
@@ -706,6 +706,53 @@
  align-items: center;
  padding-bottom: 2px;
 }
+.campaign-header-toggle-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 8px 18px;
+}
+.recipient-address-header-control {
+  min-width: 0;
+}
+.recipient-address-header-summary {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto auto;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  min-height: 36px;
+  border: var(--border-line);
+  border-radius: var(--radius-sm);
+  background: var(--panel);
+  color: var(--text);
+  padding: 6px 9px;
+  font-size: 13px;
+  line-height: 1.25;
+}
+.recipient-address-header-text {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+}
+.recipient-address-header-text > span:first-child {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.recipient-address-header-summary.is-empty {
+  color: var(--muted);
+  font-style: italic;
+}
+.recipient-address-inline-button {
+  width: 28px;
+  height: 28px;
+}
+.recipient-address-inline-button svg {
+  width: 16px;
+  height: 16px;
+}
 .recipient-add-row td {
  background: var(--panel-soft);
 }
@@ -922,13 +969,160 @@

 /* Recipient/profile split pages. */
 .recipient-address-table th:nth-child(1),
-.recipient-address-table td:nth-child(1) { width: 42px; }
+.recipient-address-table td:nth-child(1) { width: 72px; }
 .recipient-address-table th:last-child,
-.recipient-address-table td:last-child { width: 123px; }
-.recipient-address-table td { vertical-align: top; }
-.recipient-address-table .email-address-input { min-width: 220px; }
+.recipient-address-table td:last-child { width: 180px; }
+.recipient-address-table td { vertical-align: middle; }
 .recipient-address-table .toggle-switch { white-space: nowrap; }

+.recipient-address-editor-trigger {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  width: 100%;
+  min-height: 34px;
+  border: var(--border-line);
+  border-radius: var(--radius-sm);
+  background: var(--panel);
+  color: var(--text);
+  cursor: pointer;
+  font: inherit;
+  padding: 5px 8px;
+  text-align: left;
+}
+
+.recipient-address-editor-trigger:hover,
+.recipient-address-editor-trigger:focus-visible {
+  border-color: var(--accent);
+  background: var(--surface-subtle);
+  outline: none;
+}
+
+.recipient-address-editor-trigger.is-readonly {
+  cursor: default;
+  opacity: .78;
+}
+
+.recipient-address-editor-trigger.is-readonly:hover {
+  border-color: var(--line);
+  background: var(--panel);
+}
+
+.recipient-address-editor-trigger svg {
+  flex: 0 0 auto;
+  width: 16px;
+  height: 16px;
+  color: var(--muted);
+}
+
+.recipient-address-editor-main {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex-wrap: wrap;
+}
+
+.recipient-data-address.is-empty {
+  color: var(--muted);
+  font-style: italic;
+}
+
+.recipient-address-editor-modal {
+  width: min(900px, calc(100vw - 32px));
+}
+
+.recipient-address-editor-body {
+  max-height: min(72vh, 760px);
+  overflow: auto;
+}
+
+.recipient-address-editor {
+  display: grid;
+  gap: 12px;
+}
+
+.recipient-address-category {
+  display: grid;
+  gap: 10px;
+  min-width: 0;
+  border: var(--border-line);
+  border-radius: var(--radius-sm);
+  background: var(--panel);
+  padding: 10px;
+}
+
+.recipient-address-category-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.recipient-address-category-header h3 {
+  margin: 0;
+  font-size: 15px;
+  color: var(--text-strong);
+}
+
+.recipient-address-category-controls {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+}
+
+.recipient-address-mode-static {
+  display: inline-flex;
+  align-items: center;
+  min-height: 32px;
+  border: var(--border-line);
+  border-radius: var(--radius-sm);
+  background: var(--panel-soft);
+  color: var(--muted);
+  font-size: 12px;
+  font-weight: 700;
+  padding: 0 10px;
+}
+
+.recipient-address-lines {
+  display: grid;
+  gap: 8px;
+}
+
+.recipient-address-empty-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 8px;
+  align-items: center;
+}
+
+.recipient-address-empty {
+  margin: 0;
+}
+
+.recipient-address-edit-line {
+  display: grid;
+  grid-template-columns: minmax(150px, .7fr) minmax(220px, 1fr) auto;
+  gap: 8px;
+  align-items: center;
+}
+
+.recipient-address-edit-line input {
+  min-width: 0;
+}
+
+.recipient-address-line-actions {
+  width: auto;
+  justify-content: end;
+}
+
+.recipient-merged-data-table .recipient-field-input {
+  min-width: 150px;
+}
+
 .recipient-data-table td { vertical-align: top; }
 .recipient-data-identity-cell { white-space: normal !important; }
 .recipient-data-identity {
@@ -973,6 +1167,18 @@
 .recipient-data-table td:nth-child(3) { min-width: 192px; }
 .recipient-index-cell { white-space: nowrap; }

+@media (max-width: 720px) {
+  .recipient-address-empty-row,
+  .recipient-address-edit-line {
+    grid-template-columns: 1fr;
+  }
+
+  .recipient-address-category-header {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+}
+
 .locked-version-notice .alert-message {
  display: flex;
  align-items: center;
@@ -1067,6 +1273,12 @@
 }

 /* Overview version history refinements. */
+.version-history-table-surface {
+  margin-top: 14px;
+  max-height: 420px;
+  overflow: auto;
+}
+
 .version-history-table .current-version-row td {
  font-weight: 700;
 }
@@ -1128,6 +1340,10 @@
  min-height: 68px;
 }

+.message-preview-modal .modal-footer > .button-row {
+  margin-right: auto;
+}
+
 .message-preview-modal .message-display-body,
 .message-preview-modal .message-display-html-frame {
  height: clamp(280px, 45vh, 520px);
@@ -1247,7 +1463,7 @@
 }
 /* Review & Send workflow page. */
 .review-send-page {
-  --review-flow-purple: var(--review-flow-purple);
+  --review-flow-partial: var(--review-flow-purple, #9b86c7);
 }

 .review-flow-navigation {
@@ -1344,7 +1560,11 @@
  height: 2px;
  margin: 21px 2px 0;
  flex: 0 0 auto;
-  background: linear-gradient(to right, var(--review-nav-color), var(--review-nav-next-color));
+  background: linear-gradient(
+    to right,
+    var(--review-nav-line-color, var(--review-nav-color)),
+    var(--review-nav-line-next-color, var(--review-nav-next-color, var(--review-nav-color)))
+  );
  opacity: .82;
 }

@@ -1395,7 +1615,11 @@
  min-height: 54px;
  margin: 4px 0 -14px;
  border-radius: 999px;
-  background: linear-gradient(to bottom, var(--review-stage-color), var(--review-next-stage-color));
+  background: linear-gradient(
+    to bottom,
+    var(--review-stage-line-color, var(--review-stage-color)),
+    var(--review-next-stage-line-color, var(--review-next-stage-color, var(--review-stage-color)))
+  );
  opacity: .82;
 }

@@ -1452,12 +1676,132 @@
 .review-flow-state-badge[data-state="active"],
 .review-flow-state-badge[data-state="running"] { --review-badge-color: var(--blue); }
 .review-flow-state-badge[data-state="partial"],
-.review-flow-state-badge[data-state="stale"] { --review-badge-color: var(--review-flow-purple); }
+.review-flow-state-badge[data-state="stale"] { --review-badge-color: var(--review-flow-partial); }

 .review-flow-stage-content {
  min-height: 150px;
 }

+.attachment-linking-preview {
+  margin-top: 14px;
+}
+
+.attachment-linking-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+}
+
+.attachment-linking-header h3 {
+  margin: 0 0 4px;
+}
+
+.attachment-linking-file-list {
+  display: grid;
+  gap: 6px;
+  margin: 10px 0 0;
+  padding: 0;
+  list-style: none;
+}
+
+.attachment-linking-file-list.is-compact {
+  max-height: min(240px, 32vh);
+  overflow: auto;
+  padding-right: 4px;
+  scrollbar-gutter: stable;
+}
+
+.attachment-linking-file-list:focus-visible {
+  border-radius: var(--radius-sm);
+  outline: 2px solid var(--accent);
+  outline-offset: 3px;
+}
+
+.attachment-linking-file-list li {
+  display: grid;
+  grid-template-columns: 22px minmax(0, 1fr);
+  gap: 8px;
+  align-items: flex-start;
+  padding: 7px 8px;
+  border: var(--border-line);
+  border-radius: var(--radius-sm);
+  background: var(--surface);
+}
+
+.attachment-linking-file-list li > svg {
+  width: 18px;
+  height: 18px;
+  margin-top: 1px;
+  color: var(--green);
+}
+
+.attachment-linking-file-list li[data-linked="false"] > svg {
+  color: var(--red);
+}
+
+.attachment-linking-file-list li > span {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
+}
+
+.attachment-linking-file-list strong,
+.attachment-linking-file-list small {
+  min-width: 0;
+  overflow-wrap: anywhere;
+}
+
+.attachment-linking-file-list strong {
+  color: var(--text-strong);
+}
+
+.attachment-linking-file-list small {
+  color: var(--muted);
+  font-size: 12px;
+}
+
+.review-flow-fact-detail-button {
+  border: 0;
+  border-bottom: 1px solid currentColor;
+  background: transparent;
+  color: inherit;
+  cursor: pointer;
+  font: inherit;
+  font-weight: inherit;
+  padding: 0;
+}
+
+.review-flow-fact-detail-button:hover,
+.review-flow-fact-detail-button:focus-visible {
+  color: var(--accent);
+  outline: none;
+}
+
+.attachment-linking-detail-modal {
+  width: min(760px, calc(100vw - 48px));
+  height: min(680px, calc(100dvh - 48px));
+}
+
+.attachment-linking-detail-body {
+  display: grid;
+  grid-template-rows: auto minmax(0, 1fr);
+  gap: 12px;
+  overflow: hidden;
+}
+
+.attachment-linking-detail-body > .small-note {
+  margin: 0;
+}
+
+.attachment-linking-file-list.is-detail {
+  min-height: 0;
+  margin: 0;
+  overflow: auto;
+  padding-right: 4px;
+  scrollbar-gutter: stable;
+}
+
 .review-flow-stage-card.is-locked .review-flow-stage-header {
  opacity: .58;
  filter: grayscale(.25);
@@ -1587,8 +1931,8 @@
  background: color-mix(in srgb, var(--red) 10%, var(--surface));
 }
 .review-flow-inline-note.is-stale {
-  border-left-color: var(--review-flow-purple);
-  background: color-mix(in srgb, var(--review-flow-purple) 11%, var(--surface));
+  border-left-color: var(--review-flow-partial);
+  background: color-mix(in srgb, var(--review-flow-partial) 11%, var(--surface));
 }

 .review-flow-result-line {
@@ -1693,6 +2037,15 @@

 .review-flow-data-section > .data-grid-shell {
  max-height: 420px;
+  display: flex;
+  flex-direction: column;
+}
+
+.review-flow-data-section > .data-grid-shell > .data-grid-scroll-region {
+  flex: 1 1 auto;
+  min-height: 0;
+  max-height: 420px;
+  overflow: auto;
 }

 .review-flow-data-section > .small-note {
@@ -1779,6 +2132,7 @@
 .attachment-zip-table-wrap .toggle-switch-row {
  min-height: 36px;
  gap: 8px;
+  white-space: nowrap;
 }

 .attachment-zip-table-wrap select {