@rancher/shell 0.3.0 → 0.3.2

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/catalog.cattle.io.clusterrepo.vue

@@ -59,6 +59,7 @@ export default {
           :options="[false, true]"
           :labels="[t('catalog.repo.target.http'), t('catalog.repo.target.git')]"
           :mode="mode"
+          data-testid="clusterrepo-radio-input"
         />
       </div>
     </div>
@@ -74,6 +75,7 @@ export default {
           :label="t('catalog.repo.gitRepo.label')"
           :placeholder="t('catalog.repo.gitRepo.placeholder', null, true)"
           :mode="mode"
+          data-testid="clusterrepo-git-repo-input"
         />
       </div>
       <div class="col span-6">
@@ -83,6 +85,7 @@ export default {
           :label="t('catalog.repo.gitBranch.label')"
           :placeholder="t('catalog.repo.gitBranch.placeholder', null, true)"
           :mode="mode"
+          data-testid="clusterrepo-git-branch-input"
         />
       </div>
     </div>

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>

package/edit/logging-flow/index.vue

@@ -6,7 +6,9 @@ import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
-import { LOGGING, NODE, POD, SCHEMA } from '@shell/config/types';
+import {
+  LOGGING, NAMESPACE, NODE, POD, SCHEMA
+} from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import { createYaml } from '@shell/utils/create-yaml';
 import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
@@ -51,6 +53,7 @@ export default {
   async fetch() {
     const hasAccessToClusterOutputs = this.$store.getters[`cluster/schemaFor`](LOGGING.CLUSTER_OUTPUT);
     const hasAccessToOutputs = this.$store.getters[`cluster/schemaFor`](LOGGING.OUTPUT);
+    const hasAccessToNamespaces = this.$store.getters[`cluster/schemaFor`](NAMESPACE);
     const hasAccessToNodes = this.$store.getters[`cluster/schemaFor`](NODE);
     const hasAccessToPods = this.$store.getters[`cluster/schemaFor`](POD);
     const isFlow = this.value.type === LOGGING.FLOW;
@@ -62,6 +65,7 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
+      allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
       allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
       allPods:           getAllOrDefault(POD, hasAccessToPods),
     });
@@ -113,6 +117,7 @@ export default {
       matches,
       allOutputs:         null,
       allClusterOutputs:  null,
+      allNamespaces:      null,
       allNodes:           null,
       allPods:            null,
       filtersYaml,
@@ -166,6 +171,22 @@ export default {
         });
     },
 
+    namespaceChoices() {
+      if (!this.allNamespaces) {
+        // Handle the case where the user doesn't have permission
+        // to see namespaces
+        return [];
+      }
+      const out = this.allNamespaces.map((namespace) => {
+        return {
+          label: namespace.nameDisplay,
+          value: namespace.metadata.name
+        };
+      });
+
+      return out;
+    },
+
     nodeChoices() {
       if (!this.allNodes) {
         // Handle the case where the user doesn't have permission
@@ -349,7 +370,7 @@ export default {
         <Banner
           color="info"
           class="mt-0"
-          label="Configure which container logs will be pulled from"
+          :label="t('logging.flow.matches.banner')"
         />
         <ArrayListGrouped
           v-model="matches"
@@ -362,8 +383,10 @@ export default {
               class="rule mb-20"
               :value="props.row.value"
               :mode="mode"
+              :namespaces="namespaceChoices"
               :nodes="nodeChoices"
               :containers="containerChoices"
+              :is-cluster-flow="value.type === LOGGING.CLUSTER_FLOW"
               @remove="e=>removeMatch(props.row.i)"
               @input="e=>updateMatch(e,props.row.i)"
             />
@@ -394,7 +417,7 @@ export default {
       >
         <Banner
           v-if="value.type !== LOGGING.CLUSTER_FLOW"
-          label="Output must reside in same namespace as the flow."
+          :label="t('logging.flow.outputs.sameNamespaceError')"
           color="info"
         />
         <LabeledSelect
@@ -457,7 +480,7 @@ export default {
   </CruResource>
   <Banner
     v-else
-    label="This resource contains a match configuration that the form editor does not support.  Please use YAML edit."
+    :label="t('logging.flow.matches.unsupportedConfig')"
     color="error"
   />
 </template>

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

@@ -0,0 +1,107 @@
+<script lang="ts">
+import Vue, { PropType, VueConstructor } from 'vue';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import CruResource from '@shell/components/CruResource.vue';
+import PodSecurityAdmission from '@shell/components/PodSecurityAdmission.vue';
+import Loading from '@shell/components/Loading.vue';
+import NameNsDescription from '@shell/components/form/NameNsDescription.vue';
+import { PSA, PSAConfig, PSADefaults, PSAExemptions } from '@shell/types/pod-security-admission';
+import { PSADimensions } from '@shell/config/pod-security-admission';
+import { MANAGEMENT } from '@shell/config/types';
+
+export default (Vue as VueConstructor<Vue & InstanceType<typeof CreateEditView>>).extend({
+  mixins:     [CreateEditView],
+  components: {
+    CruResource,
+    Loading,
+    NameNsDescription,
+    PodSecurityAdmission,
+  },
+
+  async fetch() {
+    await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PSA });
+  },
+
+  props: {
+    value: {
+      type:     Object as PropType<PSA>,
+      required: true,
+      default:  () => ({}) as PSA
+    },
+
+    mode: {
+      type:     String,
+      required: true,
+    }
+  },
+  computed: {
+    /**
+     * Get or initialize exemptions if none
+     */
+    exemptions(): PSAExemptions {
+      return this.value?.configuration?.exemptions || {};
+    },
+
+    /**
+     * Get or initialize defaults labels if none
+     */
+    defaults(): PSADefaults {
+      return this.value?.configuration?.defaults || {};
+    },
+  },
+
+  methods: {
+    /**
+     * Replace exemption with new values
+     */
+    setExemptions(exemptions: PSAExemptions) {
+      this.value.configuration.exemptions = exemptions;
+    },
+
+    /**
+     * Replace defaults with new values
+     */
+    setDefaults(labels: PSADefaults) {
+      this.value.configuration.defaults = labels;
+    },
+  },
+
+  created() {
+    // Initialize configuration if none, as default value resource case
+    if (!this.value.configuration) {
+      this.value.configuration = {
+        defaults:   {},
+        exemptions: Object.assign({}, ...PSADimensions.map(dimension => ({ [dimension]: [] }))),
+      } as PSAConfig;
+    }
+  }
+});
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <CruResource
+    v-else
+    :mode="mode"
+    :resource="value"
+    :errors="errors"
+    :cancel-event="true"
+    @error="setErrors"
+    @finish="save"
+    @cancel="done()"
+  >
+    <NameNsDescription
+      :value="value"
+      :namespaced="false"
+      :mode="mode"
+    />
+    <PodSecurityAdmission
+      :labels="defaults"
+      :labels-always-active="true"
+      :exemptions="exemptions"
+      :mode="mode"
+      @updateLabels="setDefaults($event)"
+      @updateExemptions="setExemptions($event)"
+    />
+  </CruResource>
+</template>

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

@@ -16,7 +16,7 @@ import { NAME } from '@shell/config/product/explorer';
 import { PROJECT_ID, _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
 import ProjectMembershipEditor from '@shell/components/form/Members/ProjectMembershipEditor';
 import { canViewProjectMembershipEditor } from '@shell/components/form/Members/ProjectMembershipEditor.vue';
-import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { Banner } from '@components/Banner';
 
 export default {
@@ -146,6 +146,13 @@ export default {
         } else if (this.mode === _EDIT) {
           if (this.canEditProject) {
             await this.value.save(true);
+
+            // We updated the Norman resource - re-fetch the Steve resource so we know it is definitely updated in the store
+            await this.$store.dispatch('management/find', {
+              type: MANAGEMENT.PROJECT,
+              id:   this.value.id,
+              opt:  { force: true }
+            });
           }
 
           // // we allow users with permissions for projectroletemplatebindings to be able to manage members on projects