@rancher/shell 0.3.16 → 0.3.18

package/middleware/authenticated.js

@@ -26,6 +26,16 @@ const getPackageFromRoute = (route) => {
   return arraySafe.find((m) => !!m.pkg)?.pkg;
 };
 
+const getResourceFromRoute = (to) => {
+  let resource = to.params?.resource;
+
+  if (!resource) {
+    resource = findMeta(to, 'resource');
+  }
+
+  return resource;
+};
+
 let beforeEachSetup = false;
 
 function findMeta(route, key) {
@@ -71,9 +81,18 @@ export function getProductFromRoute(to) {
   return product;
 }
 
-function setProduct(store, to) {
+function setProduct(store, to, redirect) {
   let product = getProductFromRoute(to);
 
+  // since all products are hardcoded as routes (ex: c-local-explorer), if we match the wildcard route it means that the product does not exist
+  if ((product && (!to.matched.length || (to.matched.length && to.matched[0].path === '/c/:cluster/:product'))) ||
+  // if the product grabbed from the route is not registered, then we don't have it!
+  (product && !store.getters['type-map/isProductRegistered'](product))) {
+    store.dispatch('loadingError', new Error(store.getters['i18n/t']('nav.failWhale.productNotFound', { productNotFound: product }, true)));
+
+    return () => redirect(302, '/fail-whale');
+  }
+
   if ( !product ) {
     product = EXPLORER;
   }
@@ -92,6 +111,50 @@ function setProduct(store, to) {
     // There might be management catalog items in it vs cluster.
     store.commit('catalog/reset');
   }
+
+  return false;
+}
+
+/**
+ * Check that the resource is valid, if not redirect to fail whale
+ *
+ * This requires that
+ * - product is set
+ * - product's store is set and setup (so we can check schema's within it)
+ * - product's store has the schemaFor getter (extension stores might not have it)
+ * - there's a resource associated with route (meta or param)
+ */
+function invalidResource(store, to, redirect) {
+  const product = store.getters['currentProduct'];
+  const resource = getResourceFromRoute(to);
+
+  // In order to check a resource is valid we need these
+  if (!product || !resource) {
+    return false;
+  }
+
+  // Note - don't use the current products store... because products can override stores for resources with `typeStoreMap`
+  const inStore = store.getters['currentStore'](resource);
+  // There's a chance we're in an extension's product who's store could be anything, so confirm schemaFor exists
+  const schemaFor = store.getters[`${ inStore }/schemaFor`];
+
+  // In order to check a resource is valid we need these
+  if (!inStore || !schemaFor) {
+    return false;
+  }
+
+  // Resource is valid if a schema exists for it (standard resource, spoofed resource) or it's a virtual resource
+  const validResource = schemaFor(resource) || store.getters['type-map/isVirtual'](resource);
+
+  if (validResource) {
+    return false;
+  }
+
+  // Unknown resource, redirect to fail whale
+
+  store.dispatch('loadingError', new Error(store.getters['i18n/t']('nav.failWhale.resourceNotFound', { resource }, true)));
+
+  return () => redirect(302, '/fail-whale');
 }
 
 export default async function({
@@ -281,19 +344,39 @@ export default async function({
   store.dispatch('gcRouteChanged', route);
 
   // Load stuff
+  let localCheckResource = false;
+
   await applyProducts(store, $plugin);
+
   // Setup a beforeEach hook once to keep track of the current product
   if ( !beforeEachSetup ) {
     beforeEachSetup = true;
+    // This only needs to happen when beforeEach hook hasn't run (the initial load)
+    localCheckResource = true;
 
     store.app.router.beforeEach((to, from, next) => {
       // NOTE - This beforeEach runs AFTER this middleware. So anything in this middleware that requires it must set it manually
-      setProduct(store, to);
+      let redirected = setProduct(store, to, redirect);
+
+      if (redirected) {
+        return redirected();
+      }
+
+      redirected = invalidResource(store, to, redirect);
+
+      if (redirected) {
+        return redirected();
+      }
+
       next();
     });
 
     // Call it for the initial pageload
-    setProduct(store, route);
+    const redirected = setProduct(store, route, redirect);
+
+    if (redirected) {
+      return redirected();
+    }
 
     if (process.client) {
       store.app.router.afterEach((to, from) => {
@@ -376,7 +459,12 @@ export default async function({
     // When fleet moves to it's own package this should be moved to pkg onEnter/onLeave
     if ((oldProduct === FLEET_NAME || product === FLEET_NAME) && oldProduct !== product) {
       // See note above for store.app.router.beforeEach, need to setProduct manually, for the moment do this in a targeted way
-      setProduct(store, route);
+      const redirected = setProduct(store, route, redirect);
+
+      if (redirected) {
+        return redirected();
+      }
+
       store.commit('updateWorkspace', {
         value:   store.getters['prefs/get'](WORKSPACE) || DEFAULT_WORKSPACE,
         getters: store.getters
@@ -397,6 +485,14 @@ export default async function({
       })
     ]);
 
+    if (localCheckResource) {
+      const redirected = invalidResource(store, route, redirect);
+
+      if (redirected) {
+        return redirected();
+      }
+    }
+
     if (!clusterId) {
       clusterId = store.getters['defaultClusterId']; // This needs the cluster list, so no parallel
       const isSingleProduct = store.getters['isSingleProduct'];
@@ -422,7 +518,7 @@ export default async function({
       return redirect(302, '/home');
     } else {
       // Sets error 500 if lost connection to API
-      store.commit('setError', { error: e, locationError: new Error('Auth Middleware') });
+      store.commit('setError', { error: e, locationError: new Error(store.getters['i18n/t']('nav.failWhale.authMiddleware')) });
 
       return redirect(302, '/fail-whale');
     }

package/mixins/brand.js

@@ -1,3 +1,4 @@
+import { mapGetters } from 'vuex';
 import { CATALOG, MANAGEMENT } from '@shell/config/types';
 import { getVendor } from '@shell/config/private-label';
 import { SETTING } from '@shell/config/settings';
@@ -5,6 +6,12 @@ import { findBy } from '@shell/utils/array';
 import { createCssVars } from '@shell/utils/color';
 import { _ALL_IF_AUTHED } from '@shell/plugins/dashboard-store/actions';
 
+const cspAdaptorApp = ['rancher-csp-adapter', 'rancher-csp-billing-adapter'];
+
+export const hasCspAdapter = (apps) => {
+  return apps?.find((a) => cspAdaptorApp.includes(a.metadata?.name));
+};
+
 export default {
   async fetch() {
     // For the login page, the schemas won't be loaded - we don't need the apps in this case
@@ -23,13 +30,19 @@ export default {
         }
       });
     } catch (e) {}
+
+    // Setting this up front will remove `computed` churn, and we only care that we've initialised them
+    this.haveAppsAndSettings = !!this.apps && !!this.globalSettings;
   },
 
   data() {
-    return { apps: [], globalSettings: [] };
+    return {
+      apps: null, globalSettings: null, haveAppsAndSettings: null
+    };
   },
 
   computed: {
+    ...mapGetters({ loggedIn: 'auth/loggedIn' }),
 
     brand() {
       const setting = findBy(this.globalSettings, 'id', SETTING.BRAND);
@@ -61,7 +74,23 @@ export default {
     },
 
     cspAdapter() {
-      return findBy(this.apps, 'metadata.name', 'rancher-csp-adapter' );
+      if (!this.canCalcCspAdapter) {
+        // We only have a watch on cspAdapter to kick off persisting the brand setting.
+        // So we need to ensure we don't return an undefined here... which would match the undefined gave if no csp app was found...
+        // .. and wouldn't kick off the watcher
+        return '';
+      }
+
+      // Note! this used to be `findBy(this.app)` however for that case we lost reactivity on the collection
+      // (computed fires before fetch, fetch happens and update apps, computed would not fire again - even with vue.set)
+      // So use `.find` in method instead
+      return hasCspAdapter(this.apps);
+    },
+
+    canCalcCspAdapter() {
+      // We need to take consider the loggedIn state, as the brand mixin is used in the logout page where we can be in a mixed state
+      // (things in store but user has no auth to make changes)
+      return this.loggedIn && this.haveAppsAndSettings;
     }
   },
 
@@ -90,7 +119,13 @@ export default {
     },
 
     cspAdapter(neu) {
+      if (!this.canCalcCspAdapter) {
+        return;
+      }
+
+      // The brand setting will only get updated if...
       if (neu && !this.brand) {
+        // 1) There should be a brand... but there's no brand setting
         const brandSetting = findBy(this.globalSettings, 'id', SETTING.BRAND);
 
         if (brandSetting) {
@@ -109,7 +144,8 @@ export default {
       } else if (!neu) {
         const brandSetting = findBy(this.globalSettings, 'id', SETTING.BRAND);
 
-        if (brandSetting) {
+        if (brandSetting && brandSetting.value !== '') {
+          // 2) There should not be a brand... but there is a brand setting
           brandSetting.value = '';
           brandSetting.save();
         }

package/mixins/child-hook.js

@@ -20,8 +20,8 @@ export default {
       });
     },
 
-    registerAfterHook(boundFn, name, priority) {
-      this._registerHook(AFTER_SAVE_HOOKS, boundFn, name, priority);
+    registerAfterHook(boundFn, name, priority = 99, boundFnContext) {
+      this._registerHook(AFTER_SAVE_HOOKS, boundFn, name, priority, boundFnContext);
     },
 
     async applyHooks(key, ...args) {

package/mixins/create-edit-view/impl.js

@@ -65,9 +65,9 @@ export default {
 
       let name = this.$route.name;
 
-      if ( name.endsWith('-id') ) {
+      if ( name?.endsWith('-id') ) {
         name = name.replace(/(-namespace)?-id$/, '');
-      } else if ( name.endsWith('-create') ) {
+      } else if ( name?.endsWith('-create') ) {
         name = name.replace(/-create$/, '');
       }
 
@@ -124,7 +124,7 @@ export default {
       }
 
       try {
-        await this.applyHooks(BEFORE_SAVE_HOOKS);
+        await this.applyHooks(BEFORE_SAVE_HOOKS, this.value);
 
         // Remove the labels map if it's empty
         if ( this.value?.metadata?.labels && Object.keys(this.value.metadata.labels || {}).length === 0 ) {
@@ -152,7 +152,7 @@ export default {
           await this.$store.dispatch('cluster/findAll', { type: this.value.type, opt: { force: true } }, { root: true });
         }
 
-        await this.applyHooks(AFTER_SAVE_HOOKS);
+        await this.applyHooks(AFTER_SAVE_HOOKS, this.value);
         buttonDone && buttonDone(true);
 
         this.done();

package/models/chart.js

@@ -2,7 +2,7 @@ import { compatibleVersionsFor } from '@shell/store/catalog';
 import {
   REPO_TYPE, REPO, CHART, VERSION, _FLAGGED, HIDE_SIDE_NAV
 } from '@shell/config/query-params';
-import { BLANK_CLUSTER } from '@shell/store';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
 export default class Chart extends SteveModel {

package/models/fleet.cattle.io.cluster.js

@@ -4,6 +4,7 @@ import { _RKE2 } from '@shell/store/prefs';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { escapeHtml } from '@shell/utils/string';
 import { insertAt } from '@shell/utils/array';
+import jsyaml from 'js-yaml';
 
 export default class FleetCluster extends SteveModel {
   get _availableActions() {
@@ -89,7 +90,7 @@ export default class FleetCluster extends SteveModel {
   }
 
   get state() {
-    if ( this.spec?.paused === true ) {
+    if (this.spec?.paused === true) {
       return 'paused';
     }
 
@@ -124,19 +125,47 @@ export default class FleetCluster extends SteveModel {
     return mgmt;
   }
 
-  get norman() {
-    const norman = this.$rootGetters['rancher/byId'](NORMAN.CLUSTER, this.metadata.labels?.[FLEET_LABELS.CLUSTER_NAME]);
+  get basicNorman() {
+    const norman = this.$rootGetters['rancher/byId'](NORMAN.CLUSTER, this.metadata?.labels?.[FLEET_LABELS.CLUSTER_NAME]);
 
     return norman;
   }
 
+  get norman() {
+    if (this.basicNorman) {
+      return this.basicNorman;
+    }
+
+    // If navigate to YAML view directly, norman is not loaded yet
+    return this.$dispatch('rancher/find', { type: NORMAN.CLUSTER, id: this.metadata.labels[FLEET_LABELS.CLUSTER_NAME] }, { root: true });
+  }
+
+  async normanClone() {
+    const norman = await this.norman;
+
+    return this.$dispatch('rancher/clone', { resource: norman }, { root: true });
+  }
+
   get groupByLabel() {
     const name = this.metadata.namespace;
 
-    if ( name ) {
+    if (name) {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.workspace', { name: escapeHtml(name) });
     } else {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInAWorkspace');
     }
   }
+
+  async saveYaml(yaml) {
+    await this._saveYaml(yaml);
+
+    const parsed = jsyaml.load(yaml);
+
+    const norman = await this.normanClone();
+
+    norman.setLabels(parsed.metadata.labels);
+    norman.setAnnotations(parsed.metadata.annotations);
+
+    await norman.save();
+  }
 }

package/models/fleet.cattle.io.gitrepo.js

@@ -1,14 +1,16 @@
 import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
-import { escapeHtml } from '@shell/utils/string';
+import { escapeHtml, randomStr } from '@shell/utils/string';
 import { FLEET } from '@shell/config/types';
 import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { addObject, addObjects, findBy, insertAt } from '@shell/utils/array';
 import { set } from '@shell/utils/object';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { STATES_ENUM, colorForState, stateDisplay, stateSort } from '@shell/plugins/dashboard-store/resource-class';
+import { NAME } from '@shell/config/product/explorer';
 
 function quacksLikeAHash(str) {
-  if ( str.match(/^[a-f0-9]{40,}$/i) ) {
+  if (str.match(/^[a-f0-9]{40,}$/i)) {
     return true;
   }
 
@@ -24,12 +26,13 @@ export default class GitRepo extends SteveModel {
 
     spec.repo = spec.repo || '';
 
-    if ( !spec.branch && !spec.revision ) {
+    if (!spec.branch && !spec.revision) {
       spec.branch = 'master';
     }
 
     spec.paths = spec.paths || [];
     spec.clientSecretName = spec.clientSecretName || null;
+    spec.correctDrift = { enabled: false };
 
     set(this, 'spec', spec);
     set(this, 'metadata', meta);
@@ -85,7 +88,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get state() {
-    if ( this.spec?.paused === true ) {
+    if (this.spec?.paused === true) {
       return 'paused';
     }
 
@@ -97,10 +100,10 @@ export default class GitRepo extends SteveModel {
     const clusters = workspace?.clusters || [];
     const groups = workspace?.clusterGroups || [];
 
-    if ( workspace?.id === 'fleet-local' ) {
+    if (workspace?.id === 'fleet-local') {
       const local = findBy(groups, 'id', 'fleet-local/default');
 
-      if ( local ) {
+      if (local) {
         return local.targetClusters;
       }
 
@@ -113,30 +116,30 @@ export default class GitRepo extends SteveModel {
 
     const out = [];
 
-    for ( const tgt of this.spec.targets ) {
-      if ( tgt.clusterName ) {
+    for (const tgt of this.spec.targets) {
+      if (tgt.clusterName) {
         const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
 
-        if ( cluster ) {
+        if (cluster) {
           addObject(out, cluster);
         }
-      } else if ( tgt.clusterGroup ) {
+      } else if (tgt.clusterGroup) {
         const group = findBy(groups, {
           'metadata.namespace': this.metadata.namespace,
           'metadata.name':      tgt.clusterGroup,
         });
 
-        if ( group ) {
+        if (group) {
           addObjects(out, group.targetClusters);
         }
-      } else if ( tgt.clusterGroupSelector ) {
+      } else if (tgt.clusterGroupSelector) {
         const expressions = convertSelectorObj(tgt.clusterGroupSelector);
         const matchingGroups = matching(groups, expressions);
 
-        for ( const group of matchingGroups ) {
+        for (const group of matchingGroups) {
           addObjects(out, group.targetClusters);
         }
-      } else if ( tgt.clusterSelector ) {
+      } else if (tgt.clusterSelector) {
         const expressions = convertSelectorObj(tgt.clusterSelector);
         const matchingClusters = matching(clusters, expressions);
 
@@ -150,7 +153,7 @@ export default class GitRepo extends SteveModel {
   get github() {
     const match = this.spec.repo.match(/^https?:\/\/github\.com\/(.*?)(\.git)?\/*$/);
 
-    if ( match ) {
+    if (match) {
       return match[1];
     }
 
@@ -158,7 +161,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get repoIcon() {
-    if ( this.github ) {
+    if (this.github) {
       return 'icon icon-github';
     }
 
@@ -172,7 +175,7 @@ export default class GitRepo extends SteveModel {
     repo = repo.replace(/^https:\/\//, '');
     repo = repo.replace(/\/+$/, '');
 
-    if ( this.github ) {
+    if (this.github) {
       return this.github;
     }
 
@@ -183,15 +186,15 @@ export default class GitRepo extends SteveModel {
     const spec = this.spec;
     const hash = this.status?.commit?.substr(0, 7);
 
-    if ( !spec || !spec.repo ) {
+    if (!spec || !spec.repo) {
       return null;
     }
 
-    if ( spec.revision && quacksLikeAHash(spec.revision) ) {
+    if (spec.revision && quacksLikeAHash(spec.revision)) {
       return spec.revision.substr(0, 7);
-    } else if ( spec.revision ) {
+    } else if (spec.revision) {
       return spec.revision;
-    } else if ( spec.branch ) {
+    } else if (spec.branch) {
       return spec.branch + (hash ? ` @ ${ hash }` : '');
     }
 
@@ -219,7 +222,7 @@ export default class GitRepo extends SteveModel {
 
     advanced = jsyaml.dump(targets);
 
-    if ( advanced === '[]\n' ) {
+    if (advanced === '[]\n') {
       advanced = `# - name:
 #  clusterSelector:
 #    matchLabels:
@@ -239,39 +242,39 @@ export default class GitRepo extends SteveModel {
 `;
     }
 
-    if ( this.metadata.namespace === 'fleet-local' ) {
+    if (this.metadata.namespace === 'fleet-local') {
       mode = 'local';
-    } else if ( !targets.length ) {
+    } else if (!targets.length) {
       mode = 'none';
-    } else if ( targets.length === 1) {
+    } else if (targets.length === 1) {
       const target = targets[0];
 
       if (Object.keys(target).length > 1) {
         // There are multiple properties in a single target, so use the 'advanced' mode
         // (otherwise any existing content is nuked for what we provide)
         mode = 'advanced';
-      } else if ( target.clusterGroup ) {
+      } else if (target.clusterGroup) {
         clusterGroup = target.clusterGroup;
 
-        if ( !mode ) {
+        if (!mode) {
           mode = 'clusterGroup';
         }
-      } else if ( target.clusterName ) {
+      } else if (target.clusterName) {
         mode = 'cluster';
         cluster = target.clusterName;
-      } else if ( target.clusterSelector ) {
-        if ( Object.keys(target.clusterSelector).length === 0 ) {
+      } else if (target.clusterSelector) {
+        if (Object.keys(target.clusterSelector).length === 0) {
           mode = 'all';
         } else {
           const expressions = convert(target.clusterSelector.matchLabels, target.clusterSelector.matchExpressions);
 
-          if ( expressions.length === 1 &&
-              expressions[0].key === FLEET_ANNOTATIONS.CLUSTER_NAME &&
-              expressions[0].operator === 'In' &&
-              expressions[0].values.length === 1
+          if (expressions.length === 1 &&
+            expressions[0].key === FLEET_ANNOTATIONS.CLUSTER_NAME &&
+            expressions[0].operator === 'In' &&
+            expressions[0].values.length === 1
           ) {
             cluster = expressions[0].values[0];
-            if ( !mode ) {
+            if (!mode) {
               mode = 'cluster';
             }
           }
@@ -279,7 +282,7 @@ export default class GitRepo extends SteveModel {
       }
     }
 
-    if ( !mode ) {
+    if (!mode) {
       mode = 'advanced';
     }
 
@@ -295,7 +298,7 @@ export default class GitRepo extends SteveModel {
   get groupByLabel() {
     const name = this.metadata.namespace;
 
-    if ( name ) {
+    if (name) {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.workspace', { name: escapeHtml(name) });
     } else {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInAWorkspace');
@@ -305,7 +308,7 @@ export default class GitRepo extends SteveModel {
   get bundles() {
     const all = this.$getters['all'](FLEET.BUNDLE);
 
-    return all.filter((bundle) => bundle.name.startsWith(`${ this.name }-`) &&
+    return all.filter((bundle) => bundle.repoName === this.name &&
       bundle.namespace === this.namespace &&
       bundle.namespacedName.startsWith(`${ this.namespace }:${ this.name }`));
   }
@@ -324,6 +327,78 @@ export default class GitRepo extends SteveModel {
     return bds.filter((bd) => bd.metadata?.labels?.['fleet.cattle.io/repo-name'] === this.name);
   }
 
+  get resourcesStatuses() {
+    const clusters = this.targetClusters || [];
+    const resources = this.status?.resources || [];
+    const conditions = this.status?.conditions || [];
+
+    const out = [];
+
+    for (const c of clusters) {
+      const clusterBundleDeploymentResources = this.bundleDeployments
+        .find((bd) => bd.metadata?.labels?.[FLEET_ANNOTATIONS.CLUSTER] === c.metadata.name)
+        ?.status?.resources || [];
+
+      resources.forEach((r, i) => {
+        let namespacedName = r.name;
+
+        if (r.namespace) {
+          namespacedName = `${ r.namespace }:${ r.name }`;
+        }
+
+        let state = r.state;
+        const perEntry = r.perClusterState?.find((x) => x.clusterId === c.id);
+        const tooMany = r.perClusterState?.length >= 10 || false;
+
+        if (perEntry) {
+          state = perEntry.state;
+        } else if (tooMany) {
+          state = STATES_ENUM.UNKNOWN;
+        } else {
+          state = STATES_ENUM.READY;
+        }
+
+        const color = colorForState(state).replace('text-', 'bg-');
+        const display = stateDisplay(state);
+
+        const detailLocation = {
+          name:   `c-cluster-product-resource${ r.namespace ? '-namespace' : '' }-id`,
+          params: {
+            product:   NAME,
+            cluster:   c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME],
+            resource:  r.type,
+            namespace: r.namespace,
+            id:        r.name,
+          }
+        };
+
+        out.push({
+          key:                    `${ r.id }-${ c.id }-${ r.type }-${ r.namespace }-${ r.name }`,
+          tableKey:               `${ r.id }-${ c.id }-${ r.type }-${ r.namespace }-${ r.name }-${ randomStr(8) }`,
+          kind:                   r.kind,
+          apiVersion:             r.apiVersion,
+          type:                   r.type,
+          id:                     r.id,
+          namespace:              r.namespace,
+          name:                   r.name,
+          clusterId:              c.id,
+          clusterName:            c.nameDisplay,
+          state,
+          stateBackground:        color,
+          stateDisplay:           display,
+          stateSort:              stateSort(color, display),
+          namespacedName,
+          detailLocation,
+          conditions:             conditions[i],
+          bundleDeploymentStatus: clusterBundleDeploymentResources?.[i],
+          creationTimestamp:      clusterBundleDeploymentResources?.[i]?.createdAt
+        });
+      });
+    }
+
+    return out;
+  }
+
   get clustersList() {
     return this.$getters['all'](FLEET.CLUSTER);
   }