From 94a794b315fd2df4d2489f50d06cbfc828cdb8b4 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Mon, 7 Mar 2022 14:36:49 -0600
Subject: [PATCH] LegacyBrowser: fix Safari 13.1 (lacks logical nullish
 assignent) (#46260) (#46300)

(cherry picked from commit 0ee552dd652e19da137c896db7e57e9c94e02cae)
---
 .../src/transformations/transformers/labelsToFields.ts          | 2 +-
 public/app/features/dashboard/state/DashboardModel.ts           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts b/packages/grafana-data/src/transformations/transformers/labelsToFields.ts
index b203c6f6d91..f60e68cb86c 100644
--- a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts
+++ b/packages/grafana-data/src/transformations/transformers/labelsToFields.ts
@@ -70,7 +70,7 @@ export const labelsToFieldsTransformer: SynchronousDataTransformerInfo<LabelsToF
             continue;
           }
 
-          const uniqueValues = (uniqueLabels[labelName] ||= new Set());
+          const uniqueValues = uniqueLabels[labelName] ?? (uniqueLabels[labelName] = new Set()); // (Safari 13.1 lacks ??= support)
           uniqueValues.add(field.labels[labelName]);
         }
       }
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index 212cb450d40..e2ed3c0a0e6 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -962,7 +962,7 @@ export class DashboardModel {
 
         for (const panel of row.panels) {
           // set the y gridPos if it wasn't already set
-          panel.gridPos.y ??= row.gridPos.y;
+          panel.gridPos.y ?? (panel.gridPos.y = row.gridPos.y); // (Safari 13.1 lacks ??= support)
           // make sure y is adjusted (in case row moved while collapsed)
           panel.gridPos.y -= yDiff;
           // insert after row