HARVESTER: Add hideNamespaceLocation for product config (#7702)

rancher · Jan 13, 2023 · 17f784c · 17f784c
1 parent 4ccb724
commit 17f784c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 7 deletions.
diff --git a/pkg/harvester/config/harvester.js b/pkg/harvester/config/harvester.js
@@ -78,7 +78,8 @@ export function init($plugin, store) {
         product:  PRODUCT_NAME,
         resource: HCI.DASHBOARD
       }
-    }
+    },
+    hideNamespaceLocation: true,
   });
 
   basicType([HCI.DASHBOARD]);

diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js b/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
@@ -10,10 +10,26 @@ import { formatSi } from '@shell/utils/units';
 import { ucFirst } from '@shell/utils/string';
 import { stateDisplay, colorForState } from '@shell/plugins/dashboard-store/resource-class';
 import { _CLONE } from '@shell/config/query-params';
-import { isReady } from '@shell/machine-config/harvester';
 import HarvesterResource from './harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
 
+function isReady() {
+  function getStatusConditionOfType(type, defaultValue = []) {
+    const conditions = Array.isArray(get(this, 'status.conditions')) ? this.status.conditions : defaultValue;
+
+    return conditions.find( cond => cond.type === type);
+  }
+
+  const initialized = getStatusConditionOfType.call(this, 'Initialized');
+  const imported = getStatusConditionOfType.call(this, 'Imported');
+  const isCompleted = this.status?.progress === 100;
+
+  if ([initialized?.status, imported?.status].includes('False')) {
+    return false;
+  } else {
+    return isCompleted && true;
+  }
+}
 export default class HciVmImage extends HarvesterResource {
   get availableActions() {
     let out = super._availableActions;

diff --git a/shell/components/ExplorerProjectsNamespaces.vue b/shell/components/ExplorerProjectsNamespaces.vue
@@ -399,10 +399,14 @@ export default {
       <template #cell:name="{row}">
         <div class="namespace-name">
           <n-link
+            v-if="row.detailLocation"
             :to="row.detailLocation"
           >
             {{ row.name }}
           </n-link>
+          <span v-else>
+            {{ row.name }}
+          </span>
           <i
             v-if="row.hasSystemLabels"
             v-tooltip="getPSA(row)"

diff --git a/shell/components/ResourceDetail/Masthead.vue b/shell/components/ResourceDetail/Masthead.vue
@@ -362,6 +362,10 @@ export default {
 
       return parent?.location;
     },
+
+    hideNamespaceLocation() {
+      return this.$store.getters['currentProduct'].hideNamespaceLocation;
+    },
   },
 
   methods: {
@@ -427,7 +431,18 @@ export default {
         >
           <span v-if="isNamespace && project">{{ t("resourceDetail.masthead.project") }}: <nuxt-link :to="project.detailLocation">{{ project.nameDisplay }}</nuxt-link></span>
           <span v-else-if="isWorkspace">{{ t("resourceDetail.masthead.workspace") }}: <nuxt-link :to="workspaceLocation">{{ namespace }}</nuxt-link></span>
-          <span v-else-if="namespace && !hasMultipleNamespaces">{{ t("resourceDetail.masthead.namespace") }}: <nuxt-link :to="namespaceLocation">{{ namespace }}</nuxt-link></span>
+          <span v-else-if="namespace && !hasMultipleNamespaces">
+            {{ t("resourceDetail.masthead.namespace") }}:
+            <nuxt-link
+              v-if="!hideNamespaceLocation"
+              :to="namespaceLocation"
+            >
+              {{ namespace }}
+            </nuxt-link>
+            <span v-else>
+              {{ namespace }}
+            </span>
+          </span>
           <span v-if="parent.showAge">{{ t("resourceDetail.masthead.age") }}: <LiveDate
             class="live-date"
             :value="value.creationTimestamp"

diff --git a/shell/models/namespace.js b/shell/models/namespace.js
@@ -187,11 +187,10 @@ export default class Namespace extends SteveModel {
   }
 
   get _detailLocation() {
-    const _detailLocation = super._detailLocation;
+    let _detailLocation = super._detailLocation;
 
-    // Harvester uses these resource directly... but has different routes. detailLocation covers routes leading to resource (like edit)
-    if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
-      _detailLocation.name = `${ HARVESTER }-${ _detailLocation.name }`.replace('-product', '');
+    if (this.$rootGetters['currentProduct'].hideNamespaceLocation) {
+      _detailLocation = false;
     }
 
     return _detailLocation;

diff --git a/shell/store/type-map.js b/shell/store/type-map.js
@@ -42,6 +42,7 @@
 //   category,                -- Group to show the product in for the nav hamburger menu
 //   typeStoreMap,            -- An object mapping types to the store that should be used to retrieve information about the type
 //   hideSystemResources      -- Hide resources in namespaces where namespace.isSystem === true, or a namespace managed by fleet (per its annotation) and hide those namespaces from ns/project list and nsfilter (default false)
+//   hideNamespaceLocation    -- Hide the namespace link in the ResourceDetail masthead of namespaced resources and hide the ExplorerProjectsNamespaces namespace link (default false)
 // })
 //
 // externalLink(stringOrFn)  The product has an external page (function gets context object