@rancher/shell 0.2.4 → 0.3.0

package/list/fleet.cattle.io.gitrepo.vue

@@ -10,7 +10,7 @@ export default {
     FleetRepos,
     Masthead,
   },
-  mixins:     [ResourceFetch],
+  mixins: [ResourceFetch],
   props:  {
     schema: {
       type:     Object,

package/list/group.principal.vue

@@ -49,11 +49,11 @@ export default {
   },
   data() {
     return {
-      rows:                        [],
-      canCreateGlobalRoleBinding:  false,
-      canRefreshAccess:            false,
-      assignLocation:              {
-        path:   `/c/${ BLANK_CLUSTER }/${ NAME }/${ NORMAN.SPOOFED.GROUP_PRINCIPAL }/assign-edit`,
+      rows:                       [],
+      canCreateGlobalRoleBinding: false,
+      canRefreshAccess:           false,
+      assignLocation:             {
+        path:  `/c/${ BLANK_CLUSTER }/${ NAME }/${ NORMAN.SPOOFED.GROUP_PRINCIPAL }/assign-edit`,
         query: { [MODE]: _EDIT }
       },
       initialLoad: true,
@@ -87,9 +87,9 @@ export default {
     async refreshGroupMemberships(buttonDone) {
       try {
         await this.$store.dispatch('rancher/request', {
-          url:           '/v3/users?action=refreshauthprovideraccess',
-          method:        'post',
-          data:          { },
+          url:    '/v3/users?action=refreshauthprovideraccess',
+          method: 'post',
+          data:   { },
         });
 
         await this.updateGroupPrincipals(true);

package/list/harvesterhci.io.management.cluster.vue

@@ -18,7 +18,7 @@ export default {
     Loading
   },
 
-  props:      {
+  props: {
     schema: {
       type:     Object,
       required: true,

package/list/helm.cattle.io.projecthelmchart.vue

@@ -77,7 +77,7 @@ export default {
       :show-incremental-loading-indicator="incrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
-      is-creatable
+      :is-creatable="canCreateProjectHelmChart"
     />
     <Banner
       color="info"

package/list/management.cattle.io.feature.vue

@@ -17,7 +17,7 @@ export default {
     ResourceTable,
     LabeledInput
   },
-  mixins:     [ResourceFetch],
+  mixins: [ResourceFetch],
   props:  {
     resource: {
       type:     String,

package/list/node.vue

@@ -120,7 +120,7 @@ export default {
 
   },
 
-  methods:  {
+  methods: {
     async loadMetrics() {
       const schema = this.$store.getters['cluster/schemaFor'](METRIC.NODE);
 

package/list/provisioning.cattle.io.cluster.vue

@@ -77,9 +77,9 @@ export default {
 
   data() {
     return {
-      resource:        CAPI.RANCHER_CLUSTER,
-      schema:          this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
-      mgmtClusters:    [],
+      resource:     CAPI.RANCHER_CLUSTER,
+      schema:       this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
+      mgmtClusters: [],
     };
   },
 

package/machine-config/amazonec2.vue

@@ -30,7 +30,7 @@ export default {
     },
 
     cluster: {
-      type:     Object,
+      type:    Object,
       default: () => ({})
     },
 

package/machine-config/harvester.vue

@@ -101,10 +101,10 @@ export default {
 
       if (clusterId && isImportCluster) {
         const res = await allHashSettled({
-          namespaces:   this.$store.dispatch('cluster/request', { url: `${ url }/${ NAMESPACE }s` }),
-          images:       this.$store.dispatch('cluster/request', { url: `${ url }/${ HCI.IMAGE }s` }),
-          configMaps:   this.$store.dispatch('cluster/request', { url: `${ url }/${ CONFIG_MAP }s` }),
-          networks:     this.$store.dispatch('cluster/request', { url: `${ url }/k8s.cni.cncf.io.network-attachment-definitions` }),
+          namespaces: this.$store.dispatch('cluster/request', { url: `${ url }/${ NAMESPACE }s` }),
+          images:     this.$store.dispatch('cluster/request', { url: `${ url }/${ HCI.IMAGE }s` }),
+          configMaps: this.$store.dispatch('cluster/request', { url: `${ url }/${ CONFIG_MAP }s` }),
+          networks:   this.$store.dispatch('cluster/request', { url: `${ url }/k8s.cni.cncf.io.network-attachment-definitions` }),
         });
 
         for (const key of Object.keys(res)) {

package/mixins/__tests__/create-edit-view.test.ts

@@ -7,7 +7,7 @@ describe('createEditView should', () => {
   it('add value', () => {
     const Component = {
       render() {},
-      mixins:    [CreateEditView],
+      mixins: [CreateEditView],
       props:  { value: { id: '123' } }
     };
 

package/mixins/chart.js

@@ -301,9 +301,9 @@ export default {
 
       try {
         this.version = this.$store.getters['catalog/version']({
-          repoType:      this.query.repoType,
-          repoName:      this.query.repoName,
-          chartName:     this.query.chartName,
+          repoType:    this.query.repoType,
+          repoName:    this.query.repoName,
+          chartName:   this.query.chartName,
           versionName: this.query.versionName
         });
       } catch (e) {
@@ -315,9 +315,9 @@ export default {
 
       try {
         this.versionInfo = await this.$store.dispatch('catalog/getVersionInfo', {
-          repoType:      this.query.repoType,
-          repoName:      this.query.repoName,
-          chartName:     this.query.chartName,
+          repoType:    this.query.repoType,
+          repoName:    this.query.repoName,
+          chartName:   this.query.chartName,
           versionName: this.query.versionName
         });
         // Here we set us versionInfo. The returned
@@ -367,8 +367,8 @@ export default {
       return {
         name:   install ? 'c-cluster-apps-charts-install' : 'c-cluster-apps-charts-chart',
         params: {
-          cluster:  this.$route.params.cluster,
-          product:  this.$store.getters['productId'],
+          cluster: this.$route.params.cluster,
+          product: this.$store.getters['productId'],
         },
         query: {
           [REPO_TYPE]: provider.repoType,
@@ -383,9 +383,9 @@ export default {
       return this.existing?.detailLocation || {
         name:   `c-cluster-product-resource`,
         params: {
-          product:   this.$store.getters['productId'],
-          cluster:   this.$store.getters['clusterId'],
-          resource:  CATALOG.APP,
+          product:  this.$store.getters['productId'],
+          cluster:  this.$store.getters['clusterId'],
+          resource: CATALOG.APP,
         }
       };
     },
@@ -394,9 +394,9 @@ export default {
       return {
         name:   `c-cluster-explorer-tools`,
         params: {
-          product:   EXPLORER,
-          cluster:   this.$store.getters['clusterId'],
-          resource:  CATALOG.APP,
+          product:  EXPLORER,
+          cluster:  this.$store.getters['clusterId'],
+          resource: CATALOG.APP,
         }
       };
     },

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

@@ -6,17 +6,17 @@ export default {
 
   props: {
     mode: {
-      type:     String,
+      type:    String,
       default: _EDIT,
     },
 
     realMode: {
-      type:     String,
+      type:    String,
       default: _EDIT,
     },
 
     as: {
-      type:     String,
+      type:    String,
       default: _YAML,
     },
 
@@ -28,13 +28,13 @@ export default {
 
     // A clone of the model before it's been changed, for conflict resolution
     initialValue: {
-      type:     Object,
+      type:    Object,
       default: null,
     },
 
     // The 'live' equivalent of this model in the store
     liveValue: {
-      type:     Object,
+      type:    Object,
       default: null,
     },
 

package/mixins/form-validation.js

@@ -146,7 +146,7 @@ export default {
 
           return {
             ...ruleset,
-            rules:               ruleset.rules.map(rule => formRules[rule] || nullValidator),
+            rules:              ruleset.rules.map(rule => formRules[rule] || nullValidator),
             formValidationRule: true
           };
         }),

package/mixins/labeled-form-element.ts

@@ -18,17 +18,17 @@ export default Vue.extend({
     },
 
     label: {
-      type:     String,
+      type:    String,
       default: null
     },
 
     labelKey: {
-      type:     String,
+      type:    String,
       default: null
     },
 
     placeholderKey: {
-      type:     String,
+      type:    String,
       default: null
     },
 
@@ -43,7 +43,7 @@ export default Vue.extend({
     },
 
     tooltipKey: {
-      type:     String,
+      type:    String,
       default: null
     },
 
@@ -68,8 +68,8 @@ export default Vue.extend({
     },
 
     options: {
-      default:   null,
-      type:      Array
+      default: null,
+      type:    Array
     },
 
     searchable: {

package/mixins/resource-fetch.js

@@ -27,7 +27,7 @@ export default {
       counts:                     {},
       multipleResources:          [],
       // manual refresh vars
-      hasManualRefresh:            false,
+      hasManualRefresh:           false,
       watch:                      true,
       isTooManyItemsToAutoUpdate: false,
       force:                      false,
@@ -61,7 +61,7 @@ export default {
       return this.rows.length ? false : this.$fetchState.pending;
     },
   },
-  watch:    {
+  watch: {
     refreshFlag(neu) {
       // this is where the data assignment will trigger the update of the list view...
       if (this.init && neu) {
@@ -69,7 +69,7 @@ export default {
       }
     }
   },
-  methods:  {
+  methods: {
     $fetchType(type, multipleResources = []) {
       const inStore = this.$store.getters['currentStore'](COUNT);
 

package/mixins/resource-manager.js

@@ -6,7 +6,7 @@ export default {
   data() {
     return { isLoadingSecondaryResources: false };
   },
-  methods:  {
+  methods: {
     /**
     *
     * Function resourceManagerFetchSecondaryResources

package/models/autoscaling.horizontalpodautoscaler.js

@@ -17,19 +17,19 @@ export default class HPA extends SteveModel {
     const { spec = {}, status } = this;
     const out = [
       {
-        label:     spec?.scaleTargetRef?.kind ?? this.t('hpa.tabs.workload'),
-        content:   spec?.scaleTargetRef?.name,
+        label:   spec?.scaleTargetRef?.kind ?? this.t('hpa.tabs.workload'),
+        content: spec?.scaleTargetRef?.name,
       },
       {
-        label:     this.t('hpa.workloadTab.min'),
+        label:   this.t('hpa.workloadTab.min'),
         content: spec?.minReplicas,
       },
       {
-        label:     this.t('hpa.workloadTab.max'),
+        label:   this.t('hpa.workloadTab.max'),
         content: spec?.maxReplicas,
       },
       {
-        label:     this.t('hpa.workloadTab.current'),
+        label:   this.t('hpa.workloadTab.current'),
         content: status?.currentReplicas ?? 0,
       },
       {

package/models/batch.cronjob.js

@@ -20,27 +20,27 @@ export default class CronJob extends Workload {
     const canRunNow = !!jobSchema?.collectionMethods.find(x => ['blocked-post', 'post'].includes(x.toLowerCase()));
 
     insertAt(out, 0, {
-      action:     'runNow',
-      label:      this.t('action.runNow'),
-      icon:       'icon icon-spinner',
-      enabled:    canRunNow,
-      bulkable:   true,
+      action:   'runNow',
+      label:    this.t('action.runNow'),
+      icon:     'icon icon-spinner',
+      enabled:  canRunNow,
+      bulkable: true,
     });
 
     insertAt(out, 1, {
-      action:     'suspend',
-      label:      this.t('action.suspend'),
-      icon:       'icon icon-pause',
-      enabled:    !suspended && this.canUpdate,
-      bulkable:   true,
+      action:   'suspend',
+      label:    this.t('action.suspend'),
+      icon:     'icon icon-pause',
+      enabled:  !suspended && this.canUpdate,
+      bulkable: true,
     });
 
     insertAt(out, 2, {
-      action:     'resume',
-      label:      this.t('action.resume'),
-      icon:       'icon icon-play',
-      enabled:    suspended && this.canUpdate,
-      bulkable:   true,
+      action:   'resume',
+      label:    this.t('action.resume'),
+      icon:     'icon icon-play',
+      enabled:  suspended && this.canUpdate,
+      bulkable: true,
     });
 
     return out;

package/models/batch.job.js

@@ -1,4 +1,26 @@
 import Workload from './workload';
+import { getSecondsDiff } from '@shell/utils/time';
 
 export default class Job extends Workload {
+  get duration() {
+    const schema = this.$getters['schemaFor'](this.type);
+    const rowValueGetter = this.$rootGetters['type-map/rowValueGetter'];
+
+    if (schema && rowValueGetter) {
+      const value = rowValueGetter(schema, 'Duration')(this);
+      const { completionTime, startTime } = this.status;
+      let seconds = 0;
+
+      if (value && startTime) {
+        seconds = getSecondsDiff(startTime, completionTime || new Date());
+      }
+
+      return {
+        value,
+        seconds,
+      };
+    }
+
+    return {};
+  }
 }

package/models/catalog.cattle.io.app.js

@@ -28,10 +28,10 @@ export default class CatalogApp extends SteveModel {
     const out = super._availableActions;
 
     const upgrade = {
-      action:     'goToUpgrade',
-      enabled:    true,
-      icon:       'icon icon-fw icon-edit',
-      label:      this.t('catalog.install.action.goToUpgrade'),
+      action:  'goToUpgrade',
+      enabled: true,
+      icon:    'icon icon-fw icon-edit',
+      label:   this.t('catalog.install.action.goToUpgrade'),
     };
 
     out.unshift(upgrade);
@@ -173,8 +173,8 @@ export default class CatalogApp extends SteveModel {
     this.currentRouter().push({
       name:   'c-cluster-apps-charts-install',
       params: {
-        product:   this.$rootGetters['productId'],
-        cluster:   this.$rootGetters['clusterId'],
+        product: this.$rootGetters['productId'],
+        cluster: this.$rootGetters['clusterId'],
       },
       query,
     });

package/models/catalog.cattle.io.clusterrepo.js

@@ -19,11 +19,11 @@ export default class ClusterRepo extends SteveModel {
     insertAt(out, 0, { divider: true });
 
     insertAt(out, 0, {
-      action:     'refresh',
-      label:      this.t('action.refresh'),
-      icon:       'icon icon-refresh',
-      enabled:    !!this.links.update,
-      bulkable:   true,
+      action:   'refresh',
+      label:    this.t('action.refresh'),
+      icon:     'icon icon-refresh',
+      enabled:  !!this.links.update,
+      bulkable: true,
     });
 
     return out;
@@ -127,8 +127,8 @@ export default class ClusterRepo extends SteveModel {
   get details() {
     return [
       {
-        label:     'Type',
-        content:   this.typeDisplay,
+        label:   'Type',
+        content: this.typeDisplay,
       },
       {
         label:         'Downloaded',

package/models/catalog.cattle.io.operation.js

@@ -15,11 +15,11 @@ export default class CatalogOperation extends SteveModel {
     }
 
     const openLogs = {
-      action:     'openLogs',
-      enabled:    true,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      this.t('action.openLogs'),
-      total:      1,
+      action:  'openLogs',
+      enabled: true,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   this.t('action.openLogs'),
+      total:   1,
     };
 
     insertAt(out, idx + 1, openLogs);

package/models/chart.js

@@ -20,10 +20,10 @@ export default class Chart extends SteveModel {
     }
 
     const out = {
-      [REPO_TYPE]:  this.repoType,
-      [REPO]:       this.repoName,
-      [CHART]:      this.chartName,
-      [VERSION]:    version,
+      [REPO_TYPE]: this.repoType,
+      [REPO]:      this.repoName,
+      [CHART]:     this.chartName,
+      [VERSION]:   version,
     };
 
     if ( from ) {

package/models/cis.cattle.io.clusterscan.js

@@ -22,19 +22,19 @@ export default class ClusterScan extends SteveModel {
     const t = this.$rootGetters['i18n/t'];
 
     const downloadReport = {
-      action:     'downloadLatestReport',
-      enabled:    this.hasReport,
-      icon:       'icon icon-fw icon-download',
-      label:      t('cis.downloadReport'),
-      total:      1,
+      action:  'downloadLatestReport',
+      enabled: this.hasReport,
+      icon:    'icon icon-fw icon-download',
+      label:   t('cis.downloadReport'),
+      total:   1,
     };
 
     const downloadAllReports = {
-      action:     'downloadAllReports',
-      enabled:    this.hasReport,
-      icon:       'icon icon-fw icon-download',
-      label:      t('cis.downloadAllReports'),
-      total:      1,
+      action:  'downloadAllReports',
+      enabled: this.hasReport,
+      icon:    'icon icon-fw icon-download',
+      label:   t('cis.downloadAllReports'),
+      total:   1,
     };
 
     if (this.hasReports) {

package/models/cluster/node.js

@@ -14,26 +14,26 @@ export default class ClusterNode extends SteveModel {
     const normanAction = this.norman?.actions || {};
 
     const cordon = {
-      action:     'cordon',
-      enabled:    !!normanAction.cordon,
-      icon:       'icon icon-fw icon-pause',
-      label:      'Cordon',
-      total:      1,
-      bulkable:   true
+      action:   'cordon',
+      enabled:  !!normanAction.cordon,
+      icon:     'icon icon-fw icon-pause',
+      label:    'Cordon',
+      total:    1,
+      bulkable: true
     };
 
     const uncordon = {
-      action:     'uncordon',
-      enabled:    !!normanAction.uncordon,
-      icon:       'icon icon-fw icon-play',
-      label:      'Uncordon',
-      total:      1,
-      bulkable:   true
+      action:   'uncordon',
+      enabled:  !!normanAction.uncordon,
+      icon:     'icon icon-fw icon-play',
+      label:    'Uncordon',
+      total:    1,
+      bulkable: true
     };
 
     const drain = {
       action:     'drain',
-      enabled:     !!normanAction.drain,
+      enabled:    !!normanAction.drain,
       icon:       'icon icon-fw icon-dot-open',
       label:      this.t('drainNode.action'),
       bulkable:   true,
@@ -41,25 +41,25 @@ export default class ClusterNode extends SteveModel {
     };
 
     const stopDrain = {
-      action:     'stopDrain',
-      enabled:    !!normanAction.stopDrain,
-      icon:       'icon icon-fw icon-x',
-      label:      this.t('drainNode.actionStop'),
-      bulkable:   true,
+      action:   'stopDrain',
+      enabled:  !!normanAction.stopDrain,
+      icon:     'icon icon-fw icon-x',
+      label:    this.t('drainNode.actionStop'),
+      bulkable: true,
     };
 
     const openSsh = {
-      action:     'openSsh',
-      enabled:    !!this.provisionedMachine?.links?.shell,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      'SSH Shell',
+      action:  'openSsh',
+      enabled: !!this.provisionedMachine?.links?.shell,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   'SSH Shell',
     };
 
     const downloadKeys = {
-      action:     'downloadKeys',
-      enabled:    !!this.provisionedMachine?.links?.sshkeys,
-      icon:       'icon icon-fw icon-download',
-      label:      this.t('node.actions.downloadSSHKey'),
+      action:  'downloadKeys',
+      enabled: !!this.provisionedMachine?.links?.sshkeys,
+      icon:    'icon icon-fw icon-download',
+      label:   this.t('node.actions.downloadSSHKey'),
     };
 
     return [
@@ -336,12 +336,12 @@ export default class ClusterNode extends SteveModel {
   get details() {
     const details = [
       {
-        label:    this.t('node.detail.detailTop.version'),
-        content:  this.version
+        label:   this.t('node.detail.detailTop.version'),
+        content: this.version
       },
       {
-        label:    this.t('node.detail.detailTop.os'),
-        content:  this.status.nodeInfo.osImage
+        label:   this.t('node.detail.detailTop.os'),
+        content: this.status.nodeInfo.osImage
       },
       {
         label:         this.t('node.detail.detailTop.containerRuntime'),
@@ -352,17 +352,17 @@ export default class ClusterNode extends SteveModel {
 
     if (this.internalIp) {
       details.unshift({
-        label:         this.t('node.detail.detailTop.internalIP'),
-        formatter:     'CopyToClipboard',
-        content:       this.internalIp
+        label:     this.t('node.detail.detailTop.internalIP'),
+        formatter: 'CopyToClipboard',
+        content:   this.internalIp
       });
     }
 
     if (this.externalIp) {
       details.unshift({
-        label:         this.t('node.detail.detailTop.externalIP'),
-        formatter:     'CopyToClipboard',
-        content:       this.externalIp
+        label:     this.t('node.detail.detailTop.externalIP'),
+        formatter: 'CopyToClipboard',
+        content:   this.externalIp
       });
     }