From bf948d54c2b6afbd8e7a9a10a2e5e9f75271fa1b Mon Sep 17 00:00:00 2001
From: Dhiraj Barnwal <sumankumaribarnwal@gmail.com>
Date: Wed, 11 Dec 2024 14:16:06 +0530
Subject: [PATCH] Fix: Use logical or for labels (#6249)

* Fix: Use logical or for labels

* Lint fix
---
 .../features/alerts/metadata/AlertFilters.svelte   |  4 ++--
 .../billing/plans/CancelledTeamPlan.svelte         |  2 +-
 .../src/features/billing/plans/TrialPlan.svelte    |  2 +-
 .../src/features/bookmarks/BookmarkDialog.svelte   |  2 +-
 .../features/navigation/TopNavigationBar.svelte    |  2 +-
 .../[project]/-/settings/public-urls/+page.svelte  |  2 +-
 .../src/features/alerts/alert-preview-data.ts      |  4 ++--
 web-common/src/features/alerts/utils.ts            |  2 +-
 .../dashboards/filters/FilterChipsReadOnly.svelte  |  4 ++--
 .../leaderboard/LeaderboardControls.svelte         | 14 +++++++-------
 .../state-managers/selectors/measures.ts           |  2 +-
 .../time-dimension-details/TDDHeader.svelte        |  6 +++---
 .../metrics-views/GoToDashboardButton.svelte       |  6 +++---
 .../visual-editing/MeasureDimensionSelector.svelte |  2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/web-admin/src/features/alerts/metadata/AlertFilters.svelte b/web-admin/src/features/alerts/metadata/AlertFilters.svelte
index 201819164cc..864a15e8ff7 100644
--- a/web-admin/src/features/alerts/metadata/AlertFilters.svelte
+++ b/web-admin/src/features/alerts/metadata/AlertFilters.svelte
@@ -62,7 +62,7 @@
         <div animate:flip={{ duration: 200 }}>
           {#if dimension?.column}
             <DimensionFilterReadOnlyChip
-              label={label ?? name}
+              label={label || name}
               values={selectedValues}
               {isInclude}
             />
@@ -73,7 +73,7 @@
         {#each currentMeasureFilters as { name, label, dimensionName, filter } (name)}
           <div animate:flip={{ duration: 200 }}>
             <MeasureFilterReadOnlyChip
-              label={label ?? name}
+              label={label || name}
               {dimensionName}
               {filter}
             />
diff --git a/web-admin/src/features/billing/plans/CancelledTeamPlan.svelte b/web-admin/src/features/billing/plans/CancelledTeamPlan.svelte
index b9c99bd4afe..696edab8391 100644
--- a/web-admin/src/features/billing/plans/CancelledTeamPlan.svelte
+++ b/web-admin/src/features/billing/plans/CancelledTeamPlan.svelte
@@ -28,7 +28,7 @@
   let open = showUpgradeDialog;
 </script>
 
-<SettingsContainer title={plan?.displayName ?? "Team plan"}>
+<SettingsContainer title={plan?.displayName || "Team plan"}>
   <div slot="body">
     <div>
       <div class="flex flex-row items-center gap-x-1 text-sm">
diff --git a/web-admin/src/features/billing/plans/TrialPlan.svelte b/web-admin/src/features/billing/plans/TrialPlan.svelte
index 914f2542f6e..aeb365d54e5 100644
--- a/web-admin/src/features/billing/plans/TrialPlan.svelte
+++ b/web-admin/src/features/billing/plans/TrialPlan.svelte
@@ -43,7 +43,7 @@
   }
 
   $: title =
-    (plan?.displayName ?? "Trial plan") + (trialEnded ? " expired" : "");
+    (plan?.displayName || "Trial plan") + (trialEnded ? " expired" : "");
 
   let open = showUpgradeDialog;
   $: type = (trialEnded ? "trial-expired" : "base") as TeamPlanDialogTypes;
diff --git a/web-admin/src/features/bookmarks/BookmarkDialog.svelte b/web-admin/src/features/bookmarks/BookmarkDialog.svelte
index f87659b51fa..a72b912592e 100644
--- a/web-admin/src/features/bookmarks/BookmarkDialog.svelte
+++ b/web-admin/src/features/bookmarks/BookmarkDialog.svelte
@@ -34,7 +34,7 @@
 
   const formState = createForm<BookmarkFormValues>({
     initialValues: {
-      displayName: bookmark?.resource.displayName ?? "Default Label",
+      displayName: bookmark?.resource.displayName || "Default Label",
       description: bookmark?.resource.description ?? "",
       shared: bookmark?.resource.shared ? "true" : "false",
       filtersOnly: bookmark?.filtersOnly ?? false,
diff --git a/web-admin/src/features/navigation/TopNavigationBar.svelte b/web-admin/src/features/navigation/TopNavigationBar.svelte
index bf5e80029be..e6f4813aa25 100644
--- a/web-admin/src/features/navigation/TopNavigationBar.svelte
+++ b/web-admin/src/features/navigation/TopNavigationBar.svelte
@@ -168,7 +168,7 @@
     onPublicURLPage,
   );
   $: publicURLDashboardTitle =
-    $exploreQuery.data?.explore?.spec?.displayName ?? dashboard ?? "";
+    $exploreQuery.data?.explore?.spec?.displayName || dashboard || "";
 
   $: currentPath = [organization, project, dashboard, report || alert];
 </script>
diff --git a/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte
index ea42edfb341..66d762f311c 100644
--- a/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte
@@ -26,7 +26,7 @@
 
   function useValidDashboardTitle(dashboard: DashboardResource) {
     return (
-      dashboard?.resource.explore?.spec?.displayName ??
+      dashboard?.resource.explore?.spec?.displayName ||
       dashboard?.resource.meta.name.name
     );
   }
diff --git a/web-common/src/features/alerts/alert-preview-data.ts b/web-common/src/features/alerts/alert-preview-data.ts
index a31fe51089c..ac48541000b 100644
--- a/web-common/src/features/alerts/alert-preview-data.ts
+++ b/web-common/src/features/alerts/alert-preview-data.ts
@@ -111,7 +111,7 @@ function getSchemaEntryForField(
         return {
           name: field.name as string,
           type: field.type?.code ?? TypeCode.CODE_STRING,
-          label: dimension.displayName ?? field.name,
+          label: dimension.displayName || field.name,
           enableResize: false,
           enableSorting: false,
         };
@@ -125,7 +125,7 @@ function getSchemaEntryForField(
         return undefined;
 
       let label: VirtualizedTableColumns["label"] =
-        measure.displayName ?? field.name;
+        measure.displayName || field.name;
       let format = measure.formatPreset;
       let type: string = field.type?.code ?? TypeCode.CODE_STRING;
       if (
diff --git a/web-common/src/features/alerts/utils.ts b/web-common/src/features/alerts/utils.ts
index db395a62fd4..22db9967c0f 100644
--- a/web-common/src/features/alerts/utils.ts
+++ b/web-common/src/features/alerts/utils.ts
@@ -44,7 +44,7 @@ export function generateAlertName(
   if (!measure || !typeEntry) return undefined;
 
   const measureLabel =
-    measure.displayName ?? measure.expression ?? (measure.name as string);
+    measure.displayName || measure.expression || (measure.name as string);
 
   let comparisonTitle = "";
   if (
diff --git a/web-common/src/features/dashboards/filters/FilterChipsReadOnly.svelte b/web-common/src/features/dashboards/filters/FilterChipsReadOnly.svelte
index 2d65c28f957..3a0ce4f3cdd 100644
--- a/web-common/src/features/dashboards/filters/FilterChipsReadOnly.svelte
+++ b/web-common/src/features/dashboards/filters/FilterChipsReadOnly.svelte
@@ -63,7 +63,7 @@ The main feature-set component for dashboard filters
       <div animate:flip={{ duration: 200 }}>
         {#if dimension?.column || dimension?.expression}
           <DimensionFilterReadOnlyChip
-            label={label ?? name}
+            label={label || name}
             values={selectedValues}
             {isInclude}
           />
@@ -75,7 +75,7 @@ The main feature-set component for dashboard filters
     {#each measureFilters as { name, label, dimensionName, filter } (name)}
       <div animate:flip={{ duration: 200 }}>
         <MeasureFilterReadOnlyChip
-          label={label ?? name}
+          label={label || name}
           {dimensionName}
           {filter}
         />
diff --git a/web-common/src/features/dashboards/leaderboard/LeaderboardControls.svelte b/web-common/src/features/dashboards/leaderboard/LeaderboardControls.svelte
index 84bda535eeb..a088e289f77 100644
--- a/web-common/src/features/dashboards/leaderboard/LeaderboardControls.svelte
+++ b/web-common/src/features/dashboards/leaderboard/LeaderboardControls.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { LeaderboardContextColumn } from "@rilldata/web-common/features/dashboards/leaderboard-context-column";
+  import Button from "@rilldata/web-common/components/button/Button.svelte";
   import DashboardVisibilityDropdown from "@rilldata/web-common/components/menu/shadcn/DashboardVisibilityDropdown.svelte";
+  import * as Select from "@rilldata/web-common/components/select";
+  import { LeaderboardContextColumn } from "@rilldata/web-common/features/dashboards/leaderboard-context-column";
   import { metricsExplorerStore } from "web-common/src/features/dashboards/stores/dashboard-stores";
   import { getStateManagers } from "../state-managers/state-managers";
-  import * as Select from "@rilldata/web-common/components/select";
-  import Button from "@rilldata/web-common/components/button/Button.svelte";
 
   export let exploreName: string;
 
@@ -82,7 +82,7 @@
         selected={{ value: activeLeaderboardMeasure.name, label: "" }}
         items={measures.map((measure) => ({
           value: measure.name ?? "",
-          label: measure.displayName ?? measure.name,
+          label: measure.displayName || measure.name,
         }))}
         onSelectedChange={(newSelection) => {
           if (!newSelection?.value) return;
@@ -93,7 +93,7 @@
           <Button type="text" label="Select a measure to filter by">
             <span class="truncate text-gray-700 hover:text-inherit">
               Showing <b>
-                {activeLeaderboardMeasure?.displayName ??
+                {activeLeaderboardMeasure?.displayName ||
                   activeLeaderboardMeasure.name}
               </b>
             </span>
@@ -108,12 +108,12 @@
           {#each measures as measure (measure.name)}
             <Select.Item
               value={measure.name}
-              label={measure.displayName ?? measure.name}
+              label={measure.displayName || measure.name}
               class="text-[12px]"
             >
               <div class="flex flex-col">
                 <div class:font-bold={$leaderboardMeasureName === measure.name}>
-                  {measure.displayName ?? measure.name}
+                  {measure.displayName || measure.name}
                 </div>
 
                 <p class="ui-copy-muted" style:font-size="11px">
diff --git a/web-common/src/features/dashboards/state-managers/selectors/measures.ts b/web-common/src/features/dashboards/state-managers/selectors/measures.ts
index b49a02c7155..8c28f7f7ab1 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/measures.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/measures.ts
@@ -51,7 +51,7 @@ export const measureLabel = ({
     const measure = validMetricsView?.measures?.find(
       (d) => d.name === measureName,
     );
-    return measure?.displayName ?? measureName;
+    return measure?.displayName || measureName;
   };
 };
 export const isMeasureValidPercentOfTotal = ({
diff --git a/web-common/src/features/dashboards/time-dimension-details/TDDHeader.svelte b/web-common/src/features/dashboards/time-dimension-details/TDDHeader.svelte
index 8dd23d23627..badc48ef17a 100644
--- a/web-common/src/features/dashboards/time-dimension-details/TDDHeader.svelte
+++ b/web-common/src/features/dashboards/time-dimension-details/TDDHeader.svelte
@@ -73,13 +73,13 @@
       // Note: undefined values are filtered out above, so the
       // empty string fallback is unreachable.
       ({
-        name: m.name ?? "",
-        label: m.displayName ?? "",
+        name: m.name || "",
+        label: m.displayName || "",
       }),
     );
 
   $: selectedMeasureLabel =
-    $allMeasures.find((m) => m.name === expandedMeasureName)?.displayName ??
+    $allMeasures.find((m) => m.name === expandedMeasureName)?.displayName ||
     expandedMeasureName;
 
   $: excludeMode =
diff --git a/web-common/src/features/metrics-views/GoToDashboardButton.svelte b/web-common/src/features/metrics-views/GoToDashboardButton.svelte
index 819a8ebb3f9..210650db2a2 100644
--- a/web-common/src/features/metrics-views/GoToDashboardButton.svelte
+++ b/web-common/src/features/metrics-views/GoToDashboardButton.svelte
@@ -5,14 +5,14 @@
   import CaretDownIcon from "@rilldata/web-common/components/icons/CaretDownIcon.svelte";
   import ExploreIcon from "@rilldata/web-common/components/icons/ExploreIcon.svelte";
   import { removeLeadingSlash } from "@rilldata/web-common/features/entity-management/entity-mappers";
+  import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import type { V1Resource } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { useGetExploresForMetricsView } from "../dashboards/selectors";
+  import { allowPrimary } from "../dashboards/workspace/DeployProjectCTA.svelte";
   import { resourceColorMapping } from "../entity-management/resource-icon-mapping";
   import { ResourceKind } from "../entity-management/resource-selectors";
   import { createAndPreviewExplore } from "./create-and-preview-explore";
-  import { allowPrimary } from "../dashboards/workspace/DeployProjectCTA.svelte";
 
   export let resource: V1Resource | undefined;
 
@@ -47,7 +47,7 @@
       <DropdownMenu.Group>
         {#each dashboards as resource (resource?.meta?.name?.name)}
           {@const label =
-            resource?.explore?.state?.validSpec?.displayName ??
+            resource?.explore?.state?.validSpec?.displayName ||
             resource?.meta?.name?.name}
           {@const filePath = resource?.meta?.filePaths?.[0]}
           {#if label && filePath}
diff --git a/web-common/src/features/visual-editing/MeasureDimensionSelector.svelte b/web-common/src/features/visual-editing/MeasureDimensionSelector.svelte
index 9cc8089858d..d922a7519a7 100644
--- a/web-common/src/features/visual-editing/MeasureDimensionSelector.svelte
+++ b/web-common/src/features/visual-editing/MeasureDimensionSelector.svelte
@@ -101,7 +101,7 @@
       }}
       let:item
     >
-      {items.find((m) => m.name === item)?.displayName ?? item}
+      {items.find((m) => m.name === item)?.displayName || item}
     </SelectionDropdown>
   {/if}
 </div>