dashboard-shell-shell 1.0.1000000091 → 1.0.1000000093

package/components/form/KeyValue.vue

@@ -390,10 +390,10 @@ export default {
 
       rows = rows.map((item) => {
         if (item.key.includes('harvester')) {
-          item.key = item.key.replace('harvester', 'cloud');
+          item.key = item.key;
         }
         if (item.value.includes('harvester')) {
-          item.value = item.value.replace('harvester', 'cloud');
+          item.value = item.value;
         }
 
         return item;
@@ -409,8 +409,8 @@ export default {
         [this.valueName]: value,
       };
 
-      obj.key = obj.key.replace('harvester', 'cloud');
-      obj.value = obj.value.replace('harvester', 'cloud');
+      obj.key = obj.key;
+      obj.value = obj.value;
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -484,8 +484,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
-          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
+          const key = (row[keyName] || '').trim();
+          let value = (row[valueName] || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/MatchExpressions.vue

@@ -289,7 +289,7 @@ export default {
         :data-testid="`input-match-type-field-${index}`"
       >
         <div v-if="isView">
-          {{ row.matching.replace('harvester', 'cloud') }}
+          {{ row.matching }}
           <!-- {{ row.matching }} -->
         </div>
         <LabeledSelect
@@ -305,7 +305,7 @@ export default {
         :data-testid="`input-match-expression-key-${index}`"
       >
         <div v-if="isView" class="view-item-value">
-          {{ row.key.replace('harvester', 'cloud') }}
+          {{ row.key }}
         </div>
         <input
           v-else-if="!hasKeySelectOptions"

package/components/nav/NamespaceFilter.vue

@@ -756,7 +756,7 @@ export default {
           :data-testid="`namespaces-value-${j}`"
           class="ns-value"
         >
-          <div>{{ ns.label.replace('harvester', 'cloud') }}</div>
+          <div>{{ ns.label }}</div>
           <!-- block user from removing the last selection if ns forced filtering is on -->
           <i
             v-if="!namespaceFilterMode || value.length > 1"
@@ -867,7 +867,7 @@ export default {
               v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
               class="icon icon-folder"
             />
-            <div>{{ opt.label.replace('harvester', 'cloud') }}</div>
+            <div>{{ opt.label }}</div>
             <i
               v-if="opt.selected"
               class="icon icon-checkmark"

package/config/table-headers.js

@@ -162,7 +162,7 @@ export const NAMESPACE = {
   name:        'namespace',
   labelKey:    'tableHeaders.namespace',
   value:       'namespace',
-  getValue:    row => row && row.namespace && row.namespace.replace('harvester', 'cloud'),
+  getValue:    row => row && row.namespace && row.namespace,
   sort:        'namespace',
   dashIfEmpty: true,
 };

package/list/workload.vue

@@ -0,0 +1,188 @@
+<script>
+import ResourceTable from '@shell/components/ResourceTable';
+import {
+  WORKLOAD_TYPES, SCHEMA, NODE, POD, LIST_WORKLOAD_TYPES
+} from '@shell/config/types';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
+
+const workloadSchema = {
+  id:         'workload',
+  type:       SCHEMA,
+  attributes: {
+    kind:       'Workload',
+    namespaced: true
+  },
+  metadata: { name: 'workload' },
+};
+
+const $loadingResources = ($route, $store) => {
+  const allowedResources = [];
+
+  Object.values(LIST_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 === workloadSchema.id;
+
+  return {
+    loadResources:     allTypes ? allowedResources : [$route.params.resource],
+    loadIndeterminate: allTypes,
+  };
+};
+
+export default {
+  name:       'ListWorkload',
+  components: { ResourceTable, PaginatedResourceTable },
+  mixins:     [ResourceFetch],
+
+  props: {
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
+  },
+
+  async fetch() {
+    if (this.paginationEnabled) {
+      return;
+    }
+
+    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) {
+        // Used for shell/components/formatter/Endpoints.vue (too see column page needs to be wide and per page setting 25 or under)
+        this.$fetchType(NODE);
+      }
+    } catch {}
+
+    this.loadHeathResources();
+
+    if ( this.allTypes ) {
+      this.resources = await Promise.all(this.loadResources.map((allowed) => {
+        return this.$fetchType(allowed, this.loadResources);
+      }));
+    } else {
+      const type = this.$route.params.resource;
+
+      if ( this.$store.getters['cluster/schemaFor'](type) ) {
+        const resource = await this.$fetchType(type);
+
+        this.resources = [resource];
+      }
+    }
+  },
+
+  data() {
+    // 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);
+
+    const { params:{ resource: type } } = this.$route;
+    const allTypes = this.$route.params.resource === workloadSchema.id;
+    const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
+    const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
+
+    return {
+      allTypes,
+      schema,
+      paginationEnabled,
+      resources: [],
+      loadResources,
+      loadIndeterminate
+    };
+  },
+
+  computed: {
+    filteredRows() {
+      const out = [];
+
+      for ( const typeRows of this.resources ) {
+        if ( !typeRows ) {
+          continue;
+        }
+
+        for ( const row of typeRows ) {
+          if (!this.allTypes || !row.ownedByWorkload) {
+            out.push(row);
+          }
+        }
+      }
+
+      return out;
+    },
+
+    headers() {
+      return this.$store.getters['type-map/headersFor'](this.schema, false);
+    }
+  },
+
+  // All of the resources that we will load that we need for the loading indicator
+  $loadingResources($route, $store) {
+    return $loadingResources($route, $store);
+  },
+
+  methods: {
+    loadHeathResources() {
+      // See https://github.com/rancher/dashboard/issues/10417, health comes from selectors applied locally to all pods (bad)
+      if (this.paginationEnabled) {
+        return;
+      }
+
+      // Fetch these in the background to populate workload health
+      if ( this.allTypes ) {
+        this.$fetchType(POD);
+        this.$fetchType(WORKLOAD_TYPES.JOB);
+      } else {
+        const type = this.$route.params.resource;
+
+        if (type === WORKLOAD_TYPES.JOB || type === POD) {
+          // Ignore job and pods (we're fetching this anyway, plus they contain their own state)
+          return;
+        }
+
+        if (type === WORKLOAD_TYPES.CRON_JOB) {
+          this.$fetchType(WORKLOAD_TYPES.JOB);
+        } else {
+          this.$fetchType(POD);
+        }
+      }
+    }
+  },
+
+  typeDisplay() {
+    // Used by shell/components/ResourceList/index.vue to override list title (usually found via schema, which doesn't exist for this virtual type)
+    return this.$store.getters['type-map/labelFor'](this.schema || workloadSchema, 99);
+  },
+};
+</script>
+
+<template>
+  <div>
+    <PaginatedResourceTable
+      v-if="paginationEnabled"
+      :schema="schema"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    />
+    <ResourceTable
+      v-else
+      :loading="$fetchState.pending"
+      :schema="schema"
+      :headers="headers"
+      :rows="filteredRows"
+      :overflow-y="true"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    />
+  </div>
+</template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000091",
+  "version": "1.0.1000000093",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",