@rancher/shell 0.2.5 → 0.3.1

package/list/logging.banzaicloud.io.flow.vue

@@ -24,12 +24,12 @@ export default {
   },
 
   async fetch() {
-    try {
-      await this.$store.dispatch('cluster/findAll', { type: LOGGING.OUTPUT });
-      await this.$store.dispatch('cluster/findAll', { type: LOGGING.CLUSTER_OUTPUT });
-    } catch (e) {}
+    this.$initializeFetchData(this.resource);
 
-    await this.$fetchType(LOGGING.FLOW);
+    this.$fetchType(LOGGING.OUTPUT);
+    this.$fetchType(LOGGING.CLUSTER_OUTPUT);
+
+    await this.$fetchType(this.resource);
   }
 };
 </script>
@@ -40,5 +40,6 @@ export default {
     :rows="rows"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>

package/list/management.cattle.io.cluster.vue

@@ -49,5 +49,6 @@ export default {
     :group-by="$attrs.groupBy"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>

package/list/management.cattle.io.feature.vue

@@ -17,7 +17,7 @@ export default {
     ResourceTable,
     LabeledInput
   },
-  mixins:     [ResourceFetch],
+  mixins: [ResourceFetch],
   props:  {
     resource: {
       type:     String,
@@ -89,10 +89,8 @@ export default {
   },
 
   $loadingResources() {
-    return {
-      loadResources:     [MANAGEMENT.FEATURE],
-      loadIndeterminate: true, // results are filtered so we wouldn't get the correct count on indicator...
-    };
+    // results are filtered so we wouldn't get the correct count on indicator...
+    return { loadIndeterminate: true };
   },
 
   watch: {
@@ -201,6 +199,7 @@ export default {
       :row-actions="enableRowActions"
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     >
       <template
         slot="cell:name"

package/list/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -0,0 +1,47 @@
+<script>
+import ResourceTable from '@shell/components/ResourceTable';
+import { STORAGE_CLASS } from '@shell/config/types';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import { Banner } from '@components/Banner';
+
+export default {
+  name:       'PodSecurityAdmission',
+  components: { ResourceTable, Banner },
+  mixins:     [ResourceFetch],
+  props:      {
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    schema: {
+      type:     Object,
+      required: true,
+    },
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentStore']();
+
+    // Fetch storage classes so we can determine if a PVC can be expanded
+    this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS });
+
+    await this.$fetchType(this.resource);
+  }
+};
+</script>
+
+<template>
+  <div>
+    <Banner
+      color="info"
+      :label="t('podSecurityAdmission.banner.modifications')"
+    />
+
+    <ResourceTable
+      :loading="loading"
+      :schema="schema"
+      :rows="rows"
+    />
+  </div>
+</template>

package/list/management.cattle.io.setting.vue

@@ -104,9 +104,9 @@ export default {
             <span
               v-else-if="setting.customized"
               class="modified"
-            >Modified</span>
+            >{{ t('advancedSettings.modified') }}</span>
           </h1>
-          <h2>{{ setting.description }}</h2>
+          <h2>{{ t(`advancedSettings.descriptions.${setting.id}`) }}</h2>
         </div>
         <div
           v-if="setting.hasActions"

package/list/management.cattle.io.user.vue

@@ -1,6 +1,6 @@
 <script>
 import AsyncButton from '@shell/components/AsyncButton';
-import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { NORMAN } from '@shell/config/types';
 import { NAME } from '@shell/config/product/auth';
 import ResourceTable from '@shell/components/ResourceTable';
 import Masthead from '@shell/components/ResourceList/Masthead';
@@ -19,11 +19,6 @@ export default {
       required: true,
     },
 
-    loadResources: {
-      type:    Array,
-      default: () => []
-    },
-
     loadIndeterminate: {
       type:    Boolean,
       default: false
@@ -62,10 +57,8 @@ export default {
   },
 
   $loadingResources() {
-    return {
-      loadResources:     [MANAGEMENT.USER],
-      loadIndeterminate: true, // results are filtered so we wouldn't get the correct count on indicator...
-    };
+    // results are filtered so we wouldn't get the correct count on indicator...
+    return { loadIndeterminate: true };
   },
 
   computed: {
@@ -143,6 +136,7 @@ export default {
       :group-by="groupBy"
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     />
   </div>
 </template>

package/list/monitoring.coreos.com.alertmanagerconfig.vue

@@ -1,7 +1,6 @@
 <script>
 import ResourceTable from '@shell/components/ResourceTable';
 import { Banner } from '@components/Banner';
-import { MONITORING } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 export default {
   name:       'ListApps',
@@ -25,12 +24,7 @@ export default {
   },
 
   async fetch() {
-    try {
-      await this.$store.dispatch('cluster/findAll', { type: MONITORING.ALERTMANAGERCONFIG });
-      await this.$fetchType(this.resource);
-    } catch (err) {
-      throw new Error(err);
-    }
+    await this.$fetchType(this.resource);
   }
 };
 </script>
@@ -45,6 +39,7 @@ export default {
       :rows="rows"
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     />
   </div>
 

package/list/node.vue

@@ -41,27 +41,29 @@ export default {
   },
 
   async fetch() {
-    const hash = { kubeNodes: this.$fetchType(NODE) };
+    this.$initializeFetchData(this.resource);
+
+    const hash = { kubeNodes: this.$fetchType(this.resource) };
 
     this.canViewPods = this.$store.getters[`cluster/schemaFor`](POD);
 
     if (this.$store.getters[`management/schemaFor`](MANAGEMENT.NODE)) {
       // Required for Drain/Cordon action
-      hash.normanNodes = this.$store.dispatch('rancher/findAll', { type: NORMAN.NODE });
+      hash.normanNodes = this.$fetchType(NORMAN.NODE, [], 'rancher');
     }
 
     if (this.$store.getters[`rancher/schemaFor`](NORMAN.NODE)) {
-      hash.mgmtNodes = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
+      hash.mgmtNodes = this.$fetchType(MANAGEMENT.NODE, [], 'management');
     }
 
     if (this.$store.getters[`management/schemaFor`](CAPI.MACHINE)) {
       // Required for ssh / download key actions
-      hash.machines = this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
+      hash.machines = this.$fetchType(CAPI.MACHINE, [], 'management');
     }
 
     if (this.canViewPods) {
       // Used for running pods metrics - we don't need to block on this to show the list of nodes
-      this.$store.dispatch('cluster/findAll', { type: POD });
+      this.$fetchType(POD);
     }
 
     await allHash(hash);
@@ -120,7 +122,7 @@ export default {
 
   },
 
-  methods:  {
+  methods: {
     async loadMetrics() {
       const schema = this.$store.getters['cluster/schemaFor'](METRIC.NODE);
 
@@ -156,6 +158,7 @@ export default {
       :sub-rows="true"
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
       v-on="$listeners"
     >
       <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">

package/list/persistentvolume.vue

@@ -25,11 +25,10 @@ export default {
   },
 
   async fetch() {
-    const inStore = this.$store.getters['currentStore']();
-    const pvcPromise = this.$store.dispatch(`${ inStore }/findAll`, { type: PVC });
+    this.$initializeFetchData(this.resource);
 
+    this.$fetchType(PVC);
     await this.$fetchType(this.resource);
-    await pvcPromise;
   }
 };
 </script>
@@ -42,5 +41,6 @@ export default {
     :group-by="$attrs.groupBy"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>

package/list/persistentvolumeclaim.vue

@@ -25,11 +25,9 @@ export default {
   },
 
   async fetch() {
-    const inStore = this.$store.getters['currentStore']();
-
-    // Fetch storage classes so we can determine if a PVC can be expanded
-    this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS });
+    this.$initializeFetchData(this.resource);
 
+    this.$fetchType(STORAGE_CLASS);
     await this.$fetchType(this.resource);
   }
 };
@@ -41,5 +39,6 @@ export default {
     :schema="schema"
     :rows="rows"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>

package/list/provisioning.cattle.io.cluster.vue

@@ -16,11 +16,6 @@ export default {
   },
   mixins: [ResourceFetch],
   props:  {
-    loadResources: {
-      type:    Array,
-      default: () => []
-    },
-
     loadIndeterminate: {
       type:    Boolean,
       default: false
@@ -38,36 +33,41 @@ export default {
   },
 
   async fetch() {
+    this.$initializeFetchData(CAPI.RANCHER_CLUSTER);
     const hash = {
       rancherClusters: this.$fetchType(CAPI.RANCHER_CLUSTER),
-      normanClusters:  this.$store.dispatch('rancher/findAll', { type: NORMAN.CLUSTER }),
-      mgmtClusters:    this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }),
+      normanClusters:  this.$fetchType(NORMAN.CLUSTER, [], 'rancher'),
+      mgmtClusters:    this.$fetchType(MANAGEMENT.CLUSTER),
     };
 
     if ( this.$store.getters['management/canList'](SNAPSHOT) ) {
-      hash.etcdSnapshots = this.$store.dispatch('management/findAll', { type: SNAPSHOT });
+      hash.etcdSnapshots = this.$fetchType(SNAPSHOT);
+    }
+
+    if ( this.$store.getters['management/canList'](CAPI.MACHINE) ) {
+      hash.capiMachines = this.$fetchType(CAPI.MACHINE);
     }
 
     if ( this.$store.getters['management/canList'](MANAGEMENT.NODE) ) {
-      hash.mgmtNodes = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
+      hash.mgmtNodes = this.$fetchType(MANAGEMENT.NODE);
     }
 
     if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL) ) {
-      hash.mgmtPools = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
+      hash.mgmtPools = this.$fetchType(MANAGEMENT.NODE_POOL);
     }
 
     if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE) ) {
-      hash.mgmtTemplates = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
+      hash.mgmtTemplates = this.$fetchType(MANAGEMENT.NODE_TEMPLATE);
     }
 
     if ( this.$store.getters['management/canList'](CAPI.MACHINE_DEPLOYMENT) ) {
-      hash.machineDeployments = this.$store.dispatch('management/findAll', { type: CAPI.MACHINE_DEPLOYMENT });
+      hash.machineDeployments = this.$fetchType(CAPI.MACHINE_DEPLOYMENT);
     }
 
     // Fetch RKE template revisions so we can show when an updated template is available
     // This request does not need to be blocking
     if ( this.$store.getters['management/canList'](MANAGEMENT.RKE_TEMPLATE_REVISION) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.RKE_TEMPLATE_REVISION });
+      this.$fetchType(MANAGEMENT.RKE_TEMPLATE_REVISION);
     }
 
     const res = await allHash(hash);
@@ -77,9 +77,9 @@ export default {
 
   data() {
     return {
-      resource:        CAPI.RANCHER_CLUSTER,
-      schema:          this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
-      mgmtClusters:    [],
+      resource:     CAPI.RANCHER_CLUSTER,
+      schema:       this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
+      mgmtClusters: [],
     };
   },
 
@@ -137,10 +137,8 @@ export default {
   },
 
   $loadingResources() {
-    return {
-      loadResources:     [CAPI.RANCHER_CLUSTER],
-      loadIndeterminate: true, // results are filtered so we wouldn't get the correct count on indicator...
-    };
+    // results are filtered so we wouldn't get the correct count on indicator...
+    return { loadIndeterminate: true };
   },
 
   mounted() {
@@ -172,7 +170,7 @@ export default {
       >
         <n-link
           :to="importLocation"
-          class="btn role-primary"
+          class="btn role-primary mr-10"
           data-testid="cluster-manager-list-import"
         >
           {{ t('cluster.importAction') }}
@@ -187,6 +185,7 @@ export default {
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :data-testid="'cluster-list'"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     >
       <template #cell:summary="{row}">
         <span v-if="!row.stateParts.length">{{ row.nodes.length }}</span>
@@ -199,7 +198,7 @@ export default {
           class="btn btn-sm role-secondary"
           :to="{name: 'c-cluster', params: {cluster: row.mgmt.id}}"
         >
-          {{ t('cluster.exploreHarvester') }}
+          {{ t('cluster.explore') }}
         </n-link>
         <button
           v-else

package/list/service.vue

@@ -1,7 +1,6 @@
 <script>
 import ResourceTable from '@shell/components/ResourceTable';
 import { NODE } from '@shell/config/types';
-import { allHash } from '@shell/utils/promise';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 
 export default {
@@ -29,22 +28,14 @@ export default {
   async fetch() {
     const store = this.$store;
     const inStore = store.getters['currentStore']();
-    let hasNodes = false;
 
-    try {
-      const schema = store.getters[`${ inStore }/schemaFor`](NODE);
+    this.$initializeFetchData(this.resource);
 
-      if (schema) {
-        hasNodes = true;
-      }
-    } catch {}
-
-    const hash = { rows: this.$fetchType(this.resource) };
-
-    if (hasNodes) {
-      hash.nodes = store.dispatch(`${ inStore }/findAll`, { type: NODE });
+    if (store.getters[`${ inStore }/schemaFor`](NODE)) {
+      this.$fetchType(NODE);
     }
-    await allHash(hash);
+
+    await this.$fetchType(this.resource);
   }
 };
 </script>
@@ -57,5 +48,6 @@ export default {
     :group-by="$attrs.groupBy"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>

package/list/workload.vue

@@ -13,6 +13,24 @@ const schema = {
   metadata: { name: 'workload' },
 };
 
+const $loadingResources = ($route, $store) => {
+  const allowedResources = [];
+
+  Object.values(WORKLOAD_TYPES).forEach((type) => {
+    // You may not have RBAC to see some of the types
+    if ($store.getters['cluster/schemaFor'](type) ) {
+      allowedResources.push(type);
+    }
+  });
+
+  const allTypes = $route.params.resource === schema.id;
+
+  return {
+    loadResources:     allTypes ? allowedResources : [$route.params.resource],
+    loadIndeterminate: allTypes,
+  };
+};
+
 export default {
   name:       'ListWorkload',
   components: { ResourceTable },
@@ -26,30 +44,25 @@ export default {
   },
 
   async fetch() {
+    if (this.allTypes && this.loadResources.length) {
+      this.$initializeFetchData(this.loadResources[0], this.loadResources);
+    } else {
+      this.$initializeFetchData(this.$route.params.resource);
+    }
+
     try {
       const schema = this.$store.getters[`cluster/schemaFor`](NODE);
 
       if (schema) {
-        this.$store.dispatch('cluster/findAll', { type: NODE });
+        this.$fetchType(NODE);
       }
     } catch {}
 
-    let resources;
-
     this.loadHeathResources();
 
     if ( this.allTypes ) {
-      const allowedResources = [];
-
-      Object.values(WORKLOAD_TYPES).forEach((type) => {
-        // You may not have RBAC to see some of the types
-        if (this.$store.getters['cluster/schemaFor'](type) ) {
-          allowedResources.push(type);
-        }
-      });
-
-      resources = await Promise.all(allowedResources.map((allowed) => {
-        return this.$fetchType(allowed, allowedResources);
+      this.resources = await Promise.all(this.loadResources.map((allowed) => {
+        return this.$fetchType(allowed, this.loadResources);
       }));
     } else {
       const type = this.$route.params.resource;
@@ -57,15 +70,20 @@ export default {
       if ( this.$store.getters['cluster/schemaFor'](type) ) {
         const resource = await this.$fetchType(type);
 
-        resources = [resource];
+        this.resources = [resource];
       }
     }
-
-    this.resources = resources;
   },
 
   data() {
-    return { resources: [] };
+    // Ensure these are set on load (to determine if the NS filter is required) rather than too late on `fetch`
+    const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
+
+    return {
+      resources: [],
+      loadResources,
+      loadIndeterminate
+    };
   },
 
   computed: {
@@ -103,30 +121,16 @@ export default {
   },
 
   // All of the resources that we will load that we need for the loading indicator
-  $loadingResources(route, store) {
-    const allTypes = route.params.resource === schema.id;
-
-    const allowedResources = [];
-
-    Object.values(WORKLOAD_TYPES).forEach((type) => {
-      // You may not have RBAC to see some of the types
-      if (store.getters['cluster/schemaFor'](type) ) {
-        allowedResources.push(type);
-      }
-    });
-
-    return {
-      loadResources:     allTypes ? allowedResources : [route.params.resource],
-      loadIndeterminate: allTypes,
-    };
+  $loadingResources($route, $store) {
+    return $loadingResources($route, $store);
   },
 
   methods: {
     loadHeathResources() {
       // Fetch these in the background to populate workload health
       if ( this.allTypes ) {
-        this.$store.dispatch('cluster/findAll', { type: POD });
-        this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
+        this.$fetchType(POD);
+        this.$fetchType(WORKLOAD_TYPES.JOB);
       } else {
         const type = this.$route.params.resource;
 
@@ -136,9 +140,9 @@ export default {
         }
 
         if (type === WORKLOAD_TYPES.CRON_JOB) {
-          this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
+          this.$fetchType(WORKLOAD_TYPES.JOB);
         } else {
-          this.$store.dispatch('cluster/findAll', { type: POD });
+          this.$fetchType(POD);
         }
       }
     }
@@ -164,5 +168,6 @@ export default {
     :rows="filteredRows"
     :overflow-y="true"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>

package/machine-config/amazonec2.vue

@@ -30,7 +30,7 @@ export default {
     },
 
     cluster: {
-      type:     Object,
+      type:    Object,
       default: () => ({})
     },