Hide independent time conductor mode if there is only 1 mode available

src/plugins/plot/ColorSwatch.vue

@@ -21,57 +21,67 @@
 -->
 <template>
 <div class="u-contents">
-    <div v-if="canEdit"
-         class="grid-row"
+    <ul v-if="canEdit"
+        class="l-inspector-part"
     >
-        <div class="grid-cell label"
-             :title="editTitle"
-        >{{ shortLabel }}</div>
-        <div class="grid-cell value">
-            <div class="c-click-swatch c-click-swatch--menu"
-                 @click="toggleSwatch()"
-            >
-                <span class="c-color-swatch"
-                      :style="{ background: currentColor }"
+        <h2 v-if="heading"
+            :title="heading"
+        >{{ heading }}</h2>
+        <li class="grid-row">
+            <div class="grid-cell label"
+                 :title="editTitle"
+            >{{ shortLabel }}</div>
+            <div class="grid-cell value">
+                <div class="c-click-swatch c-click-swatch--menu"
+                     @click="toggleSwatch()"
                 >
-                </span>
-            </div>
-            <div class="c-palette c-palette--color">
-                <div v-show="swatchActive"
-                     class="c-palette__items"
-                >
-                    <div v-for="group in colorPaletteGroups"
-                         :key="group.id"
-                         class="u-contents"
+                    <span class="c-color-swatch"
+                          :style="{ background: currentColor }"
                     >
-                        <div v-for="color in group"
-                             :key="color.id"
-                             class="c-palette__item"
-                             :class="{ 'selected': currentColor === color.hexString }"
-                             :style="{ background: color.hexString }"
-                             @click="setColor(color)"
+                    </span>
+                </div>
+                <div class="c-palette c-palette--color">
+                    <div v-show="swatchActive"
+                         class="c-palette__items"
+                    >
+                        <div v-for="group in colorPaletteGroups"
+                             :key="group.id"
+                             class="u-contents"
                         >
+                            <div v-for="color in group"
+                                 :key="color.id"
+                                 class="c-palette__item"
+                                 :class="{ 'selected': currentColor === color.hexString }"
+                                 :style="{ background: color.hexString }"
+                                 @click="setColor(color)"
+                            >
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-    </div>
-    <div v-else
-         class="grid-row"
+        </li>
+    </ul>
+    <ul v-else
+        class="l-inspector-part"
     >
-        <div class="grid-cell label"
-             :title="viewTitle"
-        >{{ shortLabel }}</div>
-        <div class="grid-cell value">
-            <span class="c-color-swatch"
-                  :style="{
-                      'background': currentColor
-                  }"
-            >
-            </span>
-        </div>
-    </div>
+        <h2 v-if="heading"
+            :title="heading"
+        >{{ heading }}</h2>
+        <li class="grid-row">
+            <div class="grid-cell label"
+                 :title="viewTitle"
+            >{{ shortLabel }}</div>
+            <div class="grid-cell value">
+                <span class="c-color-swatch"
+                      :style="{
+                          'background': currentColor
+                      }"
+                >
+                </span>
+            </div>
+        </li>
+    </ul>
 </div>
 </template>
 
@@ -104,6 +114,12 @@ export default {
             default() {
                 return 'Color';
             }
+        },
+        heading: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {

src/plugins/plot/barGraph/BarGraphView.vue

@@ -107,7 +107,7 @@ export default {
                 };
                 this.openmct.objects.mutate(
                     this.domainObject,
-                    `configuration.barStyles[${key}]`,
+                    `configuration.barStyles[${this.key}]`,
                     this.domainObject.configuration.barStyles[key]
                 );
             } else {

src/plugins/plot/barGraph/inspector/BarGraphOptions.vue

@@ -33,9 +33,9 @@
     </li>
     <ColorSwatch v-if="expanded"
                  :current-color="currentColor"
-                 title="Manually set the color for this bar graph series."
-                 edit-title="Manually set the color for this bar graph series"
-                 view-title="The color for this bar graph series."
+                 title="Manually set the color for this bar graph."
+                 edit-title="Manually set the color for this bar graph"
+                 view-title="The color for this bar graph."
                  short-label="Color"
                  class="grid-properties"
                  @colorSet="setColor"

src/plugins/plot/barGraph/inspector/Options.vue

@@ -20,13 +20,15 @@
  at runtime from the About dialog for additional information.
 -->
 <template>
-<ul class="c-tree">
-    <h2 title="Display properties for this object">Bar Graph Series</h2>
-    <bar-graph-options v-for="series in domainObject.composition"
-                       :key="series.key"
-                       :item="series"
-    />
-</ul>
+<div>
+    <ul class="c-tree">
+        <li v-for="series in domainObject.composition"
+            :key="series.key"
+        >
+            <bar-graph-options :item="series" />
+        </li>
+    </ul>
+</div>
 </template>
 
 <script>

src/plugins/timeConductor/independent/IndependentTimeConductor.vue

@@ -151,29 +151,22 @@ export default {
             this.stopFollowingTimeContext();
             this.timeContext = this.openmct.time.getContextForView([this.domainObject]);
             this.timeContext.on('timeContext', this.setTimeContext);
-            this.timeContext.on('clock', this.setViewFromClock);
+            this.timeContext.on('clock', this.setTimeOptions);
         },
         stopFollowingTimeContext() {
             if (this.timeContext) {
                 this.timeContext.off('timeContext', this.setTimeContext);
-                this.timeContext.off('clock', this.setViewFromClock);
+                this.timeContext.off('clock', this.setTimeOptions);
             }
         },
-        setViewFromClock(clock) {
-            if (!this.timeOptions.mode) {
-                this.setTimeOptions(clock);
-            }
-        },
-        setTimeOptions() {
-            if (!this.timeOptions || !this.timeOptions.mode) {
-                this.mode = this.timeContext.clock() === undefined ? { key: 'fixed' } : { key: Object.create(this.timeContext.clock()).key};
-                this.timeOptions = {
-                    clockOffsets: this.timeContext.clockOffsets(),
-                    fixedOffsets: this.timeContext.bounds()
-                };
-            }
+        setTimeOptions(clock) {
+            this.timeOptions.clockOffsets = this.timeOptions.clockOffsets || this.timeContext.clockOffsets();
+            this.timeOptions.fixedOffsets = this.timeOptions.fixedOffsets || this.timeContext.bounds();
 
-            this.registerIndependentTimeOffsets();
+            if (!this.timeOptions.mode) {
+                this.mode = this.timeContext.clock() === undefined ? {key: 'fixed'} : {key: Object.create(this.timeContext.clock()).key};
+                this.registerIndependentTimeOffsets();
+            }
         },
         saveFixedOffsets(offsets) {
             const newOptions = Object.assign({}, this.timeOptions, {

src/plugins/timeConductor/independent/Mode.vue

@@ -20,7 +20,8 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
 <template>
-<div ref="modeMenuButton"
+<div v-if="modes.length > 1"
+     ref="modeMenuButton"
      class="c-ctrl-wrapper c-ctrl-wrapper--menus-up"
 >
     <div class="c-menu-button c-ctrl-wrapper c-ctrl-wrapper--menus-left">