From e494bee1ff26ccd8aec6152451299a26103f560c Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 19 Sep 2024 16:33:57 -0700
Subject: [PATCH] - Now uses Watch instead of Update to handle changes from
 containing AppLayout.vue component. - Code cleanup, console.log removals.

---
 src/ui/layout/AppLayout.vue                   | 11 ++--
 src/ui/layout/status-bar/StatusIndicators.vue | 54 +++++++++----------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/ui/layout/AppLayout.vue b/src/ui/layout/AppLayout.vue
index 4242efa43f..3f6cac8b0a 100644
--- a/src/ui/layout/AppLayout.vue
+++ b/src/ui/layout/AppLayout.vue
@@ -40,8 +40,8 @@
       <CreateButton class="l-shell__create-button" />
       <GrandSearch ref="grand-search" />
       <StatusIndicators
-        :listen-for-overflow="!indicatorsMultiline"
-        :content-updated="headExpanded || indicatorsMultiline"
+        :head-expanded="headExpanded"
+        :indicators-multiline="indicatorsMultiline"
         @indicators-overflowing="indicatorsOverflowUpdate"
       />
       <button
@@ -282,13 +282,13 @@ export default {
     },
     toggleShellHead() {
       this.headExpanded = !this.headExpanded;
-      this.setLocalStorage();
+      this.setLocalStorageShellHead();
     },
     toggleIndicatorsMultiline() {
       this.indicatorsMultiline = !this.indicatorsMultiline;
-      this.setLocalStorage();
+      this.setLocalStorageShellHead();
     },
-    setLocalStorage() {
+    setLocalStorageShellHead() {
       window.localStorage.setItem(
         'openmct-shell-head',
         JSON.stringify({
@@ -346,7 +346,6 @@ export default {
       this.disableClearButton = isDisabled;
     },
     indicatorsOverflowUpdate(isOverflowing) {
-      console.log('indicatorsOverflowUpdate', isOverflowing);
       this.indicatorsOverflowing = isOverflowing;
     }
   }
diff --git a/src/ui/layout/status-bar/StatusIndicators.vue b/src/ui/layout/status-bar/StatusIndicators.vue
index 31b33a245f..080809bf53 100644
--- a/src/ui/layout/status-bar/StatusIndicators.vue
+++ b/src/ui/layout/status-bar/StatusIndicators.vue
@@ -33,16 +33,13 @@ import { shallowRef } from 'vue';
 export default {
   inject: ['openmct'],
   props: {
-    contentUpdated: {
-      type: String,
+    headExpanded: {
+      type: Boolean,
       required: true
     },
-    listenForOverflow: {
+    indicatorsMultiline: {
       type: Boolean,
-      required: false,
-      default() {
-        return false;
-      }
+      required: true
     }
   },
   emits: ['indicators-overflowing'],
@@ -60,34 +57,30 @@ export default {
       return [...this.indicators].sort((a, b) => b.value.priority - a.value.priority);
     }
   },
-  // watch: {
-  //   contentUpdated() {
-  //     console.log('content updated');
-  //     this.checkOverflow();
-  //   }
-  // },
+  watch: {
+    headExpanded() {
+      this.checkOverflowNextTick();
+    },
+    indicatorsMultiline() {
+      if (!this.indicatorsMultiline) {
+        window.addEventListener('resize', this.checkOverflow);
+      } else {
+        window.removeEventListener('resize', this.checkOverflow);
+      }
+      this.checkOverflowNextTick();
+    }
+  },
   mounted() {
-    if (this.listenForOverflow) {
+    if (!this.indicatorsMultiline) {
+      // `load` listener is necessary because the width of the Indicators has to be eval'd after other components have loaded.
       window.addEventListener('load', this.checkOverflow);
       window.addEventListener('resize', this.checkOverflow);
     }
   },
   beforeUnmount() {
     this.openmct.indicators.off('addIndicator', this.addIndicator);
-    if (this.listenForOverflow) {
-      window.removeEventListener('load', this.checkOverflow);
-      window.removeEventListener('resize', this.checkOverflow);
-    }
-  },
-  updated() {
-    // console.log('updated');
-    if (this.listenForOverflow) {
-      window.addEventListener('resize', this.checkOverflow);
-      this.checkOverflow();
-    } else {
-      window.removeEventListener('resize', this.checkOverflow);
-      this.checkOverflow();
-    }
+    window.removeEventListener('load', this.checkOverflow);
+    window.removeEventListener('resize', this.checkOverflow);
   },
   created() {
     this.openmct.indicators.on('addIndicator', this.addIndicator);
@@ -99,6 +92,11 @@ export default {
     checkOverflow() {
       const element = this.$refs.indicators;
       this.$emit('indicators-overflowing', element.scrollWidth > element.clientWidth);
+    },
+    checkOverflowNextTick() {
+      this.$nextTick(() => {
+        this.checkOverflow();
+      });
     }
   }
 };