@rancher/shell 0.2.5 → 0.3.1

package/dialog/DrainNode.vue

@@ -18,45 +18,50 @@ export default {
     UnitInput
   },
 
-  props:      {
-    resources: {
-      type:     Array,
-      required: true
+  props: {
+    kubeNodes: {
+      type:    Array,
+      default: () => []
+    },
+
+    normanNodeId: {
+      type:    String,
+      default: ''
     }
   },
 
   data() {
     return {
       radioOptions: [{
-        label:   this.t('generic.yes'),
+        label: this.t('generic.yes'),
         value: true,
       }, {
-        label:   this.t('generic.no'),
+        label: this.t('generic.no'),
         value: false,
       }],
       gracePeriodOptions: [{
-        label:   this.t('drainNode.gracePeriod.default'),
+        label: this.t('drainNode.gracePeriod.default'),
         value: false,
       }, {
-        label:   this.t('drainNode.gracePeriod.custom'),
+        label: this.t('drainNode.gracePeriod.custom'),
         value: true,
       }],
       timeoutOptions: [{
-        label:   this.t('drainNode.timeout.default'),
+        label: this.t('drainNode.timeout.default'),
         value: false,
       }, {
-        label:   this.t('drainNode.timeout.custom'),
+        label: this.t('drainNode.timeout.custom'),
         value: true,
       }],
 
       gracePeriod: false,
       timeout:     false,
 
-      body:        {
-        deleteLocalData:  false,
-        force:            false,
-        gracePeriod:      null,
-        timeout:          null
+      body: {
+        deleteLocalData: false,
+        force:           false,
+        gracePeriod:     null,
+        timeout:         null
       },
 
       EDIT: _EDIT,
@@ -66,15 +71,6 @@ export default {
     };
   },
 
-  computed: {
-    kubeNodes() {
-      return this.resources[0];
-    },
-    normanNodeId() {
-      return this.resources[1];
-    },
-  },
-
   watch: {
     gracePeriod(neu) {
       if (neu && !this.body.gracePeriod) {
@@ -130,13 +126,13 @@ export default {
 </script>
 
 <template>
-  <Card
-    class="prompt-rotate"
-    :show-highlight-border="false"
+  <Card
+    class="prompt-rotate"
+    :show-highlight-border="false"
   >
-    <h4
-      slot="title"
-      class="text-default-text"
+    <h4
+      slot="title"
+      class="text-default-text"
     >
       <template v-if="kubeNodes.length > 1">
         {{ t('drainNode.titleMultiple', { count: kubeNodes.length }) }}
@@ -146,9 +142,9 @@ export default {
       </template>
     </h4>
 
-    <div
-      slot="body"
-      class="pl-10 pr-10"
+    <div
+      slot="body"
+      class="pl-10 pr-10"
     >
       <div>
         <RadioGroup
@@ -162,22 +158,22 @@ export default {
             <h5>{{ t('drainNode.deleteLocalData') }}</h5>
           </template>
         </RadioGroup>
-        <RadioGroup
-          v-model="body.force"
-          name="force"
-          :options="radioOptions"
-          :row="true"
-          class="mb-15"
+        <RadioGroup
+          v-model="body.force"
+          name="force"
+          :options="radioOptions"
+          :row="true"
+          class="mb-15"
         >
           <template #label>
             <h5>{{ t('drainNode.force') }}</h5>
           </template>
         </RadioGroup>
-        <RadioGroup
-          v-model="gracePeriod"
-          name="gracePeriod"
-          :options="gracePeriodOptions"
-          class="mb-15"
+        <RadioGroup
+          v-model="gracePeriod"
+          name="gracePeriod"
+          :options="gracePeriodOptions"
+          class="mb-15"
         >
           <template #label>
             <h5>{{ t('drainNode.gracePeriod.title') }}</h5>
@@ -192,11 +188,11 @@ export default {
           :placeholder="t('drainNode.gracePeriod.placeholder')"
           class="mb-10"
         />
-        <RadioGroup
-          v-model="timeout"
-          name="timeout"
-          :options="timeoutOptions"
-          class="mb-15"
+        <RadioGroup
+          v-model="timeout"
+          name="timeout"
+          :options="timeoutOptions"
+          class="mb-15"
         >
           <template #label>
             <h5>{{ t('drainNode.timeout.title') }}</h5>
@@ -212,21 +208,21 @@ export default {
           :placeholder="t('drainNode.timeout.placeholder')"
         />
       </div>
-      <Banner
-        v-for="(err, i) in errors"
-        :key="i"
-        color="error"
-        :label="err"
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :label="err"
       />
     </div>
 
-    <div
-      slot="actions"
-      class="buttons"
+    <div
+      slot="actions"
+      class="buttons"
     >
-      <button
-        class="btn role-secondary mr-10"
-        @click="close"
+      <button
+        class="btn role-secondary mr-10"
+        @click="close"
       >
         {{ t('generic.cancel') }}
       </button>

package/dialog/ForceMachineRemoveDialog.vue

@@ -15,10 +15,12 @@ export default {
     CopyToClipboardText
   },
 
-  props:      {
-    resources: {
-      type:     Array,
-      required: true
+  props: {
+    machine: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
     }
   },
 
@@ -29,10 +31,6 @@ export default {
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
 
-    machine() {
-      return this.resources[0];
-    },
-
     nameToMatch() {
       return this.machine.spec.infrastructureRef.name;
     },

package/dialog/GenericPrompt.vue

@@ -10,33 +10,28 @@ export default {
     AsyncButton,
     Banner,
   },
-  props:      {
-    resources: {
-      type:     Array,
-      required: true
+  props: {
+    applyAction: {
+      type:    Function,
+      default: () => {}
+    },
+    applyMode: {
+      type:    String,
+      default: 'create'
+    },
+    title: {
+      type:    String,
+      default: ''
+    },
+    body: {
+      type:    String,
+      default: ''
     }
   },
   data() {
     return { errors: [] };
   },
-  computed: {
-    config() {
-      return this.resources[0];
-    },
-    applyAction() {
-      return this.config.applyAction;
-    },
-    applyMode() {
-      return this.config.applyMode || 'create';
-    },
-    title() {
-      return this.config.title;
-    },
-    body() {
-      return this.config.body;
-    },
 
-  },
   methods: {
     close() {
       this.$emit('close');

package/dialog/RollbackWorkloadDialog.vue

@@ -36,65 +36,36 @@ export default {
     Banner,
     YamlEditor,
   },
-  props:      {
-    resources: {
-      type:     Array,
+  props: {
+    workload: {
+      type:     Object,
       required: true
     }
   },
   data() {
     return {
-      errors:             [],
-      selectedRevision:   null,
-      currentRevision:    null,
-      revisions:          [],
-      editorMode:         EDITOR_MODES.DIFF_CODE,
-      showDiff:           false,
+      errors:           [],
+      selectedRevision: null,
+      currentRevision:  null,
+      revisions:        [],
+      editorMode:       EDITOR_MODES.DIFF_CODE,
+      showDiff:         false,
     };
   },
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
     ...mapGetters(['currentCluster']),
-    workload() {
-      return this.resources[0];
-    },
     workloadName() {
       return this.workload.metadata.name;
     },
     workloadNamespace() {
       return this.workload.metadata.namespace;
     },
-    currentRevisionNumber() {
-      return this.workload.metadata.annotations['deployment.kubernetes.io/revision'];
+    workloadType() {
+      return this.workload.kind.toLowerCase();
     },
-    rollbackRequestBody() {
-      if (!this.selectedRevision) {
-        return null;
-      }
-
-      // Build the request body in the same format that kubectl
-      // uses to call the Kubernetes API to roll back a workload.
-      // To see an example request body, run:
-      // kubectl rollout undo deployment/[deployment name] --to-revision=[revision number] -v=8
-      const body = [
-        {
-          op:      'replace',
-          path:  '/spec/template',
-          value: {
-            metadata: {
-              creationTimestamp: null,
-              labels:            { 'workload.user.cattle.io/workloadselector': this.selectedRevision.spec.template.metadata.labels['workload.user.cattle.io/workloadselector'] }
-            },
-            spec: this.selectedRevision.spec.template.spec
-          }
-        }, {
-          op:    'replace',
-          path:  '/metadata/annotations',
-          value: { 'deployment.kubernetes.io/revision': this.selectedRevision.metadata.annotations['deployment.kubernetes.io/revision'] }
-        }
-      ];
-
-      return body;
+    revisionsType() {
+      return this.workloadType === 'deployment' ? WORKLOAD_TYPES.REPLICA_SET : 'apps.controllerrevision';
     },
     selectedRevisionId() {
       return this.selectedRevision.id;
@@ -111,9 +82,9 @@ export default {
   },
   fetch() {
     // Fetch revisions of the current workload
-    this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.REPLICA_SET })
+    this.$store.dispatch('cluster/findAll', { type: this.revisionsType })
       .then(( response ) => {
-        const allReplicaSets = response;
+        const allRevisions = response;
 
         const hasRelationshipWithCurrentWorkload = ( replicaSet ) => {
           const relationshipsOfReplicaSet = replicaSet.metadata.relationships;
@@ -127,15 +98,13 @@ export default {
           return revisionsOfCurrentWorkload.length > 0;
         };
 
-        const workloadRevisions = allReplicaSets.filter(( replicaSet ) => {
+        const workloadRevisions = allRevisions.filter(( replicaSet ) => {
           return hasRelationshipWithCurrentWorkload( replicaSet );
         });
 
         const revisionOptions = workloadRevisions
           .map( (revision ) => {
-            const isCurrentRevision = this.getRevisionNumber(revision) === this.currentRevisionNumber;
-
-            if (isCurrentRevision) {
+            if (this.isCurrentRevision(revision)) {
               this.currentRevision = revision;
             }
 
@@ -155,18 +124,18 @@ export default {
     },
     async save() {
       try {
-        await this.workload.rollBackWorkload(this.currentCluster, this.workload, this.rollbackRequestBody);
+        await this.workload.rollBack(this.currentCluster, this.workload, this.selectedRevision);
         this.close();
       } catch (err) {
         this.errors = exceptionToErrorsArray(err);
       }
     },
-    getRevisionNumber( revision ) {
-      return revision.metadata.annotations['deployment.kubernetes.io/revision'];
+    isCurrentRevision(revision) {
+      return revision.revisionNumber === this.workload.currentRevisionNumber;
     },
     buildRevisionOption( revision ) {
-      const revisionNumber = this.getRevisionNumber(revision);
-      const isCurrentRevision = revisionNumber === this.currentRevisionNumber;
+      const { revisionNumber } = revision;
+      const isCurrentRevision = this.isCurrentRevision(revision);
       const now = day();
       const createdDate = day(revision.metadata.creationTimestamp);
       const createdDateFormatted = createdDate.format(this.timeFormatStr);

package/dialog/RotateCertificatesDialog.vue

@@ -19,25 +19,23 @@ export default {
   },
 
   props: {
-    resources: {
-      type:     Array,
-      required: true
+    cluster: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
     }
   },
 
   data() {
     return {
       selectedService:   '',
-      rotateAllServices:     true,
+      rotateAllServices: true,
       errors:            []
     };
   },
 
-  computed:   {
-    cluster() {
-      return this.resources?.[0];
-    },
-
+  computed: {
     serviceOptions() {
       if (this.cluster.isRke2) {
         const options = [
@@ -105,8 +103,8 @@ export default {
           const currentGeneration = this.cluster.spec?.rkeConfig?.rotateCertificates?.generation || 0;
 
           set(this.cluster, 'spec.rkeConfig.rotateCertificates', {
-            generation:     currentGeneration + 1,
-            services:       (this.selectedService && !this.rotateAllServices) ? [this.selectedService] : []
+            generation: currentGeneration + 1,
+            services:   (this.selectedService && !this.rotateAllServices) ? [this.selectedService] : []
           });
 
           await this.cluster.save();

package/dialog/RotateEncryptionKeyDialog.vue

@@ -18,10 +18,12 @@ export default {
     Banner,
   },
 
-  props:      {
-    resources: {
-      type:     Array,
-      required: true
+  props: {
+    cluster: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
     }
   },
 
@@ -51,12 +53,6 @@ export default {
     return { errors: [], latestBackup: null };
   },
 
-  computed: {
-    cluster() {
-      return this.resources?.[0];
-    },
-  },
-
   methods: {
     close(buttonDone) {
       if (buttonDone && typeof buttonDone === 'function') {

package/dialog/SaveAsRKETemplateDialog.vue

@@ -14,26 +14,18 @@ export default {
     Banner,
     LabeledInput,
   },
-  props:      {
-    resources: {
-      type:     Array,
-      required: true
+  props: {
+    cluster: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
     }
   },
   data() {
     return { errors: [], name: '' };
   },
-  computed: {
-    cluster() {
-      if (this.resources?.length === 1) {
-        const c = this.resources[0];
-
-        return c;
-      }
 
-      return {};
-    },
-  },
   mounted() {
     this.$nextTick(() => {
       this.$refs.templateName.focus();

package/dialog/ScaleMachineDownDialog.vue

@@ -6,7 +6,7 @@ import GenericPrompt from './GenericPrompt';
 export default {
   components: { GenericPrompt },
 
-  props:      {
+  props: {
     resources: {
       type:     Array,
       required: true
@@ -97,7 +97,7 @@ export default {
 
 <template>
   <GenericPrompt
-    :resources="[config]"
+    v-bind="config"
     @close="$emit('close')"
   >
     <template slot="body">

package/dialog/ScalePoolDownDialog.vue

@@ -0,0 +1,121 @@
+<script>
+import { Card } from '@components/Card';
+import { alternateLabel } from '@shell/utils/platform';
+import { Checkbox } from '@components/Form/Checkbox';
+import { SCALE_POOL_PROMPT } from '@shell/store/prefs';
+
+export default {
+  components: { Card, Checkbox },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  data() {
+    const allToDelete = Array.isArray(this.resources) ? this.resources : [this.resources];
+
+    return {
+      allToDelete,
+      type:               this.$store.getters['type-map/labelFor'](allToDelete[0].schema, allToDelete.length),
+      promptConfirmation: true
+    };
+  },
+  computed: {
+    machinenName() {
+      const name = this.resources.length > 0 ? this.resources[0].id.split('/')[1] : '';
+
+      return name;
+    },
+    protip() {
+      return this.t('promptRemove.protip', { alternateLabel });
+    },
+  },
+  created() {
+    const showScalePoolPrompt = this.$store.getters['prefs/get'](SCALE_POOL_PROMPT);
+
+    // Check for showScalePoolPrompt pref
+    // If it is not set, set it to true and update promt checkbox
+    if ( showScalePoolPrompt === null ) {
+      this.promptConfirmation = true;
+      this.$store.dispatch('prefs/set', { key: SCALE_POOL_PROMPT, value: true });
+    } else {
+      this.promptConfirmation = showScalePoolPrompt;
+    }
+  },
+
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+
+    update() {
+      this.$store.dispatch('prefs/set', { key: SCALE_POOL_PROMPT, value: !!this.promptConfirmation });
+    },
+
+    remove() {
+      // Delete pool
+      if (this.resources.length > 0 ) {
+        this.resources[0].scalePool(-1);
+      }
+      this.close();
+    }
+  }
+};
+</script>
+
+<template>
+  <Card
+    class="prompt-remove"
+    :show-highlight-border="false"
+  >
+    <h4
+      slot="title"
+      class="text-default-text"
+    >
+      {{ t('promptForceRemove.modalTitle') }}
+    </h4>
+    <div
+      slot="body"
+      class="pl-10 pr-10"
+    >
+      <div>
+        {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ machinenName }}</b>
+      </div>
+      <div>
+        <Checkbox
+          v-model="promptConfirmation"
+          :label="t('promptRemove.promptConfirmation')"
+          class="mt-10"
+          @input="update()"
+        />
+      </div>
+      <div class="text-info mt-20">
+        {{ protip }}
+      </div>
+    </div>
+    <template #actions>
+      <button
+        class="btn role-secondary mr-10"
+        @click="close"
+      >
+        {{ t('generic.cancel') }}
+      </button>
+      <div class="spacer" />
+      <button
+        class="btn bg-error ml-10 btn role-primary"
+        @click="remove"
+      >
+        {{ t('generic.confirm') }}
+      </button>
+    </template>
+  </Card>
+</template>
+
+<style lang='scss' scoped>
+  .actions {
+    text-align: right;
+  }
+</style>

package/edit/__tests__/management.cattle.io.setting.test.ts

@@ -5,7 +5,7 @@ import { SETTING } from '@shell/config/settings';
 describe('management.cattle.io.setting should', () => {
   const requiredSetup = () => ({
     // Remove all these mocks after migration to Vue 2.7/3 due mixin logic
-    mocks:     {
+    mocks: {
       $store: {
         getters: {
           currentStore:              () => 'current_store',
@@ -32,7 +32,7 @@ describe('management.cattle.io.setting should', () => {
   });
 
   describe('using predefined generic rule', () => {
-    const id = SETTING.CATTLE_PASSWORD_MIN_LENGTH;
+    const id = SETTING.PASSWORD_MIN_LENGTH;
 
     describe('validate input with provided settings', () => {
       it('allowing to save if pass', () => {
@@ -65,7 +65,7 @@ describe('management.cattle.io.setting should', () => {
       });
       const expectation = [{
         path:  'value',
-        rules: ['betweenValues']
+        rules: ['betweenValues', 'isInteger', 'isPositive', 'isOctal']
       }];
 
       expect(wrapper.vm.$data['fvFormRuleSets']).toStrictEqual(expectation);
@@ -76,7 +76,7 @@ describe('management.cattle.io.setting should', () => {
         propsData: { value: { id, value: '' } },
         ...requiredSetup()
       });
-      const expectation = ['betweenValues'];
+      const expectation = ['betweenValues', 'isInteger', 'isPositive', 'isOctal'];
 
       // Avoid integration tests with mixin as it returns the whole function
       const rules = Object.keys((wrapper.vm as any)['fvExtraRules']);