@rancher/shell 0.5.2 → 1.2.0

package/models/pod.js

@@ -3,7 +3,6 @@ import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/reso
 import { NODE, WORKLOAD_TYPES } from '@shell/config/types';
 import { escapeHtml, shortenedImage } from '@shell/utils/string';
 import WorkloadService from '@shell/models/workload.service';
-import { deleteProperty } from '@shell/utils/object';
 
 export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.DEPLOYMENT]:             1,
@@ -257,23 +256,4 @@ export default class Pod extends WorkloadService {
       return Promise.reject(e);
     });
   }
-
-  cleanForSave(data) {
-    const val = super.cleanForSave(data);
-
-    // remove fields from containers
-    val.spec?.containers?.forEach((container) => {
-      this.cleanContainerForSave(container);
-    });
-
-    // remove fields from initContainers
-    val.spec?.initContainers?.forEach((container) => {
-      this.cleanContainerForSave(container);
-    });
-
-    // This is probably added by generic workload components that shouldn't be added to pods
-    deleteProperty(val, 'spec.selector');
-
-    return val;
-  }
 }

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

@@ -1,5 +1,5 @@
 import {
-  CAPI, MANAGEMENT, NAMESPACE, NORMAN, SNAPSHOT, HCI, LOCAL_CLUSTER
+  CAPI, MANAGEMENT, NORMAN, SNAPSHOT, HCI
 } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { findBy } from '@shell/utils/array';
@@ -180,16 +180,6 @@ export default class ProvCluster extends SteveModel {
     return out;
   }
 
-  async findNormanCluster() {
-    const name = this.status?.clusterName;
-
-    if ( !name ) {
-      return null;
-    }
-
-    return await this.$dispatch('rancher/find', { type: NORMAN.CLUSTER, id: name }, { root: true });
-  }
-
   explore() {
     const location = {
       name:   'c-cluster',
@@ -249,24 +239,10 @@ export default class ProvCluster extends SteveModel {
     return providers.includes(this.provisioner);
   }
 
-  get isLocal() {
-    return this.mgmt?.isLocal;
-  }
-
   get isImported() {
     // As of Rancher v2.6.7, this returns false for imported K3s clusters,
     // in which this.provisioner is `k3s`.
-
-    const isImportedProvisioner = this.provisioner === 'imported';
-    const isImportedSpecialCases = this.mgmt?.providerForEmberParam === 'import' ||
-      // when imported cluster is GKE
-      !!this.mgmt?.spec?.gkeConfig?.imported ||
-      // or AKS
-      !!this.mgmt?.spec?.aksConfig?.imported ||
-      // or EKS
-      !!this.mgmt?.spec?.eksConfig?.imported;
-
-    return !this.isLocal && (isImportedProvisioner || (!this.isRke2 && !this.mgmt?.machineProvider && isImportedSpecialCases));
+    return this.provisioner === 'imported';
   }
 
   get isCustom() {
@@ -286,6 +262,8 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isImportedK3s() {
+    // As of Rancher v2.6.7, this returns false for imported K3s clusters,
+    // in which this.provisioner is `k3s`.
     return this.isImported && this.isK3s;
   }
 
@@ -294,7 +272,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isK3s() {
-    return this.mgmt?.status ? this.mgmt?.status.provider === 'k3s' : (this.spec?.kubernetesVersion || '').includes('k3s') ;
+    return this.mgmt?.status?.provider === 'k3s';
   }
 
   get isRke2() {
@@ -302,7 +280,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isRke1() {
-    return !!this.mgmt?.spec?.rancherKubernetesEngineConfig || this.labels['provider.cattle.io'] === 'rke';
+    return !!this.mgmt?.spec?.rancherKubernetesEngineConfig;
   }
 
   get isHarvester() {
@@ -837,11 +815,11 @@ export default class ProvCluster extends SteveModel {
   get agentConfig() {
     // The one we want is the first one with no selector.
     // If there are multiple with no selector, that will fall under the unsupported message below.
-    return this.spec.rkeConfig.machineSelectorConfig.find((x) => !x.machineLabelSelector)?.config;
+    return this.spec.rkeConfig.machineSelectorConfig.find((x) => !x.machineLabelSelector).config;
   }
 
   get cloudProvider() {
-    return this.agentConfig?.['cloud-provider-name'];
+    return this.agentConfig['cloud-provider-name'];
   }
 
   get canClone() {
@@ -893,29 +871,4 @@ export default class ProvCluster extends SteveModel {
   get hasError() {
     return this.status?.conditions?.some((condition) => condition.error === true);
   }
-
-  get namespaceLocation() {
-    const localCluster = this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, LOCAL_CLUSTER);
-
-    if (localCluster) {
-      return {
-        name:   'c-cluster-product-resource-id',
-        params: {
-          cluster:  localCluster.id,
-          product:  this.$rootGetters['productId'],
-          resource: NAMESPACE,
-          id:       this.namespace
-        }
-      };
-    }
-
-    return null;
-  }
-
-  // JSON Paths that should be folded in the YAML editor by default
-  get yamlFolding() {
-    return [
-      'spec.rkeConfig.machinePools.dynamicSchemaSpec',
-    ];
-  }
 }

package/models/secret.js

@@ -6,9 +6,6 @@ import { SERVICE_ACCOUNT } from '@shell/config/types';
 import { set } from '@shell/utils/object';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
-import { diffFrom } from '@shell/utils/time';
-import day from 'dayjs';
 
 export const TYPES = {
   OPAQUE:           'Opaque',
@@ -26,12 +23,7 @@ export const TYPES = {
   RKE_AUTH_CONFIG:  'rke.cattle.io/auth-config'
 };
 
-/** Class a cert as expiring if in eight days */
-const certExpiringPeriod = 1000 * 60 * 60 * 24 * 8;
-
 export default class Secret extends SteveModel {
-  _cachedCertInfo;
-
   get hasSensitiveData() {
     return true;
   }
@@ -54,7 +46,7 @@ export default class Secret extends SteveModel {
     if (annotations[CERTMANAGER.ISSUER]) {
       return annotations[CERTMANAGER.ISSUER];
     } else if (this.isCertificate) {
-      return this.cachedCertInfo?.issuer;
+      return this.certInfo?.issuer;
     } else {
       return null;
     }
@@ -62,7 +54,7 @@ export default class Secret extends SteveModel {
 
   get notAfter() {
     if (this.isCertificate) {
-      return this.cachedCertInfo?.notAfter;
+      return this.certInfo?.notAfter;
     } else {
       return null;
     }
@@ -70,7 +62,7 @@ export default class Secret extends SteveModel {
 
   get cn() {
     if (this.isCertificate) {
-      return this.cachedCertInfo?.cn;
+      return this.certInfo?.cn;
     }
 
     return null;
@@ -88,13 +80,14 @@ export default class Secret extends SteveModel {
   // use text-warning' or 'text-error' if cert is expiring within 8 days or is expired
   get dateClass() {
     if (this.isCertificate) {
-      switch (this.certState) {
-      case STATES_ENUM.EXPIRING:
+      const eightDays = 691200000;
+
+      if (this.timeTilExpiration > eightDays ) {
+        return '';
+      } else if (this.timeTilExpiration > 0) {
         return 'text-warning';
-      case STATES_ENUM.EXPIRED:
+      } else {
         return 'text-error';
-      default:
-        return '';
       }
     }
 
@@ -255,7 +248,7 @@ export default class Secret extends SteveModel {
   // parse TLS certs and return issuer, notAfter, cn, sans
   get certInfo() {
     const pem = base64Decode(this.data['tls.crt']);
-    let issuer, notBefore, notAfter, cn, sans, x;
+    let issuer, notAfter, cn, sans, x;
     const END_MARKER = '-----END CERTIFICATE-----';
 
     if (pem) {
@@ -273,7 +266,6 @@ export default class Secret extends SteveModel {
         const issuerString = x.getIssuerString();
 
         issuer = issuerString.slice(issuerString.indexOf('CN=') + 3);
-        notBefore = r.zulutodate(x.getNotBefore());
         notAfter = r.zulutodate(x.getNotAfter());
 
         const cnString = x.getSubjectString();
@@ -289,39 +281,25 @@ export default class Secret extends SteveModel {
         sans = [];
       }
 
-      const certInfo = {
-        issuer, notBefore, notAfter, cn, sans
+      return {
+        issuer, notAfter, cn, sans
       };
-
-      return certInfo;
     }
 
     return null;
   }
 
-  get cachedCertInfo() {
-    if (!this._cachedCertInfo) {
-      this._cachedCertInfo = this.certInfo;
-    }
-
-    return this._cachedCertInfo;
-  }
-
   // use for + n more name display
   get unrepeatedSans() {
     if (this._type === TYPES.TLS ) {
-      const certInfo = this.cachedCertInfo;
-
-      if (certInfo?.sans?.filter) {
-        const commonBases = certInfo?.sans
-          .filter((name) => name.indexOf('*.') === 0 || name.indexOf('www.') === 0)
-          .map((name) => name.substr(name.indexOf('.')));
-        const displaySans = removeObjects(certInfo?.sans, commonBases);
+      if (this.certInfo?.sans?.filter) {
+        const commonBases = this.certInfo?.sans.filter((name) => name.indexOf('*.') === 0 || name.indexOf('www.') === 0).map((name) => name.substr(name.indexOf('.')));
+        const displaySans = removeObjects(this.certInfo?.sans, commonBases);
 
         return displaySans;
       }
 
-      return certInfo?.sans?.array || certInfo?.sans || [];
+      return this.certInfo?.sans || [];
     }
 
     return null;
@@ -329,28 +307,16 @@ export default class Secret extends SteveModel {
 
   get timeTilExpiration() {
     if (this._type === TYPES.TLS) {
-      const certInfo = this.cachedCertInfo;
-
-      if (!certInfo?.notAfter) {
-        return null;
-      }
-
-      const expiration = certInfo.notAfter;
+      const expiration = this.certInfo.notAfter;
       const timeThen = expiration.valueOf();
       const timeNow = Date.now();
 
-      const timeTilExpiration = timeThen - timeNow;
-
-      return timeTilExpiration < 0 ? 0 : timeTilExpiration;
+      return timeThen - timeNow;
     }
 
     return null;
   }
 
-  get timeTilExpirationDate() {
-    return this.timeTilExpiration > 0 ? this.cachedCertInfo?.notAfter?.valueOf() : null;
-  }
-
   get decodedData() {
     const out = {};
 
@@ -391,69 +357,4 @@ export default class Secret extends SteveModel {
       return 'c-cluster-product-resource';
     }
   }
-
-  get certLifetime() {
-    if (this._type === TYPES.TLS) {
-      const certInfo = this.cachedCertInfo;
-
-      if (certInfo) {
-        return diffFrom(day(certInfo.notBefore), day(certInfo.notAfter), (key, args) => this.t(key, args)).string;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Get the model `state` for secrets of type cert
-   */
-  get certState() {
-    if (this._type !== TYPES.TLS) {
-      return undefined;
-    }
-
-    if (typeof this.timeTilExpiration !== 'number' || this.timeTilExpiration > certExpiringPeriod ) {
-      return '';
-    } else if (this.timeTilExpiration > 0) {
-      return STATES_ENUM.EXPIRING;
-    } else {
-      return STATES_ENUM.EXPIRED;
-    }
-  }
-
-  /**
-   * Get the model `state display` for secrets of type cert
-   */
-  get certStateDisplay() {
-    if (this._type !== TYPES.TLS) {
-      return undefined;
-    }
-
-    return stateDisplay(this.certState);
-  }
-
-  /**
-   * Get the model `state background` for secrets of type cert
-   */
-  get certStateBackground() {
-    if (this._type !== TYPES.TLS) {
-      return undefined;
-    }
-
-    const color = colorForState(this.certState);
-
-    return color.replace('text-', 'bg-');
-  }
-
-  cleanForSave(data, forNew) {
-    const val = super.cleanForSave(data, forNew);
-
-    // Secrets on create with _type will return validation error
-    // Secrets on edit without _type will return http error
-    if (forNew) {
-      delete val._type;
-    }
-
-    return val;
-  }
 }

package/models/workload.js

@@ -649,20 +649,4 @@ export default class Workload extends WorkloadService {
 
     return matching(allInNamespace, selector);
   }
-
-  cleanForSave(data) {
-    const val = super.cleanForSave(data);
-
-    // remove fields from containers
-    val.spec?.template?.spec?.containers?.forEach((container) => {
-      this.cleanContainerForSave(container);
-    });
-
-    // remove fields from initContainers
-    val.spec?.template?.spec?.initContainers?.forEach((container) => {
-      this.cleanContainerForSave(container);
-    });
-
-    return val;
-  }
 }

package/models/workload.service.js

@@ -320,22 +320,4 @@ export default class WorkloadService extends SteveModel {
 
     return { toSave, toRemove };
   }
-
-  cleanForSave(data) {
-    const val = super.cleanForSave(data);
-
-    delete val.__active;
-    delete val.type;
-
-    return val;
-  }
-
-  cleanContainerForSave(container) {
-    delete container.__active;
-    delete container.active;
-    delete container._init;
-    delete container.error;
-
-    return container;
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.5.2",
+  "version": "1.2.0",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -41,7 +41,6 @@
     "@nuxtjs/eslint-config-typescript": "6.0.1",
     "@nuxtjs/webpack-profile": "0.1.0",
     "@popperjs/core": "2.4.4",
-    "@types/is-url": "1.2.30",
     "@types/node": "16.4.3",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "@typescript-eslint/parser": "4.33.0",
@@ -116,11 +115,11 @@
     "start-server-and-test": "1.13.1",
     "style-loader": "1.2.1",
     "ts-node": "8.10.2",
-    "typescript": "4.5.5",
+    "typescript": "4.1.6",
     "url-parse": "1.5.10",
     "v-tooltip": "2.0.3",
     "vue": "2.7.14",
-    "clipboard-polyfill": "4.0.1",
+    "vue-clipboard2": "0.3.1",
     "vue-codemirror": "4.0.6",
     "vue-js-modal": "1.3.35",
     "vue-resize": "0.4.5",
@@ -129,16 +128,16 @@
     "vue-shortkey": "3.1.7",
     "vue-template-compiler": "2.7.14",
     "vue-virtual-scroll-list": "^2.3.4",
+    "vue2-transitions": "0.3.0",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.2",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-virtual-modules": "0.4.3",
-    "xterm": "5.2.1",
-    "xterm-addon-canvas": "^0.5.0",
-    "xterm-addon-fit": "0.8.0",
-    "xterm-addon-search": "0.13.0",
-    "xterm-addon-web-links": "0.9.0",
-    "xterm-addon-webgl": "0.16.0",
+    "xterm": "5.0.0",
+    "xterm-addon-fit": "0.6.0",
+    "xterm-addon-search": "0.10.0",
+    "xterm-addon-web-links": "0.7.0",
+    "xterm-addon-webgl": "0.13.0",
     "worker-loader": "3.0.8",
     "yarn": "1.22.18"
   },
@@ -151,8 +150,7 @@
     "qs": ">=6.7.3",
     "nth-check": ">=2.0.1",
     "follow-redirects": ">=1.14.7",
-    "merge": ">=2.1.1",
-    "semver": ">=7.5.2"
+    "merge": ">=2.1.1"
   },
   "nyc": {
     "extension": [

package/pages/about.vue

@@ -9,6 +9,7 @@ import { downloadFile } from '@shell/utils/download';
 import { mapGetters } from 'vuex';
 
 export default {
+  layout:     'plain',
   components: { BackLink, Loading },
   mixins:     [BackRoute],
   async fetch() {

package/pages/account/create-key.vue

@@ -3,6 +3,7 @@ import ResourceDetail from '@shell/components/ResourceDetail';
 
 export default {
   name:       'APIKeyCreate',
+  layout:     'plain',
   components: { ResourceDetail },
 };
 </script>

package/pages/account/index.vue

@@ -15,6 +15,7 @@ import CopyToClipboardText from '@shell/components/CopyToClipboardText';
 const API_ENDPOINT = '/v3';
 
 export default {
+  layout:     'plain',
   components: {
     CopyToClipboardText, BackLink, Banner, PromptChangePassword, Loading, ResourceTable, Principal
   },

package/pages/auth/login.vue

@@ -29,6 +29,7 @@ import loadPlugins from '@shell/plugins/plugin';
 
 export default {
   name:       'Login',
+  layout:     'unauthenticated',
   components: {
     LabeledInput, AsyncButton, Checkbox, BrandImage, Banner, InfoBox, CopyCode, Password, LocaleSelector
   },

package/pages/auth/logout.vue

@@ -1,6 +1,8 @@
 <script>
 
 export default {
+  layout: 'unauthenticated',
+
   async asyncData({ redirect, store, router }) {
     await store.dispatch('auth/logout', null, { root: true });
   }

package/pages/auth/setup.vue

@@ -18,10 +18,6 @@ import Password from '@shell/components/form/Password';
 import { applyProducts } from '@shell/store/type-map';
 import BrandImage from '@shell/components/BrandImage';
 import { waitFor } from '@shell/utils/async';
-import { Banner } from '@components/Banner';
-import FormValidation from '@shell/mixins/form-validation';
-import isUrl from 'is-url';
-import { isLocalhost } from '@shell/utils/validators/setting';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -38,18 +34,13 @@ const calcMustChangePassword = async(store) => {
 };
 
 export default {
-  mixins: [FormValidation],
+  layout: 'unauthenticated',
 
   data() {
     return {
       passwordOptions: [
         { label: this.t('setup.useRandom'), value: true },
         { label: this.t('setup.useManual'), value: false }],
-      fvFormRuleSets: [{
-        path:       'serverUrl',
-        rootObject: this,
-        rules:      ['required', 'https', 'url', 'trailingForwardSlash']
-      }]
     };
   },
 
@@ -87,7 +78,7 @@ export default {
   },
 
   components: {
-    AsyncButton, LabeledInput, CopyToClipboard, Checkbox, RadioGroup, Password, BrandImage, Banner
+    AsyncButton, LabeledInput, CopyToClipboard, Checkbox, RadioGroup, Password, BrandImage
   },
 
   async asyncData({ route, req, store }) {
@@ -144,6 +135,8 @@ export default {
 
     if (serverUrlSetting?.value) {
       serverUrl = serverUrlSetting.value;
+    } else if ( process.server ) {
+      serverUrl = req.headers.host;
     } else {
       serverUrl = window.location.origin;
     }
@@ -198,10 +191,6 @@ export default {
         }
       }
 
-      if (!isUrl(this.serverUrl) || this.fvGetPathErrors(['serverUrl']).length > 0) {
-        return false;
-      }
-
       return true;
     },
 
@@ -209,10 +198,6 @@ export default {
       const out = findBy(this.principals, 'me', true);
 
       return out;
-    },
-
-    showLocalhostWarning() {
-      return isLocalhost(this.serverUrl);
     }
   },
 
@@ -280,10 +265,6 @@ export default {
     done() {
       this.$router.replace('/');
     },
-
-    onServerUrlChange(value) {
-      this.serverUrl = value.trim();
-    },
   },
 };
 </script>
@@ -387,24 +368,10 @@ export default {
                 />
               </p>
               <div class="mt-20">
-                <Banner
-                  v-if="showLocalhostWarning"
-                  color="warning"
-                  :label="t('validation.setting.serverUrl.localhost')"
-                />
-                <Banner
-                  v-for="(err, i) in fvGetPathErrors(['serverUrl'])"
-                  :key="i"
-                  color="error"
-                  :label="err"
-                />
                 <LabeledInput
                   v-model="serverUrl"
                   :label="t('setup.serverUrl.label')"
                   data-testid="setup-server-url"
-                  :rules="fvGetAndReportPathRules('serverUrl')"
-                  :required="true"
-                  @input="onServerUrlChange"
                 />
               </div>
             </template>

package/pages/auth/verify.vue

@@ -17,14 +17,9 @@ function reply(err, code) {
   }
 }
 
-function isSaml($route) {
-  const { query } = $route;
-  const configQuery = get(query, 'config');
-
-  return samlProviders.includes(configQuery);
-}
-
 export default {
+  layout: 'unauthenticated',
+
   async fetch({ store, route, redirect }) {
     const code = route.query[GITHUB_CODE];
     const stateStr = route.query[GITHUB_NONCE];
@@ -48,14 +43,9 @@ export default {
     try {
       parsed = JSON.parse(base64Decode((stateStr)));
     } catch (err) {
-      if (isSaml(route)) {
-        // This is an ok failure. SAML has no state string so a failure is fine (see similar check in mounted).
-        // This whole file could be re-written with that in mind, but this change keeps things simple and fixes a breaking addition
-        return;
-      }
       const out = store.getters['i18n/t'](`login.error`);
 
-      console.error('Failed to parse nonce', stateStr, err); // eslint-disable-line no-console
+      console.error('Failed to parse nonce'); // eslint-disable-line no-console
 
       redirect(`/auth/login?err=${ escape(out) }`);
 
@@ -127,8 +117,12 @@ export default {
         window.close();
       }
     } else {
+      const { query } = this.$route;
+
       if ( window.opener ) {
-        if (isSaml(this.$route)) {
+        const configQuery = get(query, 'config');
+
+        if ( samlProviders.includes(configQuery) ) {
           if ( window.opener.window.onAuthTest ) {
             reply(null, null);
           } else {