@rancher/shell 0.3.0 → 0.3.1

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

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

@@ -57,8 +57,11 @@ export default {
       // We map the setting rulesets to use values to define validation from factory
       return this.setting?.ruleSet ? mapValues(
         keyBy(this.setting.ruleSet, 'name'),
-        ({ key, name, arg }) => {
-          return formRulesGenerator(t, key ? { key } : {})[name](arg);
+        // The validation is curried and may require the factory argument for the ValidatorFactory
+        ({ key, name, factoryArg }) => {
+          const rule = formRulesGenerator(t, key ? { key } : {})[name];
+
+          return factoryArg ? rule(factoryArg) : rule;
         }) : {};
     }
   },

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

@@ -167,7 +167,13 @@ export default {
       normanUser._name = this.form.displayName;
       normanUser.mustChangePassword = this.form.password.userChangeOnLogin;
 
-      return normanUser.save();
+      await normanUser.save();
+
+      return await this.$store.dispatch('management/find', {
+        type: MANAGEMENT.USER,
+        id:   this.value.id,
+        opt:  { force: true }
+      });
     },
 
     async updateRoles(userId) {

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

@@ -12,6 +12,7 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import jsyaml from 'js-yaml';
 import ButtonDropdown from '@shell/components/ButtonDropdown';
 import { _CREATE, _VIEW } from '@shell/config/query-params';
+import FormValidation from '@shell/mixins/form-validation';
 
 export const RECEIVERS_TYPES = [
   {
@@ -100,7 +101,7 @@ export default {
     },
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
 
   data(props) {
     const currentReceiver = {};
@@ -144,14 +145,18 @@ export default {
     }
 
     return {
-      create:        _CREATE,
+      create:         _CREATE,
       EDITOR_MODES,
       expectedFields,
-      fileFound:     false,
-      receiverTypes: RECEIVERS_TYPES,
+      fileFound:      false,
+      receiverTypes:  RECEIVERS_TYPES,
       suffixYaml,
-      view:          _VIEW,
-      yamlError:     '',
+      view:           _VIEW,
+      yamlError:      '',
+      fvFormRuleSets: [
+        { path: 'name', rules: ['required'] }
+      ],
+      fvReportedValidationPaths: ['value']
     };
   },
 
@@ -235,6 +240,14 @@ export default {
     createAddOptions(receiverType) {
       return receiverType.addOptions.map();
     },
+
+    setError(err) {
+      if (!err) {
+        this.errors = [];
+      } else {
+        this.errors = [err];
+      }
+    }
   }
 };
 </script>
@@ -249,8 +262,9 @@ export default {
     :can-yaml="true"
     :errors="errors"
     :cancel-event="true"
+    :validation-passed="fvFormIsValid"
     @error="e=>errors = e"
-    @finish="saveOverride()"
+    @finish="saveOverride"
     @cancel="redirectAfterCancel"
   >
     <div class="row mb-10">
@@ -259,7 +273,9 @@ export default {
           v-model="value.name"
           :is-disabled="receiverNameDisabled"
           :label="t('generic.name')"
+          :required="true"
           :mode="mode"
+          :rules="fvGetAndReportPathRules('name')"
         />
       </div>
     </div>

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

@@ -25,7 +25,7 @@ export default {
   },
   data() {
     this.$set(this.value, 'sendResolved', this.value.sendResolved || false);
-    this.$set(this.value, 'requireTls', this.value.requireTls || false);
+    this.$set(this.value, 'requireTLS', this.value.requireTLS || false);
 
     return {
       view:                          _VIEW,
@@ -123,7 +123,7 @@ export default {
       </div>
       <div class="col span-6">
         <Checkbox
-          v-model="value.requireTls"
+          v-model="value.requireTLS"
           :mode="mode"
           class="mt-20"
           label="Use TLS"

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

@@ -1,6 +1,5 @@
 <script>
 import has from 'lodash/has';
-
 import { Banner } from '@components/Banner';
 import { removeAt } from '@shell/utils/array';
 import { _VIEW } from '@shell/config/query-params';
@@ -34,8 +33,9 @@ export default {
       expr:   '',
       for:    '0s',
       labels: {
-        severity:  'none',
-        namespace: 'default'
+        severity:   'none',
+        namespace:  'default',
+        cluster_id: this.$store.getters['clusterId']
       },
     };
 
@@ -91,7 +91,15 @@ export default {
 
       switch (ruleType) {
       case 'record':
-        value.push({ record: '', expr: '' });
+        value.push({
+          record: '',
+          expr:   '',
+          labels: {
+            severity:   'none',
+            namespace:  'default',
+            cluster_id: this.$store.getters['clusterId']
+          },
+        });
         break;
       case 'alert':
         value.push(this.defaultAlert);
@@ -145,7 +153,7 @@ export default {
             class="btn role-link close btn-sm"
             @click="removeRule(props.i)"
           >
-            <i class="icon icon-2x icon-x" />
+            <i class="icon icon-x" />
           </button>
           <span v-else />
         </template>
@@ -194,7 +202,7 @@ export default {
             class="btn role-link close btn-sm"
             @click="removeRule(props.i)"
           >
-            <i class="icon icon-2x icon-x" />
+            <i class="icon icon-x" />
           </button>
           <span v-else />
         </template>

package/edit/namespace.vue

@@ -6,16 +6,17 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { MANAGEMENT } from '@shell/config/types';
 import { CONTAINER_DEFAULT_RESOURCE_LIMIT, PROJECT } from '@shell/config/labels-annotations';
 import ContainerResourceLimit from '@shell/components/ContainerResourceLimit';
+import PodSecurityAdmission from '@shell/components/PodSecurityAdmission';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
-import Labels from '@shell/components/form/Labels';
 import { PROJECT_ID, _VIEW } from '@shell/config/query-params';
 import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
-import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import Labels from '@shell/components/form/Labels';
 
 export default {
   components: {
@@ -25,6 +26,7 @@ export default {
     Labels,
     Loading,
     NameNsDescription,
+    PodSecurityAdmission,
     ResourceQuota,
     Tab,
     Tabbed,
@@ -101,7 +103,8 @@ export default {
 
     showContainerResourceLimit() {
       return !this.isSingleHarvester;
-    }
+    },
+
   },
 
   watch: {
@@ -222,7 +225,6 @@ export default {
         />
       </Tab>
       <Tab
-        v-if="!isView"
         name="labels-and-annotations"
         label-key="generic.labelsAndAnnotations"
         :weight="-1"
@@ -234,6 +236,18 @@ export default {
           :display-side-by-side="false"
         />
       </Tab>
+      <Tab
+        name="pod-security-admission"
+        label-key="podSecurityAdmission.name"
+        :label="t('podSecurityAdmission.name')"
+      >
+        <PodSecurityAdmission
+          :labels="value.labels"
+          :mode="mode"
+          labels-prefix="pod-security.kubernetes.io/"
+          @updateLabels="value.setLabels($event)"
+        />
+      </Tab>
     </Tabbed>
     <MoveModal v-if="projects" />
   </CruResource>

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

@@ -102,6 +102,7 @@ export default {
         :value="hosts"
         :add-label="t('ingress.certificates.addHost')"
         :rules="rules.host"
+        :initial-empty-row="true"
         @input="onHostsInput"
       />
     </div>

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

@@ -37,12 +37,13 @@ export default {
   },
   methods: {
     update(e) {
-      this.ingressClassName = e && typeof e === 'object' ? e.value : e;
-
-      if (this.ingressClassName) {
-        set(this.value, 'spec.ingressClassName', this.ingressClassName);
-      } else {
+      if (!e || e.label === this.t('generic.none')) {
         remove(this.value, 'spec.ingressClassName');
+        this.ingressClassName = '';
+      } else {
+        // when a user manually types an ingress class name, the event emitted has a 'label' but no 'value'
+        this.ingressClassName = e.value ? e.value : e.label;
+        set(this.value, 'spec.ingressClassName', this.ingressClassName);
       }
     }
   }
@@ -53,11 +54,12 @@ export default {
     <LabeledSelect
       v-model="ingressClassName"
       :taggable="true"
+      :searchable="true"
       :mode="mode"
       :label="t('ingress.ingressClass.label')"
       :options="ingressClassOptions"
       option-label="label"
-      @input="update"
+      @selecting="update"
     />
   </div>
 </template>

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

@@ -66,7 +66,11 @@ export default {
       return isValueAnOption ? null : 'warning';
     },
     serviceTargetTooltip() {
-      return this.serviceTargetStatus === 'warning' ? this.t('ingress.rules.target.doesntExist') : null;
+      if (this.serviceTargetStatus === 'warning' ) {
+        return this.t('ingress.rules.target.doesntExist');
+      }
+
+      return this.t('ingress.rules.target.tooltip');
     },
   },
   created() {
@@ -178,17 +182,19 @@ export default {
   </div>
 </template>
 <style lang="scss" scoped>
+$row-height: 40px;
+
 .labeled-input ::v-deep, ::v-deep .labeled-input {
   padding: 0 !important;
   height: 100%;
   input.no-label {
-    height: calc($input-height - 2px);
+    height: calc($row-height - 2px);
     padding: 10px;
   }
 }
 .rule-path ::v-deep {
-  .col {
-    height: $input-height;
+  .col, INPUT {
+    height: $row-height;
   }
 
   .unlabeled-select {
@@ -202,7 +208,7 @@ export default {
   }
 
   &, .input-container {
-    height: $input-height;
+    height: $row-height;
   }
 
   .input-container .in-input.unlabeled-select {
@@ -210,7 +216,7 @@ export default {
   }
 
   button {
-    line-height: 40px;
+    line-height: $row-height;
   }
 
   .v-select INPUT {

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

@@ -44,11 +44,11 @@ export default {
     }
   },
   async fetch() {
-    const ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
+    this.ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
     const hash = await allHash({
       secrets:        this.$store.dispatch('cluster/findAll', { type: SECRET }),
       services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
-      ingressClasses: ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
+      ingressClasses: this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
     });
 
     this.allServices = hash.services;
@@ -57,10 +57,11 @@ export default {
   },
   data() {
     return {
-      allSecrets:        [],
-      allServices:       [],
-      allIngressClasses: [],
-      fvFormRuleSets:    [
+      ingressClassSchema: null,
+      allSecrets:         [],
+      allServices:        [],
+      allIngressClasses:  [],
+      fvFormRuleSets:     [
         {
           path: 'metadata.name', rules: ['required', 'hostname'], translationKey: 'nameNsDescription.name.label'
         },
@@ -197,6 +198,7 @@ export default {
     :subtypes="[]"
     :validation-passed="fvFormIsValid"
     :errors="fvUnreportedValidationErrors"
+    :description="t('ingress.description')"
     @error="e=>errors = e"
     @finish="save"
     @cancel="done"