chore: release v0.23.0

2026-08-02 20:03:16 +02:00
parent f6cd6e999a
commit 72f692aa04
13 changed files with 433 additions and 88 deletions
@@ -99,47 +99,42 @@ function statusFor(p: any): SpotStatusEntry | undefined {
  ];
 }

-// statusBadge maps a resolved spot status to a short labelled badge for the
-// Status column, using the same colours as the per-cell fills (NEW DXCC =
-// call cell, NEW BAND = band cell, NEW SLOT = mode cell). Returns null when
-// there's nothing notable to show.
-type Badge = { text: string; fg: string; bg: string; bd: string };
+// Spot status is shown by COLOURING THE TEXT, never by a pill or a badge.
+//
+// The pills were dropped: a rounded box has its own height and padding, so it
+// sat off the row's baseline and the callsign inside it no longer lined up with
+// the plain callsigns above and below. A whole column of them read as chrome
+// rather than as data. Same reasoning — and the same semantic tokens — as the
+// Y/N/R QSL columns in lib/qslStatus.ts.
+//
+// Which cell is coloured IS the message, so one colour is enough for all three:
+//
+//   yellow call → new DXCC     yellow band → new band     yellow mode → new mode
+//   blue call   → already worked
+const NEW = 'var(--warning)'; // yellow: something here is new
+const WKD = 'var(--info)';    // blue: this callsign is already in the log

-// tok builds a badge from a semantic status token (success/warning/caution/
-// danger/info/neutral) so the colours adapt to every theme via CSS variables,
-// instead of the hard-coded light-theme pastels that looked wrong in dark mode.
-function tok(name: string, text: string): Badge {
-  if (name === 'neutral') return { text, fg: 'var(--muted-foreground)', bg: 'var(--muted)', bd: 'var(--border)' };
-  return { text, fg: `var(--${name}-muted-foreground)`, bg: `var(--${name}-muted)`, bd: `var(--${name}-border)` };
-}
-
-// cellChip wraps a Band/Mode cell value in a small rounded pill (same look as the
-// Status badges) when the slot is notable, instead of flooding the whole cell with
-// a heavy muted fill that turned into an ugly olive block on dark themes. `name` is
-// null → plain text, no pill.
-function cellChip(value: any, name: string | null): any {
+// cellText renders a cell value in an optional colour. An empty value keeps the
+// muted dash the grid used before, so blank cells still read as "nothing here"
+// rather than as a gap.
+function cellText(value: any, color: string | null): any {
  const txt = value === undefined || value === null || value === '' ? '' : String(value);
-  if (!name) return txt || <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
-  // Inherit the column's font size (no fixed 9px / height) so a pill around a
-  // callsign stays the same size as the plain callsigns next to it — just tinted
-  // and rounded, not shrunk.
-  return (
-    <span style={{
-      display: 'inline-flex', alignItems: 'center', lineHeight: 1.1,
-      backgroundColor: `var(--${name}-muted)`, color: `var(--${name}-muted-foreground)`,
-      border: `1px solid var(--${name}-border)`, fontWeight: 700,
-      padding: '1px 6px', borderRadius: 999, whiteSpace: 'nowrap',
-    }}>{txt}</span>
-  );
+  if (!txt) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
+  return <span style={color ? { color, fontWeight: 700 } : undefined}>{txt}</span>;
 }

-function statusBadge(t: TFn, s: SpotStatusEntry | undefined): Badge | null {
+// statusColor is the colour for a resolved status in the Status column. County
+// and POTA keep their own tokens: they are orthogonal to the band/mode/DXCC
+// story and an operator filters on them separately.
+function statusColor(s: SpotStatusEntry | undefined): string | null {
  switch (s?.status) {
-    case 'new':      return tok('danger',  t('clg2.newDxcc'));
-    case 'new-band': return tok('warning', t('clg2.newBand'));
-    case 'new-mode': return tok('caution', t('clg2.newMode'));
-    case 'new-slot': return tok('caution', t('clg2.newSlot'));
-    default:         return s?.worked_call ? tok('neutral', t('clg2.wkdCall')) : null;
+    case 'new':
+    case 'new-band':
+    case 'new-mode':
+    case 'new-slot':
+      return NEW;
+    default:
+      return s?.worked_call ? WKD : null;
  }
 }

@@ -166,15 +161,12 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
    headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
    defaultVisible: true,
    cellClass: 'font-mono',
-    // NEW DXCC → a danger pill around the call, consistent with the NEW BAND /
-    // NEW MODE pills (same look, same tokens). Worked-call stays blue bold text;
-    // a plain spot inherits the theme's normal text colour so callsigns blend in
-    // with the rest of the row instead of always shouting a colour.
+    // NEW DXCC → yellow call. Already worked → blue call. Anything else keeps
+    // the theme's normal ink so ordinary callsigns don't shout.
    cellRenderer: (p: any) => {
      const s = statusFor(p);
-      if (s?.status === 'new') return cellChip(p.value, 'danger');
-      const color = s?.worked_call ? 'var(--info)' : undefined;
-      return <span style={{ color, fontWeight: 700 }}>{p.value ?? ''}</span>;
+      const color = s?.status === 'new' ? NEW : s?.worked_call ? WKD : null;
+      return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
    },
    tooltipValueGetter: (p: any) => {
      const s = statusFor(p);
@@ -185,9 +177,10 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
    group: 'Spot', label: t('clg2.c.status'), colId: 'status',
    headerName: t('clg2.c.status'), width: 120, sortable: true,
    defaultVisible: true,
-    // Spells out the slot status as a text badge so NEW SLOT (and the others)
-    // is obvious at the row level, not just a single coloured cell. NEW COUNTY
-    // and NEW POTA are orthogonal, so they stack as extra badges.
+    // Spells the status out in words so NEW SLOT (and the others) is obvious at
+    // the row level, not just a single coloured cell — NEW SLOT in particular
+    // colours no cell at all, since neither the band nor the mode is new on its
+    // own. NEW COUNTY and NEW POTA are orthogonal, so they stack after it.
    valueGetter: (p: any) => {
      const s = statusFor(p);
      const parts: string[] = [];
@@ -202,21 +195,25 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
    },
    cellRenderer: (p: any) => {
      const s = statusFor(p);
-      const badges: Badge[] = [];
-      const b = statusBadge(t, s);
-      if (b) badges.push(b);
-      if (s?.new_county) badges.push(tok('info', t('clg2.newCounty')));
-      if (s?.new_pota) badges.push(tok('success', t('clg2.newPota')));
-      if (badges.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
+      const parts: { text: string; color: string }[] = [];
+      const main = statusColor(s);
+      if (main) {
+        const label = s?.status === 'new' ? t('clg2.newDxcc')
+          : s?.status === 'new-band' ? t('clg2.newBand')
+            : s?.status === 'new-mode' ? t('clg2.newMode')
+              : s?.status === 'new-slot' ? t('clg2.newSlot')
+                : t('clg2.wkdCall');
+        parts.push({ text: label, color: main });
+      }
+      if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: 'var(--info)' });
+      if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: 'var(--success)' });
+      if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
      return (
-        <span style={{ display: 'flex', height: '100%', flexWrap: 'wrap', gap: 2, alignItems: 'center' }}>
-          {badges.map((bd, i) => (
-            <span key={i} style={{
-              display: 'inline-flex', alignItems: 'center', height: 15, lineHeight: 1,
-              backgroundColor: bd.bg, color: bd.fg, border: `1px solid ${bd.bd}`,
-              fontWeight: 700, fontSize: 9,
-              padding: '0 5px', borderRadius: 999, letterSpacing: 0.3, whiteSpace: 'nowrap',
-            }}>{bd.text}</span>
+        <span style={{ whiteSpace: 'nowrap' }}>
+          {parts.map((pt, i) => (
+            <span key={i} style={{ color: pt.color, fontWeight: 700 }}>
+              {i > 0 ? ' · ' : ''}{pt.text}
+            </span>
          ))}
        </span>
      );
@@ -249,8 +246,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
    headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
    defaultVisible: true,
    cellClass: 'font-mono',
-    // NEW BAND for this entity → small warning pill around the band text.
-    cellRenderer: (p: any) => cellChip(p.value, statusFor(p)?.status === 'new-band' ? 'warning' : null),
+    // NEW BAND for this entity → the band text turns yellow.
+    cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-band' ? NEW : null),
    tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
  },
  {
@@ -263,7 +260,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
    // for the entity. NEW SLOT means band AND mode were each worked before (just
    // not together), so highlighting the mode cell would wrongly imply "CW is new";
    // that case is signalled by the Status badge alone.
-    cellRenderer: (p: any) => cellChip(p.value, statusFor(p)?.status === 'new-mode' ? 'caution' : null),
+    cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-mode' ? NEW : null),
    tooltipValueGetter: (p: any) => {
      const st = statusFor(p)?.status;
      if (st === 'new-mode') return t('clg2.tipNewMode');
@@ -3298,6 +3298,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
          <Button variant="outline" size="sm" onClick={addAmp}>
            <Plus className="size-3.5 mr-1" /> {t('amp.add')}
          </Button>
+
        </div>
      </>
    );
@@ -33,13 +33,15 @@ type DevStatus = { id: string; name: string; type: string; connected: boolean; e
 const CARD_MIN = 430; // narrowest a card may get before "Auto" drops a column
 const GRID_GAP = 16; // px between cards, both axes

-const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8 };
-const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)' };
+const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2 };
+const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay' };

 // Relay count for a configured device: fixed by type, except Denkovi (4/8) and
 // the generic USB-serial board, whose channel count the user picks.
 const chanCount = (d: Device): number =>
-  (d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8) : (RELAY_COUNT[d.type] ?? 5);
+  (d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8)
+    : d.type === 'dingtian' ? (d.channels && d.channels >= 1 ? d.channels : 2)
+      : (RELAY_COUNT[d.type] ?? 5);

 function blankDevice(): Device {
  return { id: '', type: 'webswitch', name: '', host: '', user: '', pass: '', labels: Array(5).fill('') };
@@ -552,6 +554,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
    onChange({ ...device, channels, labels });
  };
  const isKM = device.type === 'kmtronic';
+  const isDingtian = device.type === 'dingtian';
  const isDenkovi = device.type === 'denkovi';
  const isUsbRelay = device.type === 'usbrelay';
  // COM ports for the generic USB-serial relay picker.
@@ -602,6 +605,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
            <SelectContent>
              <SelectItem value="webswitch">WebSwitch 1216H (5 relays)</SelectItem>
              <SelectItem value="kmtronic">KMTronic 8-relay (LAN)</SelectItem>
+              <SelectItem value="dingtian">Dingtian IOT relay (LAN / WiFi)</SelectItem>
              <SelectItem value="denkovi">Denkovi USB (FT245 / D2XX)</SelectItem>
              <SelectItem value="usbrelay">Denkovi USB (serial / COM)</SelectItem>
            </SelectContent>
@@ -612,13 +616,13 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
          <Input value={device.name} placeholder={TYPE_LABEL[device.type]} onChange={(e) => onChange({ ...device, name: e.target.value })} />
        </div>
      </div>
-      {(isDenkovi || isUsbRelay) && (
+      {(isDenkovi || isUsbRelay || isDingtian) && (
        <div className="space-y-1 max-w-[10rem]">
          <Label>{t('station.channels')}</Label>
          <Select value={String(chanCount(device))} onValueChange={(v) => setChannels(parseInt(v, 10))}>
            <SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
            <SelectContent>
-              {(isDenkovi ? [4, 8] : [1, 2, 4, 8, 16]).map((n) => (
+              {(isDenkovi ? [4, 8] : isDingtian ? [2, 4, 8, 16, 24, 32] : [1, 2, 4, 8, 16]).map((n) => (
                <SelectItem key={n} value={String(n)}>{n}</SelectItem>
              ))}
            </SelectContent>
@@ -661,11 +665,28 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
          <p className="text-[10px] text-muted-foreground">{t('station.usbRelayHint')}</p>
        </div>
      ) : (
-      <div className={cn('grid gap-3', isKM ? 'grid-cols-3' : 'grid-cols-1')}>
-        <div className={cn('space-y-1', isKM ? '' : 'max-w-xs')}>
+      <div className={cn('grid gap-3', (isKM || isDingtian) ? 'grid-cols-3' : 'grid-cols-1')}>
+        <div className={cn('space-y-1', (isKM || isDingtian) ? '' : 'max-w-xs')}>
          <Label>{t('station.host')}</Label>
          <Input className="font-mono" value={device.host} placeholder="192.168.1.100" onChange={(e) => onChange({ ...device, host: e.target.value })} />
        </div>
+        {/* Dingtian: both are OFF on a factory board — the session ID only when
+            "HTTP Session" is enabled in its web page, the password only when a
+            relay password is set. */}
+        {isDingtian && (
+          <>
+            <div className="space-y-1">
+              <Label>{t('station.dtSession')}</Label>
+              <Input className="font-mono" value={device.user ?? ''} placeholder={t('station.optional')}
+                onChange={(e) => onChange({ ...device, user: e.target.value })} />
+            </div>
+            <div className="space-y-1">
+              <Label>{t('station.dtPwd')}</Label>
+              <Input className="font-mono" value={device.pass ?? ''} placeholder="0"
+                onChange={(e) => onChange({ ...device, pass: e.target.value.replace(/[^0-9]/g, '') })} />
+            </div>
+          </>
+        )}
        {isKM && (
          <>
            <div className="space-y-1">