@wix/himalaya-cli 0.860.0 → 0.862.0

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-analytics/report.ts

@@ -181,11 +181,22 @@ function subjectLabelOf(m: SemanticModelSummary): string {
  * renders as a dash rather than as 0. `formatNumber` and not `toLocaleString`,
  * which is ECMA-402 and absent on QuickJS-ng (watchOS/Wear OS).
  */
+/**
+ * The one placeholder a cell falls back to when there is nothing to render.
+ *
+ * Named, because two things depend on it meaning exactly one thing: `cellText`
+ * produces it, and `runQuery` asks whether the server's total came back as it —
+ * which is how "the owner asked for a total and got a dash" is told apart from
+ * "the server answered". Spelling it twice let those two drift apart once
+ * already.
+ */
+const DASH = "\u2014";
+
 function cellText(v: SemanticValue | undefined): string {
-  if (!v) return "—";
+  if (!v) return DASH;
   if (v.formatted !== undefined && v.formatted !== "") return v.formatted;
   const raw = v.value;
-  if (raw === null || raw === undefined) return "—";
+  if (raw === null || raw === undefined) return DASH;
   if (typeof raw === "number") return formatNumber(raw);
   if (typeof raw === "boolean") return raw ? "Yes" : "No";
   if (typeof raw === "string") return raw;
@@ -387,6 +398,23 @@ async function runQuery(s: ReportState, days: number): Promise<ReportState | Dec
       ? copyParam("ownerReport.missingFields", "No data returned for: ") + result.missingFields.join(", ")
       : "";
 
+    // Did the SERVER actually answer with a total for the measure asked for?
+    // This is NOT the same question as "is a totals row on screen": the row is
+    // rendered as a dash when the owner asked and nothing came back, and a dash
+    // is a placeholder, not an answer. Keeping the two apart is what stops a
+    // placeholder from counting as content — see `hideTable`/`noEmpty` below.
+    //
+    // A zero is unaffected: `cellText` formats it as "0", not as the dash, and a
+    // zero total is a real answer that must keep the table up.
+    // Asked of `cellText` rather than re-derived: a `SemanticValue` is an OBJECT
+    // even when it carries `value: null`, so a nullish check on the entry itself
+    // calls a valueless total an answer. `cellText` already owns the decision of
+    // what counts as showable, down to `formatted: ""`, so the question is simply
+    // whether it produced the placeholder.
+    const serverTotal = result.totals?.[s.measureName];
+    const totalText = cellText(serverTotal);
+    const answeredTotal = totalText !== DASH;
+
     // `noTotals` is the owner's REQUEST and stays theirs; only they change it.
     // When they asked and the server sent no total, that is reported as a dash —
     // an absent number the owner asked for must be visible, not silently dropped
@@ -395,9 +423,12 @@ async function runQuery(s: ReportState, days: number): Promise<ReportState | Dec
       ? null
       : {
           dimension: copyParam("ownerReport.totalsLabel", "Total"),
-          measure: result.totals ? cellText(result.totals[s.measureName]) : "—",
+          measure: totalText,
         };
 
+    // Is there anything to READ? Rows, or a total the server actually sent.
+    const hasContent = rows.length > 0 || answeredTotal;
+
     const out: ReportState = {
       ...s,
       status: "ready",
@@ -405,16 +436,22 @@ async function runQuery(s: ReportState, days: number): Promise<ReportState | Dec
         + `${s.measureLabel} ${copyParam("ownerReport.by", "by")} ${s.dimensionLabel}`,
       rows,
       totals,
-      rowCount: rows.length > 0
-        ? `${result.paging.count || rows.length} ${copyParam("ownerReport.rows", "rows")}`
-        : "",
+      // A zero count is stated, not left blank. Silence beside a caption reads
+      // as "still loading" — the ambiguity this screen removes everywhere else —
+      // so "0 rows" says the query ran and came back with nothing.
+      rowCount: `${rows.length > 0 ? result.paging.count || rows.length : 0} ${copyParam("ownerReport.rows", "rows")}`,
       missingFields: gap,
       noGap: gap === "",
-      // Rows OR totals. The API can answer `results: []` WITH a `totals` object
-      // — the SDK has a test for exactly that shape — and gating on rows alone
-      // hid the server's total and put "Nothing to show" over it. Opting into
-      // Show total would then have thrown away the only answer that came back.
-      hideTable: rows.length === 0 && !totals,
+      // Rows OR a total the SERVER sent. The API can answer `results: []` WITH a
+      // `totals` object — the SDK has a test for exactly that shape — and gating
+      // on rows alone hid the server's total and put "Nothing to show" over it.
+      //
+      // But it must be `answeredTotal`, not `totals`: `totals` is non-null for
+      // the whole time the owner has Show total on, INCLUDING when the answer is
+      // the "—" placeholder. Gating on it meant an empty result with the toggle
+      // on rendered a table whose only row was `Total —`, and the empty state
+      // could never fire while the toggle was on. Two states each correct alone.
+      hideTable: !hasContent,
       notLoading: true,
       notErrored: true,
       hideContent: false,
@@ -423,10 +460,10 @@ async function runQuery(s: ReportState, days: number): Promise<ReportState | Dec
       // It is NOT conflated with a dropped field: the SDK reports no
       // `missingFields` when nothing came back at all, precisely because the two
       // are indistinguishable there, so this arm never accuses a field.
-      noEmpty: rows.length > 0 || totals !== null,
-      emptyText: rows.length === 0 && !totals
-        ? copyParam("ownerReport.empty", "No data for this range.")
-        : "",
+      noEmpty: hasContent,
+      emptyText: hasContent
+        ? ""
+        : copyParam("ownerReport.empty", "No data for this range."),
       // Carried through untouched: see the totals comment above.
       noTotals: s.noTotals,
       error: "",