From a13d3dad937e09d15d2e289e58049d2db4390090 Mon Sep 17 00:00:00 2001
From: Carlos Valente <carlosvalente@pm.me>
Date: Mon, 17 Nov 2025 13:51:05 +0100
Subject: [PATCH] refactor(op): style tweaks to tags and subscriptions

---
 .../operator-event/OperatorEvent.module.scss  | 54 ++++++++++---------
 .../operator/operator-event/OperatorEvent.tsx | 46 ++++++++++------
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss b/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss
index 994bbf740..b6cd99ed7 100644
--- a/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss
+++ b/apps/client/src/features/operator/operator-event/OperatorEvent.module.scss
@@ -13,7 +13,7 @@
   column-gap: 0.5rem;
   row-gap: 0.5rem;
   grid-template-rows: auto auto auto;
-  grid-template-columns: 1.25rem 1fr auto;
+  grid-template-columns: 1.5rem 1fr auto;
   grid-template-areas:
     'binder main      schedule'
     'binder secondary running'
@@ -42,6 +42,7 @@
   place-content: center;
   position: relative;
   background-color: $gray-1050; // to override inline
+  font-weight: 600;
 
   .cue {
     white-space: nowrap;
@@ -71,48 +72,41 @@
   white-space: pre-line;
 }
 
-.plannedStart, .timeUntil {
-  line-height: 1em;
-  background-color: $gray-1000;
+.plannedStart,
+.timeUntil,
+.runningTime {
+  border-radius: $component-border-radius-md;
   padding: 0.25rem 0.5rem;
-  border-radius: 1px;
+  line-height: 1;
 }
 
 .plannedStart {
   font-size: 1.5rem;
   margin-right: 0.5rem;
   display: inline;
+  background-color: $white-20;
+  letter-spacing: 1px;
 }
 
 .timeUntil {
-  font-size: calc(1rem - 2px);
-  line-height: 1em;
   grid-area: schedule;
+  font-size: calc(1rem - 2px);
   justify-self: end;
+  background-color: $white-20;
+  letter-spacing: 1px;
 }
 
 .runningTime {
-  font-size: 1.25rem;
-  line-height: 1em;
   grid-area: running;
+  font-size: 1.25rem;
   justify-self: end;
-  align-self: flex-start;
-  display: flex;
-  align-items: center;
-  gap: 0.5em;
+  background-color: $white-7;
 }
 
 .fields {
   grid-area: fields;
-  font-size: var(--operator-customfield-font-size-override, 1.25rem);
-  font-weight: 400;
-  color: $ui-black;
-  margin: 0.25rem 0;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.5em;
-  row-gap: 0.25em;
-  line-height: 1.25em;
+  margin-top: 0;
+  border-top: 0;
 
   .field {
     font-weight: 600;
@@ -134,8 +128,18 @@
     // allow multi-line text but trim before
     white-space: pre-line;
   }
-}
 
-.fields::after {
-  content: '\200b';
+  &.fieldsWithContent {
+    margin-top: 0.25rem;
+    padding-block: 0.5rem;
+    border-top: 1px solid $white-13;
+
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(14rem, 1fr));
+    gap: 0.25rem 0.75rem;
+    line-height: 1.25em;
+    font-size: var(--operator-customfield-font-size-override, 1.25rem);
+    font-weight: 400;
+    color: $ui-black;
+  }
 }
diff --git a/apps/client/src/features/operator/operator-event/OperatorEvent.tsx b/apps/client/src/features/operator/operator-event/OperatorEvent.tsx
index 81de7fa22..487005150 100644
--- a/apps/client/src/features/operator/operator-event/OperatorEvent.tsx
+++ b/apps/client/src/features/operator/operator-event/OperatorEvent.tsx
@@ -1,4 +1,4 @@
-import { memo, RefObject, SyntheticEvent } from 'react';
+import { CSSProperties, memo, RefObject, SyntheticEvent } from 'react';
 import { MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
 
 import DelayIndicator from '../../../common/components/delay-indicator/DelayIndicator';
@@ -69,6 +69,15 @@ function OperatorEvent({
 
   const operatorClasses = cx([style.event, isSelected && style.running, isPast && style.past]);
 
+  const hasFields = subscribed.some((field) => field.value);
+  const columnCount = subscribed.length ? Math.min(subscribed.length, 4) : 0;
+  const fieldGridStyle =
+    columnCount > 0
+      ? ({
+          gridTemplateColumns: `repeat(${columnCount}, minmax(12rem, 1fr))`,
+        } satisfies CSSProperties)
+      : undefined;
+
   return (
     <div
       className={operatorClasses}
@@ -100,22 +109,25 @@ function OperatorEvent({
         <RunningTime className={cx([isSelected && style.muted])} value={duration} hideLeadingZero />
       </span>
 
-      <div className={style.fields}>
-        {subscribed
-          .filter((field) => field.value)
-          .map((field) => {
-            const fieldClasses = cx([style.field, !field.colour ? style.noColour : null]);
-            return (
-              <div key={field.id}>
-                <span className={fieldClasses} style={{ backgroundColor: field.colour }}>
-                  {field.label}
-                </span>
-                <span className={style.value} style={{ color: field.colour }}>
-                  {field.value}
-                </span>
-              </div>
-            );
-          })}
+      <div className={cx([style.fields, hasFields && style.fieldsWithContent])} style={fieldGridStyle}>
+        {subscribed.map((field) => {
+          if (!field.value) {
+            return <div key={field.id} />;
+          }
+          return (
+            <div key={field.id}>
+              <span
+                className={cx([style.field, !field.colour && style.noColour])}
+                style={{ backgroundColor: field.colour }}
+              >
+                {field.label}
+              </span>
+              <span className={style.value} style={{ color: field.colour }}>
+                {field.value}
+              </span>
+            </div>
+          );
+        })}
       </div>
     </div>
   );