@rancher/shell 0.4.0 → 0.5.1

package/pages/c/_cluster/ecm/index.vue

@@ -1,8 +1,6 @@
 <script>
 
 export default {
-  layout: 'plain',
-
   mounted() {
     const link = this.$store.getters['backToRancherLink'];
 

package/pages/c/_cluster/explorer/index.vue

@@ -15,6 +15,7 @@ import {
   WORKLOAD_TYPES,
   COUNT,
   CATALOG,
+  SECRET
 } from '@shell/config/types';
 import { setPromiseResult } from '@shell/utils/promise';
 import AlertTable from '@shell/components/AlertTable';
@@ -42,6 +43,8 @@ import { fetchClusterResources } from './explorer-utils';
 import SimpleBox from '@shell/components/SimpleBox';
 import { ExtensionPoint, CardLocation } from '@shell/core/types';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
+import Certificates from '@shell/components/Certificates';
+import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
 export const RESOURCES = [NAMESPACE, INGRESS, PV, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.STATEFUL_SET, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.DAEMON_SET, SERVICE];
 
@@ -74,6 +77,7 @@ export default {
     ConfigBadge,
     EventsTable,
     SimpleBox,
+    Certificates
   },
 
   mixins: [metricPoller],
@@ -348,8 +352,18 @@ export default {
       return {
         name:   'c-cluster-product-resource',
         params: {
-          product:  'explorer',
-          resource: 'event',
+          product:  EXPLORER,
+          resource: EVENT,
+        }
+      };
+    },
+
+    allSecretsLink() {
+      return {
+        name:   'c-cluster-product-resource',
+        params: {
+          product:  EXPLORER,
+          resource: SECRET,
         }
       };
     }
@@ -581,6 +595,18 @@ export default {
         >
           <AlertTable v-if="selectedTab === 'cluster-alerts'" />
         </Tab>
+        <Tab
+          name="cluster-certs"
+          :label="t('clusterIndexPage.sections.certs.label')"
+          :weight="1"
+        >
+          <span class="events-table-link">
+            <n-link :to="allSecretsLink">
+              <span>{{ t('glance.secretsTable') }}</span>
+            </n-link>
+          </span>
+          <Certificates v-if="selectedTab === 'cluster-certs'" />
+        </Tab>
       </Tabbed>
     </div>
     <Tabbed

package/pages/c/_cluster/fleet/index.vue

@@ -14,7 +14,7 @@ import FleetNoWorkspaces from '@shell/components/fleet/FleetNoWorkspaces.vue';
 import { NAME } from '@shell/config/product/fleet';
 
 export default {
-  name:       'ListGitRepo',
+  name:       'FleetDashboard',
   components: {
     Loading,
     ResourceTable,

package/pages/c/_cluster/index.vue

@@ -2,8 +2,6 @@
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
 export default {
-  layout: 'plain',
-
   middleware({ redirect, route } ) {
     return redirect({
       name:   'c-cluster-product',

package/pages/c/_cluster/settings/banners.vue

@@ -53,8 +53,6 @@ const DEFAULT_BANNER_SETTING = {
 };
 
 export default {
-  layout: 'authenticated',
-
   components: {
     Checkbox,
     Loading,

package/pages/c/_cluster/settings/brand.vue

@@ -20,8 +20,6 @@ import { setFavIcon } from '@shell/utils/favicon';
 const Color = require('color');
 
 export default {
-  layout: 'authenticated',
-
   components: {
     LabeledInput, Checkbox, FileImageSelector, Loading, SimpleBox, AsyncButton, Banner, ColorInput, TypeDescription
   },

package/pages/c/_cluster/settings/index.vue

@@ -3,8 +3,6 @@ import { NAME as SETTINGS } from '@shell/config/product/settings';
 import { MANAGEMENT } from '@shell/config/types';
 
 export default {
-  layout: 'plain',
-
   middleware({ redirect, route, store } ) {
     const hasSettings = !!store.getters[`management/schemaFor`](MANAGEMENT.SETTING);
 

package/pages/c/_cluster/settings/links.vue

@@ -13,7 +13,6 @@ import DefaultLinksEditor from './DefaultLinksEditor';
 import { CUSTOM_LINKS_VERSION, fetchLinks } from '@shell/config/home-links';
 
 export default {
-  layout:     'authenticated',
   components: {
     KeyValue,
     Loading,

package/pages/c/_cluster/settings/performance.vue

@@ -22,7 +22,6 @@ const l10n = {
 };
 
 export default {
-  layout:     'authenticated',
   components: {
     Checkbox,
     Loading,

package/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue

@@ -469,7 +469,8 @@ export default {
             <div class="fields">
               <LabeledSelect
                 v-model="imagePullSecrets"
-                :label="t('workload.container.imagePullSecrets')"
+                :label="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.label')"
+                :tooltip="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.tooltip')"
                 :multiple="true"
                 :taggable="true"
                 :options="imagePullNamespacedSecrets"

package/pages/c/_cluster/uiplugins/CatalogList/index.vue

@@ -7,13 +7,12 @@ import { SERVICE, WORKLOAD_TYPES } from '@shell/config/types';
 import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import { UI_PLUGIN_CATALOG } from '@shell/config/table-headers';
 
-import ActionMenu from '@shell/components/ActionMenu';
 import ResourceTable from '@shell/components/ResourceTable';
 
 export default {
   name: 'CatalogList',
 
-  components: { ActionMenu, ResourceTable },
+  components: { ResourceTable },
 
   mixins: [ResourceManager],
 
@@ -29,10 +28,7 @@ export default {
 
     return {
       actions,
-      catalogHeaders:    UI_PLUGIN_CATALOG,
-      menuTargetElement: null,
-      menuTargetEvent:   null,
-      menuOpen:          false,
+      catalogHeaders: UI_PLUGIN_CATALOG,
     };
   },
 
@@ -49,6 +45,7 @@ export default {
 
     catalogRows() {
       const rows = [];
+      const actions = this.actions;
 
       if ( !isEmpty(this.namespacedDeployments) ) {
         this.namespacedDeployments.forEach((deploy) => {
@@ -57,11 +54,13 @@ export default {
 
           if ( deployName ) {
             const out = {
-              name:    deployName,
-              state:   deploy.metadata?.state?.name,
-              image:   deploy.spec?.template?.spec?.containers[0]?.image,
-              service: null,
-              repo:    null
+              name:                       deployName,
+              state:                      deploy.metadata?.state?.name,
+              image:                      deploy.spec?.template?.spec?.containers[0]?.image,
+              service:                    null,
+              repo:                       null,
+              availableActions:           actions,
+              showCatalogUninstallDialog: () => this.$emit('showCatalogUninstallDialog', out)
             };
             const keys = ['service', 'repo'];
 
@@ -77,20 +76,6 @@ export default {
       return rows;
     }
   },
-
-  methods: {
-    setMenu(event) {
-      this.menuOpen = !!event;
-
-      if (event) {
-        this.menuTargetElement = this.$refs.catalogActions;
-        this.menuTargetEvent = event;
-      } else {
-        this.menuTargetElement = undefined;
-        this.menuTargetEvent = undefined;
-      }
-    }
-  }
 };
 </script>
 
@@ -118,27 +103,6 @@ export default {
             </button>
           </div>
         </template>
-        <template #row-actions="{row}">
-          <button
-            ref="catalogActions"
-            aria-haspopup="true"
-            type="button"
-            class="btn btn-sm role-multi-action actions"
-            data-testid="extensions-page-catalog-row-menu"
-            @click="setMenu"
-          >
-            <i class="icon icon-actions" />
-          </button>
-          <ActionMenu
-            :custom-actions="actions"
-            :open="menuOpen"
-            :use-custom-target-element="true"
-            :custom-target-element="menuTargetElement"
-            :custom-target-event="menuTargetEvent"
-            @close="setMenu(false)"
-            @showCatalogUninstallDialog="e => $emit('showCatalogUninstallDialog', row, e.event)"
-          />
-        </template>
       </ResourceTable>
     </div>
   </div>

package/pages/c/_cluster/uiplugins/index.vue

@@ -93,8 +93,6 @@ export default {
     };
   },
 
-  layout: 'plain',
-
   async fetch() {
     const hash = {};
 

package/pages/diagnostic.vue

@@ -7,8 +7,7 @@ import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/u
 import { sortBy } from '@shell/utils/sort';
 
 export default {
-  name:   'Diagnostic',
-  layout: 'plain',
+  name: 'Diagnostic',
 
   components: { AsyncButton, PromptModal },
 

package/pages/fail-whale.vue

@@ -4,7 +4,6 @@ import { mapGetters, mapState } from 'vuex';
 import { stringify } from '@shell/utils/error';
 
 export default {
-  layout: 'home',
 
   components: { BrandImage },
 

package/pages/prefs.vue

@@ -18,7 +18,6 @@ import { addObject } from '@shell/utils/array';
 import LocaleSelector from '@shell/components/LocaleSelector';
 
 export default {
-  layout:     'plain',
   components: {
     BackLink, ButtonGroup, LabeledSelect, Checkbox, LandingPagePreference, LocaleSelector
   },

package/pages/support/index.vue

@@ -10,7 +10,6 @@ import { isRancherPrime } from '@shell/config/version';
 import { hasCspAdapter } from 'mixins/brand';
 
 export default {
-  layout: 'home',
 
   components: {
     BannerGraphic,
@@ -82,13 +81,8 @@ export default {
     },
 
     serverUrl() {
-      if (process.client) {
-        // Client-side rendered: use the current window location
-        return window.location.origin;
-      }
-
-      // Server-side rendered
-      return this.serverSetting?.value || '';
+      // Client-side rendered: use the current window location
+      return window.location.origin;
     },
 
     supportConfigLink() {

package/pkg/auto-import.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const contextFolders = ['chart', 'cloud-credential', 'content', 'detail', 'edit', 'layouts', 'list', 'machine-config', 'models', 'promptRemove', 'l10n', 'windowComponents', 'dialog', 'formatters', 'login'];
+const contextFolders = ['chart', 'cloud-credential', 'content', 'detail', 'edit', 'list', 'machine-config', 'models', 'promptRemove', 'l10n', 'windowComponents', 'dialog', 'formatters', 'login'];
 const contextMap = contextFolders.reduce((map, obj) => {
   map[obj] = true;
 

package/plugins/axios.js

@@ -1,7 +1,5 @@
 import https from 'https';
 import { CSRF } from '@shell/config/cookies';
-import { parse as setCookieParser } from 'set-cookie-parser';
-import pkg from '../package.json';
 
 export default function({
   $axios, $cookies, isDev, req
@@ -15,42 +13,8 @@ export default function({
     if ( csrf ) {
       config.headers['x-api-csrf'] = csrf;
     }
-
-    if ( process.server ) {
-      config.headers.common['access-control-expose-headers'] = `set-cookie`;
-      config.headers.common['user-agent'] = `Dashboard (Mozilla) v${ pkg.version }`;
-
-      if ( req.headers.cookie ) {
-        config.headers.common['cookies'] = req.headers.cookie;
-      }
-
-      if ( config.url.startsWith('/') ) {
-        config.baseURL = `${ req.protocol || 'https' }://${ req.headers.host }`;
-      }
-    }
   });
 
-  if ( process.server ) {
-    $axios.onResponse((res) => {
-      const parsed = setCookieParser(res.headers['set-cookie'] || []);
-
-      for ( const opt of parsed ) {
-        const key = opt.name;
-        const value = opt.value;
-
-        delete opt.name;
-        delete opt.value;
-
-        opt.encode = (x) => x;
-        opt.sameSite = true;
-        opt.path = '/';
-        opt.secure = true;
-
-        $cookies.set(key, value, opt);
-      }
-    });
-  }
-
   if ( isDev ) {
     // https://github.com/nuxt-community/axios-module/blob/dev/lib/module.js#L78
     // forces localhost to http, for no obvious reason.

package/plugins/back-button.js

@@ -1,5 +1,3 @@
-if ( process.client ) {
-  window.addEventListener('popstate', () => {
-    window._popStateDetected = true;
-  });
-}
+window.addEventListener('popstate', () => {
+  window._popStateDetected = true;
+});

package/plugins/codemirror-loader.js

@@ -1,5 +1,5 @@
 // Share codemirror with plugins
 
-if ( process.client && !window.__codeMirrorLoader ) {
+if ( !window.__codeMirrorLoader ) {
   window.__codeMirrorLoader = () => import(/* webpackChunkName: "codemirror" */ '@shell/plugins/codemirror');
 }

package/plugins/codemirror.js

@@ -125,6 +125,47 @@ CodeMirror.defineExtension('foldLinesMatching', function(regex) {
   });
 });
 
+function countSpaces(line) {
+  for (let i = 0; i < line.length; i++) {
+    if (line[i] !== ' ') {
+      return i;
+    }
+  }
+
+  return line.length;
+}
+
+CodeMirror.defineExtension('foldYaml', function(path) {
+  this.operation(() => {
+    let elements = [];
+
+    for (let i = this.firstLine(), e = this.lastLine(); i <= e; i++) {
+      const line = this.getLine(i);
+      const index = countSpaces(line);
+      const trimmed = line.trim();
+
+      if (trimmed.endsWith(':') || trimmed.endsWith(': >-')) {
+        const name = trimmed.split(':')[0].substr(0, trimmed.length - 1);
+
+        // Remove all elements of the same are greater index
+        elements = elements.filter((e) => e.index < index);
+
+        // Add on this one
+        elements.push({
+          index,
+          name
+        });
+
+        const currentPath = elements.map((e) => e.name).join('.');
+
+        if (currentPath === path) {
+          this.foldCode(CodeMirror.Pos(i, 0), null, 'fold');
+        }
+      }
+    }
+  });
+});
+
 CodeMirror.registerHelper('fold', 'yamlcomments', (cm, start) => {
   if ( !isLineComment(cm, start.line) ) {
     return;

package/plugins/dashboard-store/__tests__/{mutations.spec.ts → mutations.test.ts}

@@ -1,4 +1,4 @@
-import { batchChanges } from '@shell/plugins/dashboard-store/mutations';
+import { batchChanges } from '@shell/plugins/dashboard-store/mutations.js';
 import { POD, WORKLOAD_TYPES } from '@shell/config/types';
 import Resource from '@shell/plugins/dashboard-store/resource-class';
 

package/plugins/dashboard-store/__tests__/resource-class.test.ts

@@ -0,0 +1,49 @@
+import Resource from '@shell/plugins/dashboard-store/resource-class.js';
+import { resourceClassJunkObject } from '@shell/plugins/dashboard-store/__tests__/utils/store-mocks';
+
+describe('class: Resource', () => {
+  describe('given custom resource keys', () => {
+    const customResource = resourceClassJunkObject;
+
+    it('should keep internal keys', () => {
+      const resource = new Resource(customResource, {
+        getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+        dispatch:    jest.fn(),
+        rootGetters: { 'i18n/t': jest.fn() },
+      });
+
+      expect({ ...resource }).toStrictEqual(customResource);
+    });
+
+    describe('method: save', () => {
+      it('should remove all the internal keys', async() => {
+        const dispatch = jest.fn();
+        const resource = new Resource(customResource, {
+          getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+          dispatch,
+          rootGetters: { 'i18n/t': jest.fn() },
+        });
+
+        const expectation = { type: customResource.type };
+
+        await resource.save();
+
+        const opt = {
+          data:    expectation,
+          headers: {
+            accept:         'application/json',
+            'content-type': 'application/json',
+          },
+          method: 'post',
+          url:    undefined,
+        };
+
+        // Data sent should have been cleaned
+        expect(dispatch).toHaveBeenCalledWith('request', { opt, type: customResource.type });
+
+        // Original workload model should remain unchanged
+        expect({ ...resource }).toStrictEqual(customResource);
+      });
+    });
+  });
+});

package/plugins/dashboard-store/__tests__/utils/store-mocks.ts

@@ -0,0 +1,7 @@
+const customType = 'dsaf';
+
+export const resourceClassJunkObject = {
+  type:        customType,
+  __rehydrate: 'whatever',
+  __clone:     'whatever',
+};

package/plugins/dashboard-store/actions.js

@@ -15,7 +15,8 @@ export const _ALL_IF_AUTHED = 'allIfAuthed';
 export const _NONE = 'none';
 
 const SCHEMA_CHECK_RETRIES = 15;
-const SCHEMA_CHECK_RETRY_LOG = 10;
+const HAVE_ALL_CHECK_RETRIES = 15;
+const RETRY_LOG = 10;
 
 export async function handleSpoofedRequest(rootGetters, schemaStore, opt, product) {
   // Handle spoofed types instead of making an actual request
@@ -70,6 +71,10 @@ export async function loadSchemas(ctx, watch = true) {
   return all;
 }
 
+const findAllGetter = (getters, type, opt) => {
+  return opt.namespaced ? getters.matching(type, null, opt.namespaced, { skipSelector: true }) : getters.all(type);
+};
+
 export default {
   request() {
     throw new Error('Not Implemented');
@@ -163,7 +168,7 @@ export default {
         dispatch('watch', args);
       }
 
-      return getters.all(type);
+      return findAllGetter(getters, type, opt);
     }
 
     let load = (opt.load === undefined ? _ALL : opt.load);
@@ -328,7 +333,7 @@ export default {
       dispatch('watch', args);
     }
 
-    const all = getters.all(type);
+    const all = findAllGetter(getters, type, opt);
 
     if (!opt.incremental && opt.hasManualRefresh) {
       dispatch('resource-fetch/updateManualRefreshIsLoading', false, { root: true });
@@ -613,7 +618,7 @@ export default {
       schema = getters['schemaFor'](type);
 
       if (!schema) {
-        if (tries === SCHEMA_CHECK_RETRY_LOG) {
+        if (tries === RETRY_LOG) {
           console.warn(`Schema for ${ type } not available... retrying...`); // eslint-disable-line no-console
         }
         await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -628,6 +633,27 @@ export default {
     }
   },
 
+  async waitForHaveAll({ getters }, { type, throwError = false, attempts = HAVE_ALL_CHECK_RETRIES }) {
+    let tries = attempts;
+    let haveAll = null;
+
+    while (!haveAll && tries > 0) {
+      haveAll = getters['haveAll'](type);
+
+      if (!haveAll) {
+        if (tries === RETRY_LOG) {
+          console.warn(`wait for all of ${ type } continuing...`); // eslint-disable-line no-console
+        }
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        tries--;
+      }
+    }
+
+    if (tries === 0 && throwError) {
+      throw new Error(`Failed to wait for all of ${ type }`);
+    }
+  },
+
   incrementLoadCounter({ commit }, resource) {
     commit('incrementLoadCounter', resource);
   },

package/plugins/dashboard-store/classify.js

@@ -12,24 +12,7 @@ export function classify(ctx, obj, isClone = false) {
 
   const customModel = ctx.getters['classify'](obj);
 
-  const out = new customModel(obj, ctx, (process.server ? ctx.state.config.namespace : null), isClone);
-
-  if ( process.server ) {
-    Object.defineProperty(obj, '__rehydrate', {
-      value:        ctx.state.config.namespace,
-      enumerable:   true,
-      configurable: true
-    });
-
-    if ( isClone ) {
-      Object.defineProperty(obj, '__clone', {
-        value:        true,
-        enumerable:   true,
-        configurable: true,
-        writable:     true
-      });
-    }
-  }
+  const out = new customModel(obj, ctx, null, isClone);
 
   return out;
 }

package/plugins/dashboard-store/getters.js

@@ -64,19 +64,24 @@ export default {
     return state.types[type].list;
   },
 
-  matching: (state, getters, rootState) => (type, selector, namespace) => {
-    let all = getters['all'](type);
+  matching: (state, getters, rootState) => (type, selector, namespace, config = { skipSelector: false }) => {
+    let matching = getters['all'](type);
 
     // Filter first by namespace if one is provided, since this is efficient
-    if (namespace) {
-      all = all.filter((obj) => obj.namespace === namespace);
+    if (namespace && typeof namespace === 'string') {
+      matching = matching.filter((obj) => obj.namespace === namespace);
     }
 
     garbageCollect.gcUpdateLastAccessed({
       state, getters, rootState
     }, type);
 
-    return all.filter((obj) => {
+    // Looks like a falsy selector is a thing, so if we're not interested in filtering by the selector... explicitly avoid it
+    if (config.skipSelector) {
+      return matching;
+    }
+
+    return matching.filter((obj) => {
       return matches(obj, selector);
     });
   },

package/plugins/dashboard-store/index.js

@@ -33,21 +33,9 @@ export default (vuexModule, config, init) => {
   const namespace = config.namespace || '';
 
   return function(store) {
-    // const inst = SteveFactory(namespace, config.baseUrl);
-
     store.registerModule(namespace, vuexModule);
     store.commit(`${ namespace }/applyConfig`, config);
 
-    if ( !process.client ) {
-      return;
-    }
-
-    // store.subscribe(({ type }, state) => {
-    //   if ( type === 'auth/loggedOut' ) {
-    //     store.dispatch(`${ namespace }/unsubscribe`);
-    //   }
-    // });
-
     const module = store._modules.root._children[namespace];
     const fromServer = window.__NUXT__;