@rancher/shell 0.2.4 → 0.3.0

package/models/management.cattle.io.user.js

@@ -123,7 +123,7 @@ export default class User extends HybridModel {
 
   async refreshGroupMembership() {
     const user = await this.$dispatch('rancher/find', {
-      type:       NORMAN.USER,
+      type: NORMAN.USER,
       id:   this.id,
     }, { root: true });
 
@@ -158,9 +158,9 @@ export default class User extends HybridModel {
         weight:     1
       },
       {
-        action:     'refreshGroupMembership',
-        label:      this.t('authGroups.actions.refresh'),
-        icon:       'icon icon-refresh',
+        action:  'refreshGroupMembership',
+        label:   this.t('authGroups.actions.refresh'),
+        icon:    'icon icon-refresh',
         enabled: this.canRefreshAccess
       },
       { divider: true },

package/models/monitoring.coreos.com.alertmanagerconfig.js

@@ -102,9 +102,9 @@ export default class AlertmanagerConfig extends SteveModel {
         alertmanagerconfigid: this.id
       },
       query: {
-        mode:         queryMode || _VIEW,
+        mode:        queryMode || _VIEW,
         receiverName,
-        currentView:  _YAML
+        currentView: _YAML
       }
     };
   }
@@ -117,9 +117,9 @@ export default class AlertmanagerConfig extends SteveModel {
         alertmanagerconfigid: this.id
       },
       query: {
-        mode:         queryMode || _VIEW,
+        mode:        queryMode || _VIEW,
         receiverName,
-        currentView:  _CONFIG
+        currentView: _CONFIG
       }
     };
   }

package/models/monitoring.coreos.com.receiver.js

@@ -36,13 +36,13 @@ export const RECEIVERS_TYPES = [
     logo:  require(`~shell/assets/images/vendor/email.svg`)
   },
   {
-    name:         'webhook',
-    label:        'monitoringReceiver.webhook.label',
-    title:        'monitoringReceiver.webhook.title',
-    key:          'webhook_configs',
-    logo:         require(`~shell/assets/images/vendor/webhook.svg`),
-    banner:       'webhook.banner',
-    addButton:    'webhook.add'
+    name:      'webhook',
+    label:     'monitoringReceiver.webhook.label',
+    title:     'monitoringReceiver.webhook.title',
+    key:       'webhook_configs',
+    logo:      require(`~shell/assets/images/vendor/webhook.svg`),
+    banner:    'webhook.banner',
+    addButton: 'webhook.add'
   },
   {
     name:  'custom',

package/models/monitoring.coreos.com.route.js

@@ -150,8 +150,8 @@ export default class Route extends SteveModel {
 
   get receiverLink() {
     return {
-      text:    this.spec.receiver,
-      to:      {
+      text: this.spec.receiver,
+      to:   {
         name:   'c-cluster-product-resource-id',
         params: {
           resource: MONITORING.SPOOFED.RECEIVER, product: MONITORING_PRODUCT, id: this.spec.receiver

package/models/namespace.js

@@ -210,4 +210,17 @@ export default class Namespace extends SteveModel {
   set resourceQuota(value) {
     Vue.set(this.metadata.annotations, RESOURCE_QUOTA, JSON.stringify(value));
   }
+
+  // Preserve the project label - ensures we preserve project when cloning a namespace
+  cleanForNew() {
+    const project = this.metadata?.labels?.[PROJECT];
+
+    super.cleanForNew();
+
+    if (project) {
+      this.metadata = this.metadata || {};
+      this.metadata.labels = this.metadata.labels || {};
+      this.metadata.labels[PROJECT] = project;
+    }
+  }
 }

package/models/persistentvolumeclaim.js

@@ -40,10 +40,10 @@ export default class PVC extends SteveModel {
     // Add backwards, each one to the top
     insertAt(out, 0, { divider: true });
     insertAt(out, 0, {
-      action:     'goToEditVolumeSize',
-      enabled:    this.expandable && this.bound,
-      icon:       'icon icon-fw icon-plus',
-      label:      this.t('persistentVolumeClaim.expand.label'),
+      action:  'goToEditVolumeSize',
+      enabled: this.expandable && this.bound,
+      icon:    'icon icon-fw icon-plus',
+      label:   this.t('persistentVolumeClaim.expand.label'),
     });
 
     return out;

package/models/pod.js

@@ -28,21 +28,21 @@ export default class Pod extends WorkloadService {
 
   get openShellMenuItem() {
     return {
-      action:     'openShell',
-      enabled:    !!this.links.view && this.isRunning,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      'Execute Shell',
-      total:      1,
+      action:  'openShell',
+      enabled: !!this.links.view && this.isRunning,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   'Execute Shell',
+      total:   1,
     };
   }
 
   get openLogsMenuItem() {
     return {
-      action:     'openLogs',
-      enabled:    !!this.links.view,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      'View Logs',
-      total:      1,
+      action:  'openLogs',
+      enabled: !!this.links.view,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   'View Logs',
+      total:   1,
     };
   }
 

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

@@ -104,10 +104,10 @@ export default class ProvCluster extends SteveModel {
       // Note: Actions are not supported in the Steve API, so we check
       // available actions for RKE1 clusters, but not RKE2 clusters.
       {
-        action:     'openShell',
-        label:      this.$rootGetters['i18n/t']('nav.shell'),
-        icon:       'icon icon-terminal',
-        enabled:    !!this.mgmt?.links.shell && ready,
+        action:  'openShell',
+        label:   this.$rootGetters['i18n/t']('nav.shell'),
+        icon:    'icon icon-terminal',
+        enabled: !!this.mgmt?.links.shell && ready,
       }, {
         action:     'downloadKubeConfig',
         bulkAction: 'downloadKubeConfigBulk',
@@ -116,11 +116,11 @@ export default class ProvCluster extends SteveModel {
         bulkable:   true,
         enabled:    this.mgmt?.hasAction('generateKubeconfig') && ready,
       }, {
-        action:     'copyKubeConfig',
-        label:      this.t('cluster.copyConfig'),
-        bulkable:   false,
-        enabled:    this.mgmt?.hasAction('generateKubeconfig') && ready,
-        icon:       'icon icon-copy',
+        action:   'copyKubeConfig',
+        label:    this.t('cluster.copyConfig'),
+        bulkable: false,
+        enabled:  this.mgmt?.hasAction('generateKubeconfig') && ready,
+        icon:     'icon icon-copy',
       }, {
         action:     'snapshotAction',
         label:      this.$rootGetters['i18n/t']('nav.takeSnapshot'),
@@ -129,25 +129,25 @@ export default class ProvCluster extends SteveModel {
         bulkable:   true,
         enabled:    canSnapshot,
       }, {
-        action:     'restoreSnapshotAction',
-        label:      this.$rootGetters['i18n/t']('nav.restoreSnapshot'),
-        icon:       'icon icon-fw icon-backup-restore',
-        enabled:    canSnapshot,
+        action:  'restoreSnapshotAction',
+        label:   this.$rootGetters['i18n/t']('nav.restoreSnapshot'),
+        icon:    'icon icon-fw icon-backup-restore',
+        enabled: canSnapshot,
       }, {
-        action:     'rotateCertificates',
-        label:      this.$rootGetters['i18n/t']('nav.rotateCertificates'),
-        icon:       'icon icon-backup',
-        enabled:    canEditRKE2cluster || (this.mgmt?.hasAction('rotateCertificates') && ready),
+        action:  'rotateCertificates',
+        label:   this.$rootGetters['i18n/t']('nav.rotateCertificates'),
+        icon:    'icon icon-backup',
+        enabled: canEditRKE2cluster || (this.mgmt?.hasAction('rotateCertificates') && ready),
       }, {
-        action:     'rotateEncryptionKey',
-        label:      this.$rootGetters['i18n/t']('nav.rotateEncryptionKeys'),
-        icon:       'icon icon-refresh',
-        enabled:    canEditRKE2cluster || (this.isRke1 && this.mgmt?.hasAction('rotateEncryptionKey') && ready)
+        action:  'rotateEncryptionKey',
+        label:   this.$rootGetters['i18n/t']('nav.rotateEncryptionKeys'),
+        icon:    'icon icon-refresh',
+        enabled: canEditRKE2cluster || (this.isRke1 && this.mgmt?.hasAction('rotateEncryptionKey') && ready)
       }, {
-        action:     'saveAsRKETemplate',
-        label:      this.$rootGetters['i18n/t']('nav.saveAsRKETemplate'),
-        icon:       'icon icon-folder',
-        enabled:    canSaveRKETemplate,
+        action:  'saveAsRKETemplate',
+        label:   this.$rootGetters['i18n/t']('nav.saveAsRKETemplate'),
+        icon:    'icon icon-folder',
+        enabled: canSaveRKETemplate,
       }, { divider: true }];
 
     return actions.concat(out);
@@ -552,8 +552,8 @@ export default class ProvCluster extends SteveModel {
   takeSnapshot() {
     if ( this.isRke1 ) {
       return this.$dispatch('rancher/request', {
-        url:           `/v3/clusters/${ escape(this.mgmt.id) }?action=backupEtcd`,
-        method:        'post',
+        url:    `/v3/clusters/${ escape(this.mgmt.id) }?action=backupEtcd`,
+        method: 'post',
       }, { root: true });
     } else {
       const now = this.spec?.rkeConfig?.etcdSnapshotCreate?.generation || 0;
@@ -757,8 +757,8 @@ export default class ProvCluster extends SteveModel {
           }, { root: true });
 
           await this.$dispatch('management/request', {
-            url:                  `/k8s/clusters/${ harvesterClusterId }/v1/harvester/serviceaccounts/${ poolConfig.vmNamespace }/${ this.metadata.name }`,
-            method:               'DELETE',
+            url:    `/k8s/clusters/${ harvesterClusterId }/v1/harvester/serviceaccounts/${ poolConfig.vmNamespace }/${ this.metadata.name }`,
+            method: 'DELETE',
           }, { root: true });
         } catch (e) {
           console.error(e); // eslint-disable-line no-console

package/models/rbac.authorization.k8s.io.role.js

@@ -14,10 +14,10 @@ export default class Role extends SteveModel {
         type:           'string',
       },
       {
-        path:           'rules',
-        validators:     [`roleTemplateRules:${ this.type }`],
-        nullable:       false,
-        type:           'array',
+        path:       'rules',
+        validators: [`roleTemplateRules:${ this.type }`],
+        nullable:   false,
+        type:       'array',
       },
     ];
   }

package/models/rke.cattle.io.etcdsnapshot.js

@@ -12,10 +12,10 @@ export default class EtcdBackup extends NormanModel {
    */
   get _availableActions() {
     return [{
-      action:     'promptRestore',
-      enabled:    true,
-      icon:       'icon icon-fw icon-backup-restore',
-      label:      'Restore'
+      action:  'promptRestore',
+      enabled: true,
+      icon:    'icon icon-fw icon-backup-restore',
+      label:   'Restore'
     }];
   }
 

package/models/service.js

@@ -58,25 +58,25 @@ export default class extends SteveModel {
         type:           'dnsLabel',
       },
       {
-        nullable:       false,
-        path:           'spec',
-        required:       true,
-        type:           'array',
-        validators:     ['servicePort'],
+        nullable:   false,
+        path:       'spec',
+        required:   true,
+        type:       'array',
+        validators: ['servicePort'],
       },
       {
-        nullable:       true,
-        path:           'spec',
-        required:       true,
-        type:           'string',
-        validators:     ['clusterIp'],
+        nullable:   true,
+        path:       'spec',
+        required:   true,
+        type:       'string',
+        validators: ['clusterIp'],
       },
       {
-        nullable:       true,
-        path:           'spec',
-        required:       true,
-        type:           'array',
-        validators:     ['externalName'],
+        nullable:   true,
+        path:       'spec',
+        required:   true,
+        type:       'array',
+        validators: ['externalName'],
       },
     ];
   }

package/models/storage.k8s.io.storageclass.js

@@ -115,17 +115,17 @@ export default class extends SteveModel {
 
     if (this.isDefault) {
       out.unshift({
-        action:     'resetDefault',
-        enabled:    true,
-        icon:       'icon icon-fw icon-checkmark',
-        label:      this.t('storageClass.actions.resetDefault'),
+        action:  'resetDefault',
+        enabled: true,
+        icon:    'icon icon-fw icon-checkmark',
+        label:   this.t('storageClass.actions.resetDefault'),
       });
     } else {
       out.unshift({
-        action:     'setDefault',
-        enabled:    true,
-        icon:       'icon icon-fw icon-checkmark',
-        label:      this.t('storageClass.actions.setAsDefault'),
+        action:  'setDefault',
+        enabled: true,
+        icon:    'icon icon-fw icon-checkmark',
+        label:   this.t('storageClass.actions.setAsDefault'),
       });
     }
 

package/models/workload.js

@@ -32,11 +32,11 @@ export default class Workload extends WorkloadService {
       });
 
       insertAt(out, 0, {
-        action:     'redeploy',
-        label:      this.t('action.redeploy'),
-        icon:       'icon icon-refresh',
-        enabled:    !!this.links.update,
-        bulkable:   true,
+        action:   'redeploy',
+        label:    this.t('action.redeploy'),
+        icon:     'icon icon-refresh',
+        enabled:  !!this.links.update,
+        bulkable: true,
       });
 
       insertAt(out, 0, {
@@ -57,11 +57,11 @@ export default class Workload extends WorkloadService {
     insertAt(out, 0, { divider: true }) ;
 
     insertAt(out, 0, {
-      action:     'openShell',
-      enabled:    !!this.links.view,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      this.t('action.openShell'),
-      total:      1,
+      action:  'openShell',
+      enabled: !!this.links.view,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   this.t('action.openShell'),
+      total:   1,
     });
 
     const toFilter = ['cloneYaml'];
@@ -221,17 +221,17 @@ export default class Workload extends WorkloadService {
         type:           'subDomain',
       },
       {
-        nullable:       false,
-        path:           'spec',
-        required:       true,
-        type:           'object',
-        validators:     ['containerImages'],
+        nullable:   false,
+        path:       'spec',
+        required:   true,
+        type:       'object',
+        validators: ['containerImages'],
       },
       {
-        nullable:       true,
-        path:           `${ podSpecPath }.affinity`,
-        type:           'object',
-        validators:     ['podAffinity'],
+        nullable:   true,
+        path:       `${ podSpecPath }.affinity`,
+        type:       'object',
+        validators: ['podAffinity'],
       }
     ];
 
@@ -311,22 +311,22 @@ export default class Workload extends WorkloadService {
     const type = this._type ? this._type : this.type;
 
     const detailItem = {
-      endpoint:  {
+      endpoint: {
         label:     'Endpoints',
         content:   this.endpoint,
         formatter: 'WorkloadDetailEndpoints'
       },
-      ready:     {
-        label:     'Ready',
-        content:   this.ready
+      ready: {
+        label:   'Ready',
+        content: this.ready
       },
-      upToDate:  {
-        label:     'Up-to-date',
-        content:   this.upToDate
+      upToDate: {
+        label:   'Up-to-date',
+        content: this.upToDate
       },
       available: {
-        label:     'Available',
-        content:   this.available
+        label:   'Available',
+        content: this.available
       }
     };
 

package/nuxt.config.js

@@ -38,7 +38,7 @@ const perfTest = (process.env.PERF_TEST === 'true'); // Enable performance testi
 // 1 = Skip browser check
 // 2 = Do not skip any checks
 const skipEsLintCheckStr = (process.env.SKIP_ESLINT || '');
-const skipEsLintCheck = parseInt(skipEsLintCheckStr, 10) || 2;
+let skipEsLintCheck = parseInt(skipEsLintCheckStr, 10) || 2;
 
 // ===============================================================================================
 // Nuxt configuration
@@ -55,6 +55,21 @@ export default function(dir, _appConfig) {
   let COMPONENTS_DIR = path.join(SHELL_ABS, 'rancher-components');
   let typescript = {};
 
+  if (fs.existsSync(SHELL_ABS)) {
+    const stat = fs.lstatSync(SHELL_ABS);
+
+    // If @rancher/shell is a symlink, then use the components folder for it
+    if (stat.isSymbolicLink()) {
+      const REAL_SHELL_ABS = fs.realpathSync(SHELL_ABS); // In case the shell is being linked via 'yarn link'
+
+      COMPONENTS_DIR = path.join(REAL_SHELL_ABS, '..', 'pkg', 'rancher-components', 'src', 'components');
+
+      // For now, skip eslint check when being linked via yarn link - pkg folder is linked otherwise
+      // This will change when we remove nuxt
+      skipEsLintCheck = true;
+    }
+  }
+
   // If we have a local folder named 'shell' then use that rather than the one in node_modules
   // This will be the case in the main dashboard repository.
   if (fs.existsSync(path.join(dir, 'shell'))) {
@@ -324,9 +339,9 @@ export default function(dir, _appConfig) {
 
     // Axios: https://axios.nuxtjs.org/options
     axios: {
-      https:          true,
-      proxy:          true,
-      retry:          { retries: 0 },
+      https: true,
+      proxy: true,
+      retry: { retries: 0 },
       // debug:   true
     },
 
@@ -356,12 +371,12 @@ export default function(dir, _appConfig) {
     ],
 
     dir: {
-      assets:     path.join(SHELL, 'assets'),
-      layouts:    path.join(SHELL, 'layouts'),
-      middleware: path.join(SHELL, 'middleware'),
-      pages:      path.join(SHELL, 'pages'),
-      static:     path.join(SHELL, 'static'),
-      store:      path.join(SHELL, 'store'),
+      assets:     path.posix.join(SHELL, 'assets'),
+      layouts:    path.posix.join(SHELL, 'layouts'),
+      middleware: path.posix.join(SHELL, 'middleware'),
+      pages:      path.posix.join(SHELL, 'pages'),
+      static:     path.posix.join(SHELL, 'static'),
+      store:      path.posix.join(SHELL, 'store'),
     },
 
     watchers: { webpack: { ignore: watcherIgnores } },
@@ -456,7 +471,7 @@ export default function(dir, _appConfig) {
 
         // And substitute our own loader for images
         config.module.rules.unshift({
-          test:    /\.(png|jpe?g|gif|svg|webp)$/,
+          test: /\.(png|jpe?g|gif|svg|webp)$/,
           use:  [
             {
               loader:  'url-loader',
@@ -496,7 +511,7 @@ export default function(dir, _appConfig) {
 
         // Prevent warning in log with the md files in the content folder
         config.module.rules.push({
-          test:    /\.md$/,
+          test: /\.md$/,
           use:  [
             {
               loader:  'frontmatter-markdown-loader',
@@ -515,9 +530,9 @@ export default function(dir, _appConfig) {
               require.resolve('@nuxt/babel-preset-app'),
               {
                 // buildTarget: isServer ? 'server' : 'client',
-                corejs:      { version: 3 },
-                targets:     isServer ? { node: '12' } : { browsers: ['last 2 versions'] },
-                modern:      !isServer
+                corejs:  { version: 3 },
+                targets: isServer ? { node: '12' } : { browsers: ['last 2 versions'] },
+                modern:  !isServer
               }
             ],
             '@babel/preset-typescript',
@@ -638,8 +653,8 @@ export default function(dir, _appConfig) {
         key:  fs.readFileSync(path.resolve(dir, SHELL, 'server/server.key')),
         cert: fs.readFileSync(path.resolve(dir, SHELL, 'server/server.crt'))
       } : null),
-      port:      (devPorts ? 8005 : 80),
-      host:      '0.0.0.0',
+      port: (devPorts ? 8005 : 80),
+      host: '0.0.0.0',
     },
 
     // Server middleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -113,7 +113,7 @@
     "nyc": "15.1.0",
     "papaparse": "5.3.0",
     "portal-vue": "2.1.7",
-    "rancher-icons": "rancher/icons#v2.0.8",
+    "rancher-icons": "rancher/icons#v2.0.9",
     "require-extension-hooks": "0.3.3",
     "require-extension-hooks-babel": "1.0.0",
     "require-extension-hooks-vue": "3.0.0",

package/pages/about.vue

@@ -20,7 +20,7 @@ export default {
       SETTING
     };
   },
-  computed:   {
+  computed: {
     rancherVersion() {
       return this.settings.find(s => s.id === SETTING.VERSION_RANCHER);
     },

package/pages/account/index.vue

@@ -43,7 +43,7 @@ export default {
       canChangePassword: false
     };
   },
-  computed:   {
+  computed: {
     ...mapGetters({ t: 'i18n/t' }),
 
     apiKeyheaders() {