@oneuptime/common 12.0.23 → 12.0.25

package/UI/Components/StatusPage/ResourceList.tsx

@@ -2,6 +2,7 @@ import StatusPageResource from "../../../Models/DatabaseModels/StatusPageResourc
 import IconProp from "../../../Types/Icon/IconProp";
 import StatusPageResourceExplorerUtil from "../../../Utils/StatusPage/ResourceExplorer";
 import Button, { ButtonSize, ButtonStyleType } from "../Button/Button";
+import CheckboxElement from "../Checkbox/Checkbox";
 import Icon from "../Icon/Icon";
 import MoreMenu from "../MoreMenu/MoreMenu";
 import MoreMenuItem from "../MoreMenu/MoreMenuItem";
@@ -40,6 +41,28 @@ export interface ComponentProps {
    */
   isReorderable: boolean;
 
+  /*
+   * Whether the rows carry checkboxes at all.
+   *
+   * Off for anybody who cannot remove a resource. Removing is the only thing a
+   * selection is for here, so without it the column would be a row of controls
+   * that lead nowhere - and it would cost every row 28px of the width its
+   * monitor's name is drawn in.
+   */
+  isSelectable: boolean;
+  /* Held by the caller: a selection outlives this list's re-renders. */
+  selectedResourceIds: Set<string>;
+  /*
+   * The state of the box at the top of the list, computed by the caller over
+   * everything this list was handed - which is the whole point of it being
+   * computed there. A filtered list's "select all" means the rows the search
+   * matched, and rows held back behind "Show more" are matched rows too.
+   */
+  isAllSelected: boolean;
+  isSelectionIndeterminate: boolean;
+  onToggleResourceSelected: (statusPageResource: StatusPageResource) => void;
+  onToggleAllSelected: (isSelected: boolean) => void;
+
   onEdit: (statusPageResource: StatusPageResource) => void;
   onDelete: (statusPageResource: StatusPageResource) => void;
   onShowId: (statusPageResource: StatusPageResource) => void;
@@ -90,6 +113,12 @@ export interface ComponentProps {
  * rather than one copy per breakpoint.
  */
 const GRIP_COLUMN_CLASS_NAME: string = "w-5 flex-shrink-0";
+/*
+ * Wider than the 16px box it holds: the checkbox draws an empty label beside
+ * itself with a 12px gutter, and a narrower column would push the grip out from
+ * under the header's own box.
+ */
+const SELECT_COLUMN_CLASS_NAME: string = "flex w-7 flex-shrink-0 items-center";
 /*
  * Held back on a phone, where 24px of number costs a fifth of what is left for
  * the monitor's name and the rows are already in the order it describes.
@@ -239,6 +268,49 @@ const ResourceList: FunctionComponent<ComponentProps> = (
     );
   };
 
+  type RenderSelectFunction = (
+    statusPageResource: StatusPageResource,
+  ) => ReactElement;
+
+  /*
+   * One row's checkbox. Nothing is drawn at all when selection is off, rather
+   * than an empty column: unlike the grip - which is held open so that typing
+   * into the search box does not shift every row sideways - the checkbox column
+   * appears and disappears with the operator's permissions, which do not change
+   * while they are looking at the list.
+   */
+  const renderSelect: RenderSelectFunction = (
+    statusPageResource: StatusPageResource,
+  ): ReactElement => {
+    if (!props.isSelectable) {
+      return <></>;
+    }
+
+    const resourceId: string | null =
+      StatusPageResourceExplorerUtil.getResourceId(statusPageResource);
+    const name: string =
+      StatusPageResourceExplorerUtil.getResourceName(statusPageResource);
+
+    return (
+      <span
+        className={SELECT_COLUMN_CLASS_NAME}
+        data-testid="status-page-resource-row-select"
+      >
+        <CheckboxElement
+          value={Boolean(
+            resourceId && props.selectedResourceIds.has(resourceId),
+          )}
+          disabled={!resourceId}
+          ariaLabel={`Select ${name}`}
+          hoverText={`Select ${name}`}
+          onChange={() => {
+            props.onToggleResourceSelected(statusPageResource);
+          }}
+        />
+      </span>
+    );
+  };
+
   type RenderRowBodyFunction = (
     statusPageResource: StatusPageResource,
     index: number,
@@ -256,6 +328,8 @@ const ResourceList: FunctionComponent<ComponentProps> = (
 
     return (
       <>
+        {renderSelect(statusPageResource)}
+
         {dragHandle}
 
         {/*
@@ -347,32 +421,60 @@ const ResourceList: FunctionComponent<ComponentProps> = (
     );
   };
 
-  type GetRowClassNameFunction = (
-    isDragging: boolean,
-    isBusy: boolean,
-    isLastRow: boolean,
-  ) => string;
-
-  const getRowClassName: GetRowClassNameFunction = (
-    isDragging: boolean,
-    isBusy: boolean,
-    isLastRow: boolean,
-  ): string => {
+  type GetRowClassNameFunction = (data: {
+    isDragging: boolean;
+    isBusy: boolean;
+    isLastRow: boolean;
+    isSelected: boolean;
+  }) => string;
+
+  const getRowClassName: GetRowClassNameFunction = (data: {
+    isDragging: boolean;
+    isBusy: boolean;
+    isLastRow: boolean;
+    isSelected: boolean;
+  }): string => {
+    /*
+     * A selected row is filled, so that a selection made near the top of a long
+     * list is still visible from the bottom of it - the count in the bulk bar
+     * says how many, and this says which.
+     *
+     * Un-suffixed colour tokens throughout, for the same reason the dragged row
+     * uses them: the dark theme remaps those and not the transparent ones, so
+     * an opacity modifier leaves a light row in a dark list.
+     */
+    const restingClassName: string = data.isSelected
+      ? "bg-indigo-50 hover:bg-indigo-100"
+      : "bg-white hover:bg-gray-50";
+
     return `${ROW_CLASS_NAME} ${
-      isDragging
+      data.isDragging
         ? /*
-           * bg-indigo-50 rather than bg-indigo-50/70: the dark theme remaps the
-           * un-suffixed colour tokens and not the transparent ones, so an
-           * opacity modifier leaves a light row in a dark list.
-           *
            * A lifted row is rounded on all four corners because it is off the
            * list while it is being dragged; a settled one only rounds where the
            * container does, so its hover fill cannot square off the card's own
            * bottom corners.
            */
           "rounded-xl bg-indigo-50 shadow-md ring-1 ring-indigo-200"
-        : `bg-white hover:bg-gray-50 ${isLastRow ? "rounded-b-xl" : ""}`
-    } ${isBusy ? "opacity-60" : ""}`;
+        : `${restingClassName} ${data.isLastRow ? "rounded-b-xl" : ""}`
+    } ${data.isBusy ? "opacity-60" : ""}`;
+  };
+
+  type IsResourceSelectedFunction = (
+    statusPageResource: StatusPageResource,
+  ) => boolean;
+
+  const isResourceSelected: IsResourceSelectedFunction = (
+    statusPageResource: StatusPageResource,
+  ): boolean => {
+    if (!props.isSelectable) {
+      return false;
+    }
+
+    const resourceId: string | null =
+      StatusPageResourceExplorerUtil.getResourceId(statusPageResource);
+
+    return Boolean(resourceId && props.selectedResourceIds.has(resourceId));
   };
 
   type IsLastRowFunction = (index: number) => boolean;
@@ -388,32 +490,82 @@ const ResourceList: FunctionComponent<ComponentProps> = (
   type RenderHeaderFunction = () => ReactElement;
 
   /*
-   * Column headings, from sm up. They are what makes the second column read as
-   * "the name visitors see" rather than as a stray subtitle, and they are the
-   * only place the position column can be explained at all.
+   * Column headings, from sm up, and the box that selects the whole list.
+   *
+   * The headings are what makes the second column read as "the name visitors
+   * see" rather than as a stray subtitle, and they are the only place the
+   * position column can be explained at all. Below sm the published name wraps
+   * under the monitor instead of sitting beside it, so they would be labelling
+   * columns that are not there - and the row is hidden.
    *
-   * Below sm the published name wraps under the monitor instead of sitting
-   * beside it, so a header row would be labelling columns that are not there.
+   * The select-all box is not a heading, though, and a phone is exactly where
+   * removing twenty seven monitors one at a time hurts most. So when there is a
+   * checkbox column the row is drawn at every width, with the headings held
+   * back below sm and the box given a visible label of its own instead.
+   *
+   * aria-hidden sits on the individual headings rather than on the row, because
+   * the row now contains a control: hiding a focusable checkbox from the
+   * accessibility tree while leaving it in the tab order is worse than not
+   * offering it.
    */
   const renderHeader: RenderHeaderFunction = (): ReactElement => {
     return (
       <div
-        className="hidden items-center gap-x-3 rounded-t-xl border-b border-gray-200 bg-gray-50 px-4 py-2 text-[11px] font-semibold uppercase tracking-wide text-gray-500 sm:flex"
+        className={`${
+          props.isSelectable ? "flex" : "hidden sm:flex"
+        } items-center gap-x-3 rounded-t-xl border-b border-gray-200 bg-gray-50 px-4 py-2 text-[11px] font-semibold uppercase tracking-wide text-gray-500 sm:flex`}
         data-testid="status-page-resource-list-header"
-        aria-hidden="true"
       >
-        <span className={GRIP_COLUMN_CLASS_NAME} />
+        {props.isSelectable ? (
+          <span className={SELECT_COLUMN_CLASS_NAME}>
+            <CheckboxElement
+              value={props.isAllSelected}
+              isIndeterminate={props.isSelectionIndeterminate}
+              ariaLabel="Select all resources"
+              hoverText="Select all resources"
+              dataTestId="status-page-resource-list-select-all"
+              onChange={(value: boolean) => {
+                props.onToggleAllSelected(value);
+              }}
+            />
+          </span>
+        ) : (
+          <></>
+        )}
+
+        {props.isSelectable ? (
+          <span className="sm:hidden">Select all</span>
+        ) : (
+          <></>
+        )}
+
+        <span
+          className={`${GRIP_COLUMN_CLASS_NAME} hidden sm:block`}
+          aria-hidden="true"
+        />
         <span
           className={POSITION_COLUMN_CLASS_NAME}
           title="Position on the status page"
+          aria-hidden="true"
         >
           #
         </span>
-        <span className={MONITOR_COLUMN_CLASS_NAME}>Monitor</span>
-        <span className={PUBLISHED_NAME_COLUMN_CLASS_NAME}>
+        <span
+          className={`${MONITOR_COLUMN_CLASS_NAME} hidden sm:block`}
+          aria-hidden="true"
+        >
+          Monitor
+        </span>
+        <span
+          className={`${PUBLISHED_NAME_COLUMN_CLASS_NAME} hidden sm:block`}
+          aria-hidden="true"
+        >
           Shown on the status page as
         </span>
-        <span className={ACTIONS_COLUMN_CLASS_NAME} />
+        <span
+          className={`${ACTIONS_COLUMN_CLASS_NAME} hidden sm:flex`}
+          aria-hidden="true"
+        />
       </div>
     );
   };
@@ -437,11 +589,13 @@ const ResourceList: FunctionComponent<ComponentProps> = (
                   key={resourceId}
                   data-testid="status-page-resource-row"
                   data-resource-id={resourceId}
-                  className={getRowClassName(
-                    false,
-                    props.busyResourceId === resourceId,
-                    isLastRow(index),
-                  )}
+                  data-selected={isResourceSelected(statusPageResource)}
+                  className={getRowClassName({
+                    isDragging: false,
+                    isBusy: props.busyResourceId === resourceId,
+                    isLastRow: isLastRow(index),
+                    isSelected: isResourceSelected(statusPageResource),
+                  })}
                 >
                   {renderRowBody(
                     statusPageResource,
@@ -497,11 +651,16 @@ const ResourceList: FunctionComponent<ComponentProps> = (
                               {...draggableProvided.draggableProps}
                               data-testid="status-page-resource-row"
                               data-resource-id={resourceId}
-                              className={getRowClassName(
-                                snapshot.isDragging,
-                                props.busyResourceId === resourceId,
-                                isLastRow(index),
+                              data-selected={isResourceSelected(
+                                statusPageResource,
                               )}
+                              className={getRowClassName({
+                                isDragging: snapshot.isDragging,
+                                isBusy: props.busyResourceId === resourceId,
+                                isLastRow: isLastRow(index),
+                                isSelected:
+                                  isResourceSelected(statusPageResource),
+                              })}
                             >
                               {renderRowBody(
                                 statusPageResource,

package/UI/Components/Toggle/Toggle.tsx

@@ -78,8 +78,16 @@ const Toggle: FunctionComponent<ComponentProps> = (
             if (props.onBlur) {
               props.onBlur();
             }
+            /*
+             * handleChange already calls props.onChange. Calling it a second
+             * time here ran every consumer's handler twice per click, which an
+             * idempotent handler never notices and a non-idempotent one cannot
+             * survive. The monitor criteria switches are one click away from
+             * that: they seed a blank incident / alert row on the way on, and
+             * only the "is the array still empty" guard around that seed kept
+             * the second pass from adding a second row.
+             */
             handleChange(!isChecked);
-            props.onChange(!isChecked);
           }}
           onFocus={() => {
             if (props.onFocus) {

package/UI/Components/Types/FieldType.ts

@@ -31,6 +31,7 @@ enum FieldType {
   JavaScript = "JavaScript",
   DictionaryOfStrings = "DictionaryOfStrings",
   JSON = "JSON",
+  YAML = "YAML",
   USDCents = "USDCents",
   Element = "Element",
   Minutes = "Minutes",

package/Utils/NetworkDevice/DeviceReachabilityUtil.ts

@@ -1,4 +1,5 @@
 import OneUptimeDate from "../../Types/Date";
+import { NetworkDeviceMonitoringMethodUtil } from "../../Types/NetworkDevice/NetworkDeviceMonitoringMethod";
 
 /*
  * The one place that decides whether a NetworkDevice is reachable.
@@ -23,6 +24,14 @@ import OneUptimeDate from "../../Types/Date";
  * NetworkDevice.isReachable, stamped by the walk pipeline on every ingested
  * walk — and freshness is only a backstop for "the polling pipeline itself
  * stopped", measured generously against the device's own interval.
+ *
+ * All of which is about a device that gets POLLED. A monitor-backed device
+ * (monitoringMethod "Monitor") is never polled at all: no probe, no
+ * credentials, no walk. Every poll column on such a row is NULL forever, so
+ * the rule above can only ever answer "Pending" for it — which is
+ * OneUptime/oneuptime#3392, a correctly bound ping-only device stuck on
+ * Pending. Its health comes from the Monitor bound to it, stamped onto
+ * NetworkDevice.currentMonitorStatusId, and that is the branch below.
  */
 
 export enum NetworkDeviceReachability {
@@ -71,6 +80,28 @@ export interface DeviceReachabilityInput {
   lastSeenAt?: Date | string | null | undefined;
   // The device's own schedule; sizes the staleness backstop.
   pollingIntervalInMinutes?: number | null | undefined;
+  /*
+   * How this device's health is established. NULL, empty and anything
+   * unrecognised read as SNMP — see NetworkDeviceMonitoringMethodUtil.parse,
+   * which is why an omitted value keeps every existing caller on the poll
+   * rule unchanged.
+   */
+  monitoringMethod?: string | null | undefined;
+  /*
+   * The OFFLINE end of the device's stamped MonitorStatus row, and only
+   * consulted for a monitor-backed device. `undefined` means no monitor has
+   * reported yet (nothing bound, or bound and never evaluated), which is a
+   * real "Pending" rather than a healthy default.
+   *
+   * The offline end and not the operational end, because MonitorStatus is a
+   * ladder rather than a pair: a "Degraded" row is NEITHER operational nor
+   * offline, and the device map already resolves that ladder with
+   * `isOfflineState ? down : up`. Reading the operational flag here instead
+   * would paint every degraded-but-reachable device red on one surface and
+   * green on the other. See DeviceHealthStateUtil, which reads it the same
+   * way for the same reason.
+   */
+  monitorStatusIsOffline?: boolean | null | undefined;
 }
 
 export interface DeviceReachabilityResult {
@@ -87,6 +118,13 @@ export interface DeviceReachabilityResult {
   staleWindowInMinutes: number;
   // Latest of lastPolledAt / lastSeenAt; null when neither is set.
   lastContactAt: Date | null;
+  /*
+   * True when this verdict came from the bound Monitor rather than from an
+   * SNMP poll. Carried so a surface can word its pill and its tooltip for
+   * what actually decided the answer — "the last SNMP poll reached this
+   * device" is a lie on a device nothing polls.
+   */
+  isMonitorBacked: boolean;
 }
 
 const MS_PER_MINUTE: number = 60 * 1000;
@@ -153,6 +191,11 @@ export default class DeviceReachabilityUtil {
         staleWindowInMinutes * MS_PER_MINUTE
       : false;
 
+    const isMonitorBacked: boolean =
+      NetworkDeviceMonitoringMethodUtil.isMonitorBacked(
+        device.monitoringMethod,
+      );
+
     const result: (
       status: NetworkDeviceReachability,
     ) => DeviceReachabilityResult = (
@@ -160,12 +203,41 @@ export default class DeviceReachabilityUtil {
     ): DeviceReachabilityResult => {
       return {
         status: status,
-        isStale: isStale,
+        /*
+         * Staleness is "nothing has polled this device lately", so it can
+         * only ever be false for a device nothing polls BY DESIGN. Letting
+         * it through would put an amber "check this device's probe" pill on
+         * every monitor-backed device forever — and it has no probe.
+         */
+        isStale: isMonitorBacked ? false : isStale,
         staleWindowInMinutes: staleWindowInMinutes,
         lastContactAt: lastContactAt,
+        isMonitorBacked: isMonitorBacked,
       };
     };
 
+    /*
+     * Monitor-backed: the bound Monitor's verdict IS the device's, and the
+     * poll columns below are meaningless for it (they are NULL forever, and
+     * on a device switched over from SNMP they are worse than meaningless —
+     * they are the last thing a probe found before it stopped asking).
+     *
+     * No stamped status means Pending, and it is honest in both of the ways
+     * it happens: no monitor is bound yet (discovery import creates devices
+     * that way on purpose), or one is bound and has not been evaluated yet.
+     */
+    if (isMonitorBacked) {
+      if (device.monitorStatusIsOffline === true) {
+        return result(NetworkDeviceReachability.Down);
+      }
+
+      if (device.monitorStatusIsOffline === false) {
+        return result(NetworkDeviceReachability.Up);
+      }
+
+      return result(NetworkDeviceReachability.Pending);
+    }
+
     /*
      * The probe asked and got nothing. Authoritative however long ago it
      * was — nothing since has said otherwise.

package/Utils/NetworkDiscovery/ScanNameUtil.ts

@@ -0,0 +1,181 @@
+import ColumnLength from "../../Types/Database/ColumnLength";
+
+/*
+ * The optional operator-supplied name on a Network Device Discovery Scan.
+ *
+ * WHY IT EXISTS
+ *
+ * A scan used to be identified by its target alone — `10.15.128.0-255`,
+ * `10.240-249.0-254.220-226`. Half a dozen rows in, nothing on the Discovery
+ * Scans list says which one was the router sweep and which one was the switch
+ * range for a region; the only way to find out is to open each scan and read
+ * the range back against a subnet plan kept somewhere else (OneUptime issue
+ * #3391). A name is that missing sentence, stored with the scan rather than in
+ * a spreadsheet beside it.
+ *
+ * It is deliberately OPTIONAL and deliberately NOT unique: it is a label for
+ * humans, not an identifier. Every scan that existed before this column did
+ * has none, and every surface that shows a name therefore has to keep working
+ * when it is absent — which is what getScanLabel() below is for.
+ *
+ * WHY IT LIVES IN Common
+ *
+ * The same two questions — "is this name storable?" and "what do I call this
+ * scan?" — are asked by the create form (App Dashboard), the write hooks
+ * (Common server service), the recurring-scan worker (App Workers) and the
+ * sweep itself (Probe). Answering them in one module is what keeps the form's
+ * error message identical to the server's, and the probe's log line readable
+ * against the row the operator is looking at. Same reason ScanTargetUtil sits
+ * next door.
+ */
+
+/*
+ * The parts of a scan that answer "which scan is this?". Structural rather
+ * than the model type, so a partially-selected row — the workers and the probe
+ * both select two or three columns — satisfies it, and so this module stays
+ * importable from the Probe without dragging a database model behind it.
+ *
+ * Both are nullable: `cidr` is NOT NULL in the database, but a caller that did
+ * not select it hands over a row where it is simply missing.
+ */
+export interface DiscoveryScanIdentity {
+  name?: string | null | undefined;
+  cidr?: string | null | undefined;
+}
+
+export class ScanNameUtil {
+  /*
+   * Matches the column: NetworkDeviceDiscoveryScan.name is a ShortText, so a
+   * longer value does not truncate in Postgres — it throws, failing the whole
+   * INSERT. Read off ColumnLength rather than written as 100 so the two cannot
+   * drift apart if the column type ever changes.
+   */
+  public static readonly MAX_SCAN_NAME_LENGTH: number = ColumnLength.ShortText;
+
+  /*
+   * ASCII control characters, including DEL. Written as escapes rather than as
+   * a literal range so the characters this guards against cannot end up inside
+   * the guard itself, and so the file stays readable in a diff.
+   *
+   * no-control-regex is disabled deliberately, the same way
+   * MetricResourceAttributeUtil disables it: a control character inside a
+   * user-typed name is precisely what this has to match in order to remove it.
+   */
+  // eslint-disable-next-line no-control-regex
+  private static readonly CONTROL_CHARACTERS: RegExp = /[\u0000-\u001F\u007F]/g;
+
+  /*
+   * The name as it should be stored, or null when the operator supplied none.
+   *
+   * Three things happen here, in this order:
+   *
+   *   - anything that is not a string becomes null. The value arrives straight
+   *     from request JSON (BaseAPI assigns ShortText columns verbatim), so a
+   *     client really can hand over a number, an object or an array. Callers
+   *     that want to REJECT those call getValidationError() first; this
+   *     function's job is only to say what would be stored.
+   *   - control characters — a newline pasted out of a spreadsheet cell, a
+   *     stray tab — become spaces, and every run of whitespace collapses to a
+   *     single space. A name is rendered on one line in a table cell and
+   *     inlined into log messages; a multi-line one breaks both, and nothing
+   *     downstream would ever repair it.
+   *   - the result is trimmed, and an empty result is null rather than "".
+   *     "Not named" is one state, not two: an empty string in the column would
+   *     read as a name everywhere `name ?` is asked, and render as a blank
+   *     first line above the scan target.
+   */
+  public static normalize(name: unknown): string | null {
+    if (typeof name !== "string") {
+      return null;
+    }
+
+    const collapsed: string = name
+      .replace(ScanNameUtil.CONTROL_CHARACTERS, " ")
+      .replace(/\s+/g, " ")
+      .trim();
+
+    return collapsed.length > 0 ? collapsed : null;
+  }
+
+  /*
+   * The single validation entry point for a scan name, shared by the create
+   * form and both write hooks. Returns null when the name is storable —
+   * INCLUDING when there is no name at all, because the field is optional and
+   * "" is a perfectly good way to say so.
+   *
+   * `name` is typed unknown for the same reason ScanTargetUtil's target is:
+   * the server hook runs before the model's own type and length checks, so it
+   * is the first thing to see whatever the client actually sent.
+   */
+  public static getValidationError(name: unknown): string | null {
+    if (name === undefined || name === null) {
+      return null;
+    }
+
+    if (typeof name !== "string") {
+      return "A scan name must be text.";
+    }
+
+    const normalized: string | null = ScanNameUtil.normalize(name);
+
+    if (normalized === null) {
+      return null;
+    }
+
+    /*
+     * Measured against the NORMALIZED value, which is what would be stored:
+     * rejecting a 101-character value that is 100 characters plus a trailing
+     * newline would be refusing to save something this module was about to fix
+     * anyway.
+     */
+    if (normalized.length > ScanNameUtil.MAX_SCAN_NAME_LENGTH) {
+      return (
+        `A scan name cannot be longer than ${ScanNameUtil.MAX_SCAN_NAME_LENGTH} characters. ` +
+        `This one is ${normalized.length}.`
+      );
+    }
+
+    return null;
+  }
+
+  /*
+   * The name to show for a scan, or null when it has none — so a caller can
+   * render the scan target instead rather than an empty line.
+   *
+   * Normalized on the way out as well as on the way in, because rows written
+   * before this column existed, and rows written by any writer that bypasses
+   * the hooks (migrations, the probe-ingest endpoints), are not guaranteed to
+   * have been through normalize().
+   */
+  public static getDisplayName(scan: DiscoveryScanIdentity): string | null {
+    return ScanNameUtil.normalize(scan.name);
+  }
+
+  /*
+   * How to refer to a scan in one line of running text — a log message, a
+   * modal's description, a status note.
+   *
+   * A named scan carries its target along with it (`Router Discovery — Region
+   * 1100 (10.15.128.0-255)`): the name says which scan, the target says what
+   * it sweeps, and an operator reading a log line usually wants both. An
+   * unnamed one is exactly what it was before this column existed — the target
+   * alone.
+   *
+   * Returns "" when the row has neither, which happens only when the caller
+   * selected neither column. Callers append their own fallback (the scan id)
+   * rather than having one invented for them here.
+   */
+  public static getScanLabel(scan: DiscoveryScanIdentity): string {
+    const name: string | null = ScanNameUtil.getDisplayName(scan);
+    const target: string =
+      typeof scan.cidr === "string" ? scan.cidr.trim() : "";
+
+    if (name && target) {
+      return `${name} (${target})`;
+    }
+
+    return name || target || "";
+  }
+}
+
+export default ScanNameUtil;