@rancher/shell 0.1.21 → 0.2.2

package/components/Carousel.vue

@@ -1,6 +1,9 @@
 <script>
 import { get } from '@shell/utils/object';
 import { BadgeState } from '@components/BadgeState';
+import { mapGetters } from 'vuex';
+
+const carouselSeenStorageKey = `carousel-seen`;
 
 export default {
   components: { BadgeState },
@@ -31,16 +34,18 @@ export default {
       default: 'noopener noreferrer nofollow'
     },
   },
+
   data() {
     return {
-      slider:          this.sliders,
-      activeItemId:    0,
-      autoScroll:      true
+      slider:                  this.sliders,
+      activeItemId:            0,
+      autoScroll:              true,
+      autoScrollSlideInterval: null,
     };
   },
 
   computed: {
-
+    ...mapGetters(['clusterId']),
     trackStyle() {
       const sliderItem = this.activeItemId * 100 / this.slider.length;
       const width = 60 * this.slider.length;
@@ -77,9 +82,6 @@ export default {
       this.slidePosition();
     },
 
-    timer() {
-      setInterval(this.autoScrollSlide, 2000);
-    },
     autoScrollSlide() {
       if (this.activeItemId < this.slider.length && this.autoScroll ) {
         this.activeItemId++;
@@ -103,9 +105,23 @@ export default {
     }
   },
 
+  beforeDestroy() {
+    if (this.autoScrollSlideInterval) {
+      clearInterval(this.autoScrollSlideInterval);
+    }
+  },
+
   mounted() {
-    this.timer();
-  }
+    const lastSeenCluster = sessionStorage.getItem(carouselSeenStorageKey);
+
+    if (lastSeenCluster !== this.clusterId) {
+      // Session storage lasts until tab/window closed (retained on refresh)
+      sessionStorage.setItem(carouselSeenStorageKey, this.clusterId);
+
+      this.autoScrollSlideInterval = setInterval(this.autoScrollSlide, 5000);
+    }
+  },
+
 };
 
 </script>

package/components/HarvesterServiceAddOnConfig.vue

@@ -100,7 +100,7 @@ export default {
       const errors = [];
 
       if (this.healthCheckEnabled && !this.healthcheckPort) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.service.healthCheckPort.label') }, true));
+        errors.push(this.t('validation.required', { key: this.t('servicesPage.harvester.healthCheckPort.label') }, true));
       }
 
       if (errors.length > 0) {
@@ -131,7 +131,7 @@ export default {
           v-model="ipam"
           :mode="mode"
           :options="ipamOptions"
-          :label="t('harvester.service.ipam.label')"
+          :label="t('servicesPage.harvester.ipam.label')"
           :disabled="mode === 'edit'"
         />
       </div>
@@ -143,7 +143,7 @@ export default {
           v-model="healthCheckEnabled"
           :mode="mode"
           name="healthCheckEnabled"
-          :label="t('harvester.service.healthCheckEnabled.label')"
+          :label="t('servicesPage.harvester.healthCheckEnabled.label')"
           :labels="[t('generic.disabled'),t('generic.enabled')]"
           :options="[false, true]"
         />
@@ -157,7 +157,7 @@ export default {
             :mode="mode"
             :options="portOptions"
             required
-            :label="t('harvester.service.healthCheckPort.label')"
+            :label="t('servicesPage.harvester.healthCheckPort.label')"
           />
         </div>
         <div class="col span-6">
@@ -165,8 +165,8 @@ export default {
             v-model="healthCheckSuccessThreshold"
             :mode="mode"
             type="number"
-            :label="t('harvester.service.healthCheckSuccessThreshold.label')"
-            :tooltip="t('harvester.service.healthCheckSuccessThreshold.description')"
+            :label="t('servicesPage.harvester.healthCheckSuccessThreshold.label')"
+            :tooltip="t('servicesPage.harvester.healthCheckSuccessThreshold.description')"
           />
         </div>
       </div>
@@ -176,8 +176,8 @@ export default {
             v-model="healthCheckFailureThreshold"
             :mode="mode"
             type="number"
-            :label="t('harvester.service.healthCheckFailureThreshold.label')"
-            :tooltip="t('harvester.service.healthCheckFailureThreshold.description')"
+            :label="t('servicesPage.harvester.healthCheckFailureThreshold.label')"
+            :tooltip="t('servicesPage.harvester.healthCheckFailureThreshold.description')"
           />
         </div>
         <div class="col span-6">
@@ -185,7 +185,7 @@ export default {
             v-model="healthCheckPeriod"
             :mode="mode"
             type="number"
-            :label="t('harvester.service.healthCheckPeriod.label')"
+            :label="t('servicesPage.harvester.healthCheckPeriod.label')"
           />
         </div>
       </div>
@@ -195,7 +195,7 @@ export default {
             v-model="healthCheckTimeout"
             :mode="mode"
             type="number"
-            :label="t('harvester.service.healthCheckTimeout.label')"
+            :label="t('servicesPage.harvester.healthCheckTimeout.label')"
           />
         </div>
       </div>

package/components/Import.vue

@@ -27,6 +27,13 @@ export default {
     SortableTable
   },
 
+  props: {
+    defaultNamespace: {
+      type:    String,
+      default: 'default'
+    },
+  },
+
   async fetch() {
     this.allNamespaces = await this.$store.dispatch('cluster/findAll', { type: NAMESPACE, opt: { url: 'namespaces' } });
   },
@@ -34,7 +41,6 @@ export default {
   data() {
     return {
       currentYaml:      '',
-      defaultNamespace: 'default',
       allNamespaces:    null,
       errors:           null,
       rows:             null,

package/components/ResourceList/index.vue

@@ -14,6 +14,20 @@ export default {
   },
   mixins: [ResourceFetch],
 
+  props: {
+    hasAdvancedFiltering: {
+      type:    Boolean,
+      default: false
+    },
+    advFilterHideLabelsAsCols: {
+      type:    Boolean,
+      default: false
+    },
+    advFilterPreventFilteringLabels: {
+      type:    Boolean,
+      default: false
+    },
+  },
   async fetch() {
     const store = this.$store;
     const resource = this.resource;
@@ -134,6 +148,9 @@ export default {
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
     >
+      <template slot="extraActions">
+        <slot name="extraActions"></slot>
+      </template>
     </Masthead>
     <div v-if="hasListComponent">
       <component
@@ -150,21 +167,24 @@ export default {
       :loading="loading"
       :headers="headers"
       :group-by="groupBy"
+      :has-advanced-filtering="hasAdvancedFiltering"
+      :adv-filter-hide-labels-as-cols="advFilterHideLabelsAsCols"
+      :adv-filter-prevent-filtering-labels="advFilterPreventFilteringLabels"
     />
   </div>
 </template>
 
-<style lang="scss" scoped>
-  .header {
-    position: relative;
-  }
-  H2 {
-    position: relative;
-    margin: 0 0 20px 0;
-  }
-  .right-action {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-  }
-</style>
+  <style lang="scss" scoped>
+    .header {
+      position: relative;
+    }
+    H2 {
+      position: relative;
+      margin: 0 0 20px 0;
+    }
+    .right-action {
+      position: absolute;
+      top: 10px;
+      right: 10px;
+    }
+  </style>

package/components/ResourceTable.vue

@@ -122,6 +122,18 @@ export default {
       type:    Boolean,
       default: false
     },
+    hasAdvancedFiltering: {
+      type:    Boolean,
+      default: false
+    },
+    advFilterHideLabelsAsCols: {
+      type:    Boolean,
+      default: false
+    },
+    advFilterPreventFilteringLabels: {
+      type:    Boolean,
+      default: false
+    },
   },
 
   data() {
@@ -357,6 +369,7 @@ export default {
     handleActionButtonClick(event) {
       this.$emit('clickedActionButton', event);
     }
+
   }
 };
 </script>
@@ -369,6 +382,8 @@ export default {
     :rows="filteredRows"
     :loading="loading"
     :group-by="computedGroupBy"
+    :group="group"
+    :group-options="groupOptions"
     :search="search"
     :paging="true"
     :paging-params="pagingParams"
@@ -378,9 +393,13 @@ export default {
     :overflow-x="overflowX"
     :overflow-y="overflowY"
     :get-custom-detail-link="getCustomDetailLink"
+    :has-advanced-filtering="hasAdvancedFiltering"
+    :adv-filter-hide-labels-as-cols="advFilterHideLabelsAsCols"
+    :adv-filter-prevent-filtering-labels="advFilterPreventFilteringLabels"
     key-field="_key"
     :sort-generation-fn="safeSortGenerationFn"
     @clickedActionButton="handleActionButtonClick"
+    @group-value-change="group = $event"
     v-on="$listeners"
   >
     <template v-if="showGrouping" #header-middle>