@rancher/shell 3.0.8-rc.8 → 3.0.8

package/edit/constraints.gatekeeper.sh.constraint/index.vue

@@ -278,6 +278,7 @@ export default {
       <Tabbed
         :side-tabs="true"
         :use-hash="useTabbedHash"
+        :default-tab="defaultTab"
         @changed="onTabChanged"
       >
         <Tab

package/edit/fleet.cattle.io.helmop.vue

@@ -80,6 +80,7 @@ export default {
         type:        CONFIG_MAP
       }
     }, this.$store);
+    this.currentUser = await this.value.getCurrentUser();
   },
 
   data() {
@@ -237,11 +238,11 @@ export default {
     },
 
     downstreamSecretsList() {
-      return (this.value.spec.helm.downstreamResources || []).filter((r) => r.kind === 'Secret').map((r) => r.name);
+      return (this.value.spec.downstreamResources || []).filter((r) => r.kind === 'Secret').map((r) => r.name);
     },
 
     downstreamConfigMapsList() {
-      return (this.value.spec.helm.downstreamResources || []).filter((r) => r.kind === 'ConfigMap').map((r) => r.name);
+      return (this.value.spec.downstreamResources || []).filter((r) => r.kind === 'ConfigMap').map((r) => r.name);
     },
   },
 
@@ -405,6 +406,10 @@ export default {
 
     updateBeforeSave() {
       this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
+
+      if (this.mode === _CREATE) {
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = this.currentUser.id;
+      }
     },
 
     durationSeconds(value) {
@@ -446,14 +451,14 @@ export default {
     updateDownstreamResources(kind, list) {
       switch (kind) {
       case 'Secret':
-        this.value.spec.helm.downstreamResources = [
-          ...(this.value.spec.helm.downstreamResources || []).filter((r) => r.kind !== 'Secret'),
+        this.value.spec.downstreamResources = [
+          ...(this.value.spec.downstreamResources || []).filter((r) => r.kind !== 'Secret'),
           ...(list || []).map((name) => ({ name, kind: 'Secret' })),
         ];
         break;
       case 'ConfigMap':
-        this.value.spec.helm.downstreamResources = [
-          ...(this.value.spec.helm.downstreamResources || []).filter((r) => r.kind !== 'ConfigMap'),
+        this.value.spec.downstreamResources = [
+          ...(this.value.spec.downstreamResources || []).filter((r) => r.kind !== 'ConfigMap'),
           ...(list || []).map((name) => ({ name, kind: 'ConfigMap' })),
         ];
         break;

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

@@ -143,6 +143,7 @@ export default {
           ref="tabs"
           :side-tabs="true"
           :use-hash="useTabbedHash"
+          :default-tab="defaultTab"
         >
           <Questions
             v-model:value="value.spec.values"

package/edit/k8s.cni.cncf.io.networkattachmentdefinition.vue

@@ -74,6 +74,7 @@ export default {
       class="mt-15"
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         name="basics"

package/edit/logging-flow/index.vue

@@ -405,6 +405,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
       @changed="tabChanged($event)"
     >
       <Tab

package/edit/logging.banzaicloud.io.output/index.vue

@@ -212,6 +212,7 @@ export default {
         ref="tabbed"
         :side-tabs="true"
         :use-hash="useTabbedHash"
+        :default-tab="defaultTab"
         @changed="tabChanged($event)"
       >
         <Tab

package/edit/management.cattle.io.fleetworkspace.vue

@@ -199,7 +199,7 @@ export default {
 
     <Tabbed
       :side-tabs="true"
-      default-tab="members"
+      :default-tab="defaultTab || 'members'"
       :use-hash="useTabbedHash"
     >
       <!-- <Tab name="members" label-key="generic.members" :weight="2">

package/edit/management.cattle.io.project.vue

@@ -198,6 +198,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         v-if="canViewMembers"

package/edit/monitoring.coreos.com.alertmanagerconfig/index.vue

@@ -204,7 +204,10 @@ export default {
       @input="$emit('input', $event)"
     />
 
-    <Tabbed :use-hash="useTabbedHash">
+    <Tabbed
+      :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
+    >
       <Tab
         :label="t('monitoring.route.label')"
         :weight="1"

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -313,8 +313,9 @@ export default {
     <Tabbed
       ref="tabbed"
       :side-tabs="true"
-      default-tab="overview"
+      :default-tab="defaultTab || 'overview'"
       :use-hash="useTabbedHash"
+
       @changed="tabChanged"
     >
       <Tab

package/edit/monitoring.coreos.com.prometheusrule/index.vue

@@ -155,6 +155,7 @@ export default {
         :side-tabs="true"
         :show-tabs-add-remove="mode !== 'view'"
         :use-hash="useTabbedHash"
+        :default-tab="defaultTab"
         @addTab="addRuleGroup"
         @removeTab="removeGroupRule"
       >

package/edit/monitoring.coreos.com.receiver/index.vue

@@ -218,8 +218,9 @@ export default {
     <Tabbed
       ref="tabbed"
       :side-tabs="true"
-      default-tab="overview"
+      :default-tab="defaultTab || 'overview'"
       :use-hash="useTabbedHash"
+
       @changed="tabChanged"
     >
       <Tab

package/edit/monitoring.coreos.com.route.vue

@@ -102,7 +102,7 @@ export default {
     <Tabbed
       ref="tabbed"
       :side-tabs="true"
-      default-tab="overview"
+      :default-tab="defaultTab || 'overview'"
       :use-hash="useTabbedHash"
     >
       <Tab

package/edit/namespace.vue

@@ -203,6 +203,7 @@ export default {
       :mode="mode"
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
       @update:value="$emit('input', $event)"
     >
       <Tab

package/edit/networking.istio.io.destinationrule/index.vue

@@ -69,6 +69,7 @@ export default {
       <Tabbed
         :side-tabs="true"
         :use-hash="useTabbedHash"
+        :default-tab="defaultTab"
       >
         <Tab
           name="subsets"

package/edit/networking.k8s.io.ingress/index.vue

@@ -229,6 +229,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         :label="firstTabLabel"

package/edit/networking.k8s.io.networkpolicy/PolicyRules.vue

@@ -59,6 +59,7 @@ export default {
           :side-tabs="true"
           :show-tabs-add-remove="mode !== 'view'"
           :use-hash="useTabbedHash"
+          :default-tab="defaultTab"
           @addTab="addPolicyRule"
           @removeTab="removePolicyRule"
         >

package/edit/networking.k8s.io.networkpolicy/index.vue

@@ -178,6 +178,7 @@ export default {
         <Tabbed
           :side-tabs="true"
           :use-hash="useTabbedHash"
+          :default-tab="defaultTab"
         >
           <Tab
             name="ingress"

package/edit/node.vue

@@ -51,6 +51,7 @@ export default {
       :value="value"
       :mode="mode"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
       @update:value="$emit('input', $event)"
     >
       <Tab

package/edit/persistentvolume/index.vue

@@ -22,6 +22,8 @@ import InfoBox from '@shell/components/InfoBox';
 import { mapFeature, UNSUPPORTED_STORAGE_DRIVERS } from '@shell/store/features';
 import ResourceManager from '@shell/mixins/resource-manager';
 
+const DEFAULT_ACCESS_MODES = ['ReadWriteOnce'];
+
 export default {
   name:         'PersistentVolume',
   inheritAttrs: false,
@@ -64,36 +66,42 @@ export default {
   },
 
   data() {
-    const NONE_OPTION = {
-      label: this.t('generic.none'),
-      value: ''
+    return {
+      secondaryResourceData: this.secondaryResourceDataConfig(),
+      storageClassOptions:   [],
+      currentClaim:          null,
+      plugin:                '',
+      initialNodeAffinity:   null,
+      NODE,
     };
-    const defaultAccessModes = ['ReadWriteOnce'];
+  },
 
+  created() {
     this.value['spec'] = this.value.spec || {};
-    this.value.spec['accessModes'] = this.value.spec.accessModes || defaultAccessModes;
+    this.value.spec['accessModes'] = this.value.spec.accessModes || DEFAULT_ACCESS_MODES;
     this.value.spec['capacity'] = this.value.spec.capacity || {};
     this.value.spec.capacity['storage'] = this.value.spec.capacity.storage || '10Gi';
-    this.value.spec['storageClassName'] = this.value.spec.storageClassName || NONE_OPTION.value;
+    this.value.spec['storageClassName'] = this.value.spec.storageClassName || this.noneOption.value;
 
     const foundPlugin = this.value.isLonghorn ? LONGHORN_PLUGIN : VOLUME_PLUGINS.find((plugin) => this.value.spec[plugin.value]);
-    const plugin = (foundPlugin || VOLUME_PLUGINS[0]).value;
 
-    return {
-      secondaryResourceData: this.secondaryResourceDataConfig(),
-      storageClassOptions:   [],
-      currentClaim:          null,
-      plugin,
-      NONE_OPTION,
-      NODE,
-      initialNodeAffinity:   clone(this.value.spec.nodeAffinity),
-    };
+    this.plugin = (foundPlugin || VOLUME_PLUGINS[0]).value;
+    this.initialNodeAffinity = clone(this.value.spec.nodeAffinity);
+
+    this.registerBeforeHook(this.willSave, 'willSave');
   },
 
   computed: {
     showUnsupportedStorage: mapFeature(UNSUPPORTED_STORAGE_DRIVERS),
     ...mapGetters(['currentProduct', 'currentCluster']),
 
+    noneOption() {
+      return {
+        label: this.t('generic.none'),
+        value: ''
+      };
+    },
+
     readWriteOnce: {
       get() {
         return this.value.spec.accessModes.includes('ReadWriteOnce');
@@ -149,10 +157,6 @@ export default {
     }
   },
 
-  created() {
-    this.registerBeforeHook(this.willSave, 'willSave');
-  },
-
   methods: {
     secondaryResourceDataConfig() {
       return {
@@ -168,7 +172,7 @@ export default {
                     value: s.metadata.name
                   }));
 
-                  storageClassOptions.unshift(this.NONE_OPTION);
+                  storageClassOptions.unshift(this.noneOption);
 
                   return storageClassOptions;
                 }
@@ -194,7 +198,7 @@ export default {
       return require(`./plugins/${ name }`).default;
     },
     willSave() {
-      if (this.value.spec.storageClassName === this.NONE_OPTION.value) {
+      if (this.value.spec.storageClassName === this.noneOption.value) {
         this.value.spec['storageClassName'] = null;
       }
 
@@ -280,6 +284,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         name="plugin-configuration"

package/edit/persistentvolume/plugins/awsElasticBlockStore.vue

@@ -14,25 +14,24 @@ export default {
       required: true,
     },
   },
-  data() {
+  created() {
     this.value.spec['awsElasticBlockStore'] = this.value.spec.awsElasticBlockStore || {};
     this.value.spec.awsElasticBlockStore['readOnly'] = this.value.spec.awsElasticBlockStore.readOnly || false;
     this.value.spec.awsElasticBlockStore['partition'] = this.value.spec.awsElasticBlockStore.partition || 0;
-
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
-    return { readOnlyOptions };
   },
   computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    },
     partition: {
       get() {
         return this.value.spec.awsElasticBlockStore.partition;

package/edit/persistentvolume/plugins/azureDisk.vue

@@ -14,57 +14,58 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
-    const kindOptions = [
-      {
-        label: this.t('persistentVolume.azureDisk.kind.dedicated'),
-        value: 'Dedicated'
-      },
-      {
-        label: this.t('persistentVolume.azureDisk.kind.managed'),
-        value: 'Managed'
-      },
-      {
-        label: this.t('persistentVolume.azureDisk.kind.shared'),
-        value: 'Shared'
-      }
-    ];
-
-    const cachingModeOptions = [
-      {
-        label: this.t('persistentVolume.azureDisk.cachingMode.none'),
-        value: 'None'
-      },
-      {
-        label: this.t('persistentVolume.azureDisk.cachingMode.readOnly'),
-        value: 'ReadOnly'
-      },
-      {
-        label: this.t('persistentVolume.azureDisk.cachingMode.readWrite'),
-        value: 'ReadWrite'
-      }
-    ];
-
+  created() {
     this.value.spec['azureDisk'] = this.value.spec.azureDisk || {};
     this.value.spec.azureDisk['readOnly'] = this.value.spec.azureDisk.readOnly || false;
-    this.value.spec.azureDisk['cachingMode'] = this.value.spec.azureDisk.cachingMode || cachingModeOptions[0].value;
-    this.value.spec.azureDisk['kind'] = this.value.spec.azureDisk.kind || kindOptions[2].value;
-
-    return {
-      kindOptions, readOnlyOptions, cachingModeOptions
-    };
+    this.value.spec.azureDisk['cachingMode'] = this.value.spec.azureDisk.cachingMode || this.cachingModeOptions[0].value;
+    this.value.spec.azureDisk['kind'] = this.value.spec.azureDisk.kind || this.kindOptions[2].value;
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    },
+    kindOptions() {
+      return [
+        {
+          label: this.t('persistentVolume.azureDisk.kind.dedicated'),
+          value: 'Dedicated'
+        },
+        {
+          label: this.t('persistentVolume.azureDisk.kind.managed'),
+          value: 'Managed'
+        },
+        {
+          label: this.t('persistentVolume.azureDisk.kind.shared'),
+          value: 'Shared'
+        }
+      ];
+    },
+    cachingModeOptions() {
+      return [
+        {
+          label: this.t('persistentVolume.azureDisk.cachingMode.none'),
+          value: 'None'
+        },
+        {
+          label: this.t('persistentVolume.azureDisk.cachingMode.readOnly'),
+          value: 'ReadOnly'
+        },
+        {
+          label: this.t('persistentVolume.azureDisk.cachingMode.readWrite'),
+          value: 'ReadWrite'
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/azureFile.vue

@@ -14,23 +14,24 @@ export default {
       required: true,
     },
   },
-  data() {
+  created() {
     this.value.spec['azureFile'] = this.value.spec.azureFile || {};
     this.value.spec.azureFile['readOnly'] = this.value.spec.azureFile.readOnly || false;
-
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/cephfs.vue

@@ -17,24 +17,25 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['cephfs'] = this.value.spec.cephfs || {};
     this.value.spec.cephfs['readOnly'] = this.value.spec.cephfs.readOnly || false;
     this.value.spec.cephfs['secretRef'] = this.value.spec.cephfs.secretRef || {};
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/cinder.vue

@@ -14,24 +14,25 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['cinder'] = this.value.spec.cinder || {};
     this.value.spec.cinder['readOnly'] = this.value.spec.cinder.readOnly || false;
     this.value.spec.cinder['secretRef'] = this.value.spec.cinder.secretRef || {};
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/csi.vue

@@ -36,32 +36,34 @@ export default {
   },
 
   data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
+    return {
+      loadingDrivers: true,
+      csiDrivers:     [],
+    };
+  },
 
+  created() {
     this.value.spec['csi'] = this.value.spec.csi || {};
     this.value.spec.csi['readOnly'] = this.value.spec.csi.readOnly || false;
     this.value.spec.csi['nodePublishSecretRef'] = this.value.spec.csi.nodePublishSecretRef || {};
     this.value.spec.csi['nodeStageSecretRef'] = this.value.spec.csi.nodeStageSecretRef || {};
     this.value.spec.csi['controllerExpandSecretRef'] = this.value.spec.csi.controllerExpandSecretRef || {};
     this.value.spec.csi['controllerPublishSecretRef'] = this.value.spec.csi.controllerPublishSecretRef || {};
-
-    return {
-      readOnlyOptions,
-      loadingDrivers: true,
-      csiDrivers:     [],
-    };
   },
 
   computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    },
     driverOptions() {
       return this.csiDrivers.map((driver) => {
         return driver.metadata.name;