@rancher/shell 3.0.0-rc.2 → 3.0.0-rc.4

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -26,6 +26,8 @@ const RESOURCE_METRICS_API_GROUP = 'metrics.k8s.io';
 export default {
   name: 'CruHPA',
 
+  emits: ['input'],
+
   components: {
     HpaScalingRule,
     ArrayListGrouped,
@@ -229,7 +231,7 @@ export default {
           <div class="row">
             <div class="col span-6">
               <LabeledInput
-                v-model.number="value.spec.minReplicas"
+                v-model:value.number="value.spec.minReplicas"
                 :mode="mode"
                 :label="t('hpa.workloadTab.min')"
                 placeholder="1"
@@ -239,7 +241,7 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model.number="value.spec.maxReplicas"
+                v-model:value.number="value.spec.maxReplicas"
                 :mode="mode"
                 :label="t('hpa.workloadTab.max')"
                 placeholder="1"

package/edit/catalog.cattle.io.clusterrepo.vue

@@ -13,6 +13,8 @@ import { MANAGEMENT, NAMESPACE, CLUSTER_REPO_TYPES } from '@shell/config/types';
 export default {
   name: 'CruCatalogRepo',
 
+  emits: ['input'],
+
   components: {
     Footer,
     RadioGroup,

package/edit/cis.cattle.io.clusterscan.vue

@@ -12,7 +12,7 @@ import { allHash } from '@shell/utils/promise';
 import { Checkbox } from '@components/Form/Checkbox';
 import { RadioGroup } from '@components/Form/Radio';
 import { get } from '@shell/utils/object';
-import { _VIEW, _CREATE } from '@shell/config/query-params';
+import { _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
 import { isValidCron } from 'cron-validator';
 import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
 
@@ -39,6 +39,37 @@ export default {
   },
 
   async fetch() {
+    // we need to force-fetch the resource fields, otherwise on page refresh
+    // in the clusterscan edit/create views the "canBeScheduled" won't run properly
+    await this.schema.fetchResourceFields();
+
+    if (this.realMode === _CREATE || this.realMode === _EDIT) {
+      const includeScheduling = this.value.canBeScheduled();
+      const spec = this.value.spec || {};
+
+      spec.scanProfileName = null;
+      if (includeScheduling) {
+        spec.scoreWarning = 'pass';
+        spec.scheduledScanConfig = { scanAlertRule: {}, retentionCount: 3 };
+      }
+
+      this.value.spec = spec;
+    }
+
+    if (!this.value.metadata.name) {
+      this.value.metadata.generateName = 'scan-';
+    }
+    if (!this.value.spec.scheduledScanConfig) {
+      this.value.spec['scheduledScanConfig'] = { scanAlertRule: {} };
+    }
+    if (!this.value.spec.scheduledScanConfig.scanAlertRule) {
+      this.value.spec.scheduledScanConfig['scanAlertRule'] = { };
+    }
+
+    this.isScheduled = !!get(this.value, 'spec.scheduledScanConfig.cronSchedule');
+    this.scheduledScanConfig = this.value.spec.scheduledScanConfig;
+    this.scanAlertRule = this.value.spec.scheduledScanConfig.scanAlertRule;
+
     const hash = await allHash({
       profiles:               this.$store.dispatch('cluster/findAll', { type: CIS.CLUSTER_SCAN_PROFILE }),
       benchmarks:             this.$store.dispatch('cluster/findAll', { type: CIS.BENCHMARK }),
@@ -65,24 +96,13 @@ export default {
   },
 
   data() {
-    if (!this.value.metadata.name) {
-      this.value.metadata.generateName = 'scan-';
-    }
-    if (!this.value.spec.scheduledScanConfig) {
-      this.value.spec['scheduledScanConfig'] = { scanAlertRule: {} };
-    }
-    if (!this.value.spec.scheduledScanConfig.scanAlertRule) {
-      this.value.spec.scheduledScanConfig['scanAlertRule'] = { };
-    }
-    const isScheduled = !!get(this.value, 'spec.scheduledScanConfig.cronSchedule');
-
     return {
       allProfiles:         [],
       defaultConfigMap:    null,
-      scheduledScanConfig: this.value.spec.scheduledScanConfig,
-      scanAlertRule:       this.value.spec.scheduledScanConfig.scanAlertRule,
+      scheduledScanConfig: null,
+      scanAlertRule:       null,
       hasAlertManager:     false,
-      isScheduled
+      isScheduled:         null
     };
   },
 
@@ -245,101 +265,99 @@ export default {
     @finish="saveScan"
     @error="e=>errors = e"
   >
-    <template>
-      <Banner
-        v-if="!validProfiles.length"
-        color="warning"
-        :label="t('cis.noProfiles')"
-      />
-
+    <Banner
+      v-if="!validProfiles.length"
+      color="warning"
+      :label="t('cis.noProfiles')"
+    />
+
+    <div
+      v-else
+      class="row mb-20"
+    >
+      <div class="col span-6">
+        <LabeledSelect
+          v-model:value="value.spec.scanProfileName"
+          :mode="mode"
+          :label="t('cis.profile')"
+          :options="validProfiles"
+        />
+      </div>
       <div
-        v-else
-        class="row mb-20"
+        v-if="canBeScheduled"
+        class="col span-6"
       >
-        <div class="col span-6">
-          <LabeledSelect
-            v-model:value="value.spec.scanProfileName"
-            :mode="mode"
-            :label="t('cis.profile')"
-            :options="validProfiles"
-          />
-        </div>
-        <div
-          v-if="canBeScheduled"
-          class="col span-6"
-        >
-          <span>{{ t('cis.scoreWarning.label') }}</span> <i
-            v-clean-tooltip="t('cis.scoreWarning.protip')"
-            class="icon icon-info"
-          />
+        <span>{{ t('cis.scoreWarning.label') }}</span> <i
+          v-clean-tooltip="t('cis.scoreWarning.protip')"
+          class="icon icon-info"
+        />
+        <RadioGroup
+          v-model:value="value.spec.scoreWarning"
+          :mode="mode"
+          name="scoreWarning"
+          :options="['pass', 'fail']"
+          :labels="[t('cis.scan.pass'), t('cis.scan.fail')]"
+        />
+      </div>
+    </div>
+    <template v-if="canBeScheduled">
+      <h3>{{ t('cis.scheduling.title') }}</h3>
+      <div class="row mb-20">
+        <div class="col">
           <RadioGroup
-            v-model:value="value.spec.scoreWarning"
+            v-model:value="isScheduled"
             :mode="mode"
-            name="scoreWarning"
-            :options="['pass', 'fail']"
-            :labels="[t('cis.scan.pass'), t('cis.scan.fail')]"
+            name="scheduling"
+            :options="[ {value: false, label: t('cis.scheduling.disable')}, {value: true, label: t('cis.scheduling.enable')}]"
           />
         </div>
       </div>
-      <template v-if="canBeScheduled">
-        <h3>Scheduling</h3>
+      <template v-if="isScheduled">
         <div class="row mb-20">
-          <div class="col">
-            <RadioGroup
-              v-model:value="isScheduled"
+          <div class="col span-6">
+            <LabeledInput
+              v-model:value="scheduledScanConfig.cronSchedule"
+              required
               :mode="mode"
-              name="scheduling"
-              :options="[ {value: false, label: t('cis.scheduling.disable')}, {value: true, label: t('cis.scheduling.enable')}]"
+              :label="t('cis.cronSchedule.label')"
+              :placeholder="t('cis.cronSchedule.placeholder')"
+              type="cron"
             />
           </div>
-        </div>
-        <template v-if="isScheduled">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="scheduledScanConfig.cronSchedule"
-                required
-                :mode="mode"
-                :label="t('cis.cronSchedule.label')"
-                :placeholder="t('cis.cronSchedule.placeholder')"
-                type="cron"
-              />
-            </div>
-            <div class="col span-6">
-              <UnitInput
-                v-model.number="scheduledScanConfig.retentionCount"
-                :suffix="t('cis.reports')"
-                type="number"
-                :mode="mode"
-                :label="t('cis.retention')"
-              />
-            </div>
+          <div class="col span-6">
+            <UnitInput
+              v-model.number="scheduledScanConfig.retentionCount"
+              :suffix="t('cis.reports')"
+              type="number"
+              :mode="mode"
+              :label="t('cis.retention')"
+            />
           </div>
-          <h3>
-            Alerting
-          </h3>
-          <div class="row mb-20">
-            <div class="col span-12">
-              <Banner
-                v-if="scanAlertRule.alertOnFailure || scanAlertRule.alertOnComplete"
-                class="mt-0"
-                :color="hasAlertManager ? 'info' : 'warning'"
-              >
-                <span v-clean-html="t('cis.alertNeeded', {link: monitoringUrl}, true)" />
-              </banner>
-              <Checkbox
-                v-model:value="scanAlertRule.alertOnComplete"
-                :mode="mode"
-                :label="t('cis.alertOnComplete')"
-              />
-              <Checkbox
-                v-model:value="scanAlertRule.alertOnFailure"
-                :mode="mode"
-                :label="t('cis.alertOnFailure')"
-              />
-            </div>
+        </div>
+        <h3 class="mt-20">
+          {{ t('cis.alerting') }}
+        </h3>
+        <div class="row mb-20">
+          <div class="col span-12">
+            <Banner
+              v-if="scanAlertRule.alertOnFailure || scanAlertRule.alertOnComplete"
+              class="mt-0"
+              :color="hasAlertManager ? 'info' : 'warning'"
+            >
+              <span v-clean-html="t('cis.alertNeeded', {link: monitoringUrl}, true)" />
+            </banner>
+            <Checkbox
+              v-model:value="scanAlertRule.alertOnComplete"
+              :mode="mode"
+              :label="t('cis.alertOnComplete')"
+            />
+            <Checkbox
+              v-model:value="scanAlertRule.alertOnFailure"
+              :mode="mode"
+              :label="t('cis.alertOnFailure')"
+            />
           </div>
-        </template>
+        </div>
       </template>
     </template>
   </CruResource>

package/edit/cis.cattle.io.clusterscanprofile.vue

@@ -113,40 +113,38 @@ export default {
       @finish="save"
       @error="e=>errors = e"
     >
-      <template>
-        <div class="spacer" />
-        <div class="row">
-          <div class="col span-12">
-            <NameNsDescription
-              :mode="mode"
-              :value="value"
-              :namespaced="false"
-              @change="name=value.metadata.name"
-            />
-          </div>
+      <div class="spacer" />
+      <div class="row">
+        <div class="col span-12">
+          <NameNsDescription
+            :mode="mode"
+            :value="value"
+            :namespaced="false"
+            @change="name=value.metadata.name"
+          />
         </div>
-        <div class="row">
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="value.spec.benchmarkVersion"
-              :mode="mode"
-              :label="t('cis.benchmarkVersion')"
-              :options="compatibleBenchmarkNames"
-            />
-          </div>
+      </div>
+      <div class="row">
+        <div class="col span-6">
+          <LabeledSelect
+            v-model:value="value.spec.benchmarkVersion"
+            :mode="mode"
+            :label="t('cis.benchmarkVersion')"
+            :options="compatibleBenchmarkNames"
+          />
         </div>
-        <div class="spacer" />
-        <div class="row">
-          <div class="col span-6">
-            <ArrayList
-              v-model:value="value.spec.skipTests"
-              :title="t('cis.testsToSkip')"
-              :value-placeholder="t('cis.testID')"
-              :mode="mode"
-            />
-          </div>
+      </div>
+      <div class="spacer" />
+      <div class="row">
+        <div class="col span-6">
+          <ArrayList
+            v-model:value="value.spec.skipTests"
+            :title="t('cis.testsToSkip')"
+            :value-placeholder="t('cis.testID')"
+            :mode="mode"
+          />
         </div>
-      </template>
+      </div>
     </CruResource>
   </div>
 </template>

package/edit/cloudcredential.vue

@@ -20,6 +20,8 @@ import { rke1Supports } from '@shell/store/plugins';
 export default {
   name: 'CruCloudCredential',
 
+  emits: ['set-subtype', 'input'],
+
   components: {
     Loading,
     NameNsDescription,

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

@@ -4,6 +4,8 @@ import ArrayList from '@shell/components/form/ArrayList';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 
 export default {
+  emits: ['update:value'],
+
   components: { ArrayList, ArrayListGrouped },
 
   props: {

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

@@ -11,6 +11,8 @@ export const NAMESPACE_FILTERS_HELPER = {
 };
 
 export default {
+  emits: ['update:value'],
+
   components: { LabeledSelect },
 
   props: {

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

@@ -18,6 +18,8 @@ export const SCOPE_OPTIONS = [
 ];
 
 export default {
+  emits: ['update:value'],
+
   components: { LabeledSelect },
 
   props: {

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

@@ -31,6 +31,8 @@ function findConstraintTypesIds(schemas) {
 const CONSTRAINT_PREFIX = 'constraints.gatekeeper.sh.';
 
 export default {
+  emits: ['update:value', 'set-subtype'],
+
   components: {
     CruResource,
     MatchKinds,

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

@@ -11,6 +11,8 @@ import { FLEET } from '@shell/config/labels-annotations';
 export default {
   name: 'CruFleetCluster',
 
+  emits: ['input'],
+
   components: {
     CruResource,
     Labels,

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

@@ -14,7 +14,10 @@ import throttle from 'lodash/throttle';
 import { allHash } from '@shell/utils/promise';
 
 export default {
-  name:         'CruClusterGroup',
+  name: 'CruClusterGroup',
+
+  emits: ['input'],
+
   inheritAttrs: false,
   components:   {
     Banner,

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

@@ -33,6 +33,8 @@ const _SPECIFY = 'specify';
 export default {
   name: 'CruGitRepo',
 
+  emits: ['input'],
+
   components: {
     Checkbox,
     ArrayList,

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

@@ -10,6 +10,8 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import { set } from '@shell/utils/object';
 
 export default {
+  emits: ['input'],
+
   components: {
     Tab,
     Tabbed,

package/edit/logging-flow/Match.vue

@@ -4,6 +4,8 @@ import Select from '@shell/components/form/Select';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 export default {
+  emits: ['remove'],
+
   components: {
     KeyValue, Select, LabeledSelect
   },

package/edit/logging-flow/index.vue

@@ -14,7 +14,7 @@ import { allHash } from '@shell/utils/promise';
 import { isArray } from '@shell/utils/array';
 import { matchRuleIsPopulated } from '@shell/models/logging.banzaicloud.io.flow';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { clone, set } from '@shell/utils/object';
+import { clone } from '@shell/utils/object';
 import isEmpty from 'lodash/isEmpty';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import { exceptionToErrorsArray } from '@shell/utils/error';
@@ -33,6 +33,8 @@ function emptyMatch(include = true) {
 }
 
 export default {
+  emits: ['input'],
+
   components: {
     Banner,
     CruResource,
@@ -75,7 +77,7 @@ export default {
     const schemas = this.$store.getters['cluster/all'](SCHEMA);
     let filtersYaml;
 
-    set(this.value, 'spec', this.value.spec || {});
+    this.value.spec = this.value.spec || {};
 
     if ( this.value.spec.filters?.length ) {
       filtersYaml = jsyaml.dump(this.value.spec.filters);
@@ -219,7 +221,7 @@ export default {
           }
         });
 
-        set(this.value.spec, 'match', matches);
+        this.value.spec.match = matches;
       }
     },
     filtersYaml: {
@@ -229,9 +231,9 @@ export default {
           const filterJson = jsyaml.load(this.filtersYaml);
 
           if ( isArray(filterJson) ) {
-            set(this.value.spec, 'filters', filterJson);
+            this.value.spec.filters = filterJson;
           } else {
-            set(this.value.spec, 'filters', undefined);
+            this.value.spec.filters = undefined;
           }
         } catch (e) {
           this.errors = exceptionToErrorsArray(e);
@@ -241,13 +243,13 @@ export default {
     globalOutputRefs: {
       deep: true,
       handler() {
-        set(this.value.spec, 'globalOutputRefs', this.globalOutputRefs);
+        this.value.spec.globalOutputRefs = this.globalOutputRefs;
       }
     },
     localOutputRefs: {
       deep: true,
       handler() {
-        set(this.value.spec, 'localOutputRefs', this.localOutputRefs);
+        this.value.spec.localOutputRefs = this.localOutputRefs;
       }
     }
   },
@@ -262,7 +264,7 @@ export default {
 
   methods: {
     addMatch(include) {
-      this.matches.push(emptyMatch(include));
+      this.matches = [...this.matches, emptyMatch(include)];
     },
 
     removeMatch(idx) {

package/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue

@@ -96,7 +96,7 @@ export default {
       </div>
       <div class="col span-2">
         <LabeledInput
-          v-model.number="port"
+          v-model:value.number="port"
           :mode="mode"
           :disabled="disabled"
           class="port"

package/edit/logging.banzaicloud.io.output/providers/opensearch.vue

@@ -96,7 +96,7 @@ export default {
       </div>
       <div class="col span-2">
         <LabeledInput
-          v-model.number="port"
+          v-model:value.number="port"
           :mode="mode"
           :disabled="disabled"
           class="port"

package/edit/logging.banzaicloud.io.output/providers/redis.vue

@@ -67,7 +67,7 @@ export default {
       </div>
       <div class="col span-2">
         <LabeledInput
-          v-model.number="port"
+          v-model:value.number="port"
           :mode="mode"
           :disabled="disabled"
           class="port"
@@ -81,7 +81,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model.number="value.db_number"
+          v-model:value.number="value.db_number"
           :mode="mode"
           :disabled="disabled"
           type="number"
@@ -90,7 +90,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model.number="value.ttl"
+          v-model:value.number="value.ttl"
           :mode="mode"
           :disabled="disabled"
           type="number"

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

@@ -12,6 +12,7 @@ export default {
     CruResource,
     Loading,
   },
+  inheritAttrs: false,
 
   mixins: [CreateEditView],
   async fetch() {

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

@@ -18,7 +18,10 @@ import Banner from '@components/Banner/Banner.vue';
 import ArrayList from '@shell/components/form/ArrayList.vue';
 
 export default {
-  name:         'FleetCruWorkspace',
+  name: 'FleetCruWorkspace',
+
+  emits: ['input'],
+
   inheritAttrs: false,
   components:   {
     CruResource,

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

@@ -19,6 +19,8 @@ import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { Banner } from '@components/Banner';
 
 export default {
+  emits: ['input'],
+
   components: {
     ContainerResourceLimit, CruResource, Labels, NameNsDescription, ProjectMembershipEditor, ResourceQuota, Tabbed, Tab, Banner
   },

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

@@ -1,7 +1,7 @@
 <script>
 import RoleDetailEdit from '@shell/components/auth/RoleDetailEdit';
 
-export default { components: { RoleDetailEdit } };
+export default { emits: ['set-subtype'], components: { RoleDetailEdit } };
 </script>
 <template>
   <RoleDetailEdit

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

@@ -16,6 +16,7 @@ import { _CREATE, _EDIT, _VIEW, _CONFIG } from '@shell/config/query-params';
 import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 
 export default {
+  emits:      ['input'],
   components: {
     ActionMenu,
     CruResource,

package/edit/monitoring.coreos.com.alertmanagerconfig/types/email.vue

@@ -6,6 +6,8 @@ import SimpleSecretSelector from '@shell/components/form/SimpleSecretSelector';
 import { _VIEW } from '@shell/config/query-params';
 
 export default {
+  emits: ['input'],
+
   components: {
     Checkbox, LabeledInput, SimpleSecretSelector, TLS
   },