@rancher/shell 0.3.0 → 0.3.1

package/dialog/RollbackWorkloadDialog.vue

@@ -37,8 +37,8 @@ export default {
     YamlEditor,
   },
   props: {
-    resources: {
-      type:     Array,
+    workload: {
+      type:     Object,
       required: true
     }
   },
@@ -55,46 +55,17 @@ export default {
   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,9 +19,11 @@ export default {
   },
 
   props: {
-    resources: {
-      type:     Array,
-      required: true
+    cluster: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
     }
   },
 
@@ -34,10 +36,6 @@ export default {
   },
 
   computed: {
-    cluster() {
-      return this.resources?.[0];
-    },
-
     serviceOptions() {
       if (this.cluster.isRke2) {
         const options = [

package/dialog/RotateEncryptionKeyDialog.vue

@@ -19,9 +19,11 @@ export default {
   },
 
   props: {
-    resources: {
-      type:     Array,
-      required: true
+    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

@@ -15,25 +15,17 @@ export default {
     LabeledInput,
   },
   props: {
-    resources: {
-      type:     Array,
-      required: true
+    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

@@ -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

@@ -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']);

package/edit/auth/azuread.vue

@@ -219,8 +219,8 @@ export default {
 
     promptUpdate() {
       this.$store.dispatch('management/promptModal', {
-        component: 'GenericPrompt',
-        resources: [this.modalConfig]
+        component:      'GenericPrompt',
+        componentProps: this.modalConfig
       });
     },
 
@@ -267,10 +267,10 @@ export default {
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
-        <AuthBanner
-          :t-args="tArgs"
-          :disable="disable"
-          :edit="goToEdit"
+        <AuthBanner
+          :t-args="tArgs"
+          :disable="disable"
+          :edit="goToEdit"
         >
           <template slot="rows">
             <tr>
@@ -298,9 +298,9 @@ export default {
               <td>{{ model.authEndpoint }}</td>
             </tr>
           </template>
-          <template
-            v-if="needsUpdate"
-            slot="actions"
+          <template
+            v-if="needsUpdate"
+            slot="actions"
           >
             <button
               type="button"
@@ -328,17 +328,17 @@ export default {
           color="warning"
         />
 
-        <InfoBox
-          v-if="!model.enabled"
-          id="reply-info"
-          class="mt-20 mb-20 p-10"
+        <InfoBox
+          v-if="!model.enabled"
+          id="reply-info"
+          class="mt-20 mb-20 p-10"
         >
           {{ t('authConfig.azuread.reply.info') }}
           <br>
           <label class="reply-url">{{ t('authConfig.azuread.reply.label') }} </label>
-          <CopyToClipboardText
-            :plain="true"
-            :text="replyUrl"
+          <CopyToClipboardText
+            :plain="true"
+            :text="replyUrl"
           />
         </InfoBox>
 

package/edit/auth/github.vue

@@ -269,4 +269,12 @@ export default {
   .step-list li:not(:last-child) {
     margin-bottom: 8px;
   }
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
 </style>

package/edit/auth/googleoauth.vue

@@ -246,7 +246,7 @@ export default {
           v-if="!model.enabled"
           class="row"
         >
-          <div class="col span-12">
+          <div class="col span-12 google">
             <Banner
               color="info"
               v-html="t('authConfig.associatedWarning', tArgs, true)"
@@ -261,4 +261,13 @@ export default {
   .step-list li:not(:last-child) {
     margin-bottom: 8px;
   }
+
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
 </style>

package/edit/auth/ldap/index.vue

@@ -156,3 +156,13 @@ export default {
     </CruResource>
   </div>
 </template>
+<style lang="scss" scoped>
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
+</style>

package/edit/auth/oidc.vue

@@ -285,3 +285,13 @@ export default {
     </CruResource>
   </div>
 </template>
+<style lang="scss" scoped>
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
+</style>

package/edit/auth/saml.vue

@@ -265,3 +265,13 @@ export default {
     </CruResource>
   </div>
 </template>
+<style lang="scss" scoped>
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
+</style>

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -228,7 +228,7 @@ export default {
                 class="btn role-link close btn-sm"
                 @click="removeProps.remove"
               >
-                <i class="icon icon-2x icon-x" />
+                <i class="icon icon-x" />
               </button>
               <span v-else />
             </template>

package/edit/cloudcredential.vue

@@ -10,7 +10,6 @@ import Labels from '@shell/components/form/Labels';
 import { HIDE_SENSITIVE } from '@shell/store/prefs';
 import { CAPI } from '@shell/config/labels-annotations';
 import { clear, uniq } from '@shell/utils/array';
-import { importCloudCredential } from '@shell/utils/dynamic-importer';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
@@ -95,14 +94,11 @@ export default {
     },
 
     cloudComponent() {
-      const driver = this.driverName;
-      const haveProviders = this.$store.getters['plugins/credentialDrivers'];
-
-      if ( haveProviders.includes(driver) ) {
-        return importCloudCredential(driver);
+      if (this.$store.getters['type-map/hasCustomCloudCredentialComponent'](this.driverName)) {
+        return this.$store.getters['type-map/importCloudCredential'](this.driverName);
       }
 
-      return importCloudCredential('generic');
+      return this.$store.getters['type-map/importCloudCredential']('generic');
     },
 
     // array of id, label, description, initials for type selection step

package/edit/logging-flow/Match.vue

@@ -27,6 +27,16 @@ export default {
       type:    Array,
       default: () => [],
     },
+
+    namespaces: {
+      type:    Array,
+      default: () => [],
+    },
+
+    isClusterFlow: {
+      type:    Boolean,
+      default: false
+    }
   },
 
   methods: {
@@ -43,19 +53,19 @@ export default {
   <div>
     <KeyValue
       v-model="value.labels"
-      :title="value.select ? 'Include Pods' : 'Exclude Pods'"
+      :title="value.select ? t('logging.flow.matches.pods.title.include') : t('logging.flow.matches.pods.title.exclude')"
       :mode="mode"
       :initial-empty-row="true"
       :read-allowed="false"
       :title-add="true"
       protip=""
-      key-label="Pod Label Key"
-      value-label="Pod Label Value"
-      add-label="Add Pod"
+      :key-label="t('logging.flow.matches.pods.keyLabel')"
+      :value-label="t('logging.flow.matches.pods.valueLabel')"
+      :add-label="t('logging.flow.matches.pods.addLabel')"
     />
     <div class="spacer" />
     <h3>
-      Limit to specific nodes
+      {{ value.select ? t('logging.flow.matches.nodes.title.include') : t('logging.flow.matches.nodes.title.exclude') }}
     </h3>
     <div class="row">
       <div class="col span-12">
@@ -63,7 +73,7 @@ export default {
           v-model="value.hosts"
           class="lg"
           :options="nodes"
-          placeholder="Default: Any node"
+          :placeholder="t('logging.flow.matches.nodes.placeholder')"
           :multiple="true"
           :searchable="true"
           :taggable="true"
@@ -75,7 +85,7 @@ export default {
     </div>
     <div class="spacer" />
     <h3>
-      Limit to specific container names
+      {{ value.select ? t('logging.flow.matches.containerNames.title.include') : t('logging.flow.matches.containerNames.title.exclude') }}
     </h3>
     <div class="row">
       <div class="col span-12">
@@ -83,7 +93,7 @@ export default {
           v-model="value.container_names"
           class="lg"
           :options="containers"
-          placeholder="Default: Any container"
+          :placeholder="t('logging.flow.matches.containerNames.placeholder')"
           :multiple="true"
           :taggable="true"
           :clearable="true"
@@ -92,5 +102,26 @@ export default {
         />
       </div>
     </div>
+    <div v-if="isClusterFlow">
+      <div class="spacer" />
+      <h3>
+        {{ value.select ? t('logging.flow.matches.namespaces.title.include') : t('logging.flow.matches.namespaces.title.exclude') }}
+      </h3>
+      <div class="row">
+        <div class="col span-12">
+          <Select
+            v-model="value.namespaces"
+            class="lg"
+            :options="namespaces"
+            :placeholder="t('logging.flow.matches.namespaces.placeholder')"
+            :multiple="true"
+            :taggable="true"
+            :clearable="true"
+            :close-on-select="false"
+            placement="top"
+          />
+        </div>
+      </div>
+    </div>
   </div>
 </template>