@rancher/shell 0.1.0 → 0.1.1

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

@@ -1,7 +1,7 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import SecretSelector from '@shell/components/form/SecretSelector';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 
 export default {
   components: {

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

@@ -1,5 +1,5 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import SecretSelector from '@shell/components/form/SecretSelector';
 
 export default {

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

@@ -1,6 +1,6 @@
 <script>
-import Checkbox from '@shell/components/form/Checkbox';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { Checkbox } from '@components/Form/Checkbox';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import SecretSelector from '@shell/components/form/SecretSelector';
 
 export default {

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

@@ -1,8 +1,8 @@
 <script>
 import SecretSelector from '@shell/components/form/SecretSelector';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 import { protocol, updatePort } from './utils';
 
 export default {

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

@@ -1,5 +1,5 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import SecretSelector from '@shell/components/form/SecretSelector';
 
 export default {

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

@@ -1,6 +1,6 @@
 <script>
-import Checkbox from '@shell/components/form/Checkbox';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { Checkbox } from '@components/Form/Checkbox';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import SecretSelector from '@shell/components/form/SecretSelector';
 

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

@@ -1,6 +1,7 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
+import Banner from '@components/Banner/Banner.vue';
 import { MANAGEMENT } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
 import ClusterPermissionsEditor from '@shell/components/form/Members/ClusterPermissionsEditor';
@@ -8,6 +9,7 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 
 export default {
   components: {
+    Banner,
     ClusterPermissionsEditor,
     CruResource,
     Loading,

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

@@ -0,0 +1,71 @@
+<script>
+import createEditView from '@shell/mixins/create-edit-view';
+import CruResource from '@shell/components/CruResource';
+import Loading from '@shell/components/Loading';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { NORMAN } from '@shell/config/types';
+export default {
+  components: {
+    CruResource,
+    Loading,
+    LabeledInput
+  },
+  mixins: [createEditView],
+  props:  {
+    value: {
+      type:     Object,
+      required: true,
+    },
+  },
+  async fetch() {
+    // we need this to populate the NORMAN node... getNorman
+    await this.$store.dispatch('rancher/findAll', { type: NORMAN.NODE });
+  },
+  data() {
+    return {
+      name:    '',
+      loading: true
+    };
+  },
+  methods: {
+    async save(saveCb) {
+      try {
+        this.value.norman.name = this.name;
+        await this.value.norman.save();
+
+        saveCb(true);
+
+        this.done();
+      } catch (error) {
+        this.errors.push(error);
+        saveCb(false);
+      }
+    },
+  },
+  mounted() {
+    this.name = this.value.spec.displayName;
+  },
+  computed: {
+    doneLocationOverride() {
+      return this.value.doneOverride;
+    },
+  },
+};
+</script>
+
+<template>
+  <Loading v-if="!value" />
+  <CruResource
+    v-else
+    :resource="value"
+    :mode="mode"
+    :errors="errors"
+    @finish="save"
+  >
+    <LabeledInput
+      v-model="name"
+      :label="t('managementNode.customName')"
+      :mode="mode"
+    />
+  </CruResource>
+</template>

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

@@ -2,6 +2,7 @@
 import { mapGetters } from 'vuex';
 import ContainerResourceLimit from '@shell/components/ContainerResourceLimit';
 import CreateEditView from '@shell/mixins/create-edit-view';
+import FormValidation from '@shell/mixins/form-validation';
 import CruResource from '@shell/components/CruResource';
 import Labels from '@shell/components/form/Labels';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
@@ -16,14 +17,14 @@ 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 { NAME as HARVESTER } from '@shell/config/product/harvester';
-import Banner from '@shell/components/Banner';
+import { Banner } from '@components/Banner';
 
 export default {
   components: {
     ContainerResourceLimit, CruResource, Labels, LabeledSelect, NameNsDescription, ProjectMembershipEditor, ResourceQuota, Tabbed, Tab, Banner
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
   async fetch() {
     if ( this.$store.getters['management/canList'](MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE) ) {
       this.allPSPs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE });
@@ -49,7 +50,8 @@ export default {
       membershipHasOwner:         false,
       membershipUpdate:   {},
       HARVESTER_TYPES,
-      RANCHER_TYPES
+      RANCHER_TYPES,
+      fvFormRuleSets:       [{ path: 'spec.displayName', rules: ['required'] }],
     };
   },
   computed: {
@@ -143,7 +145,7 @@ export default {
           }
         } else if (this.mode === _EDIT) {
           if (this.canEditProject) {
-            await this.value.save();
+            await this.value.save(true);
           }
 
           // // we allow users with permissions for projectroletemplatebindings to be able to manage members on projects
@@ -168,6 +170,17 @@ export default {
 
     onMembershipUpdate(update) {
       this.$set(this, 'membershipUpdate', update);
+    },
+
+    removeQuota(key) {
+      ['resourceQuota', 'namespaceDefaultResourceQuota'].forEach((specProp) => {
+        if (this.value?.spec[specProp]?.limit && this.value?.spec[specProp]?.limit[key]) {
+          delete this.value?.spec[specProp]?.limit[key];
+        }
+        if (this.value?.spec[specProp]?.usedLimit && this.value?.spec[specProp]?.usedLimit[key]) {
+          delete this.value?.spec[specProp]?.usedLimit[key];
+        }
+      });
     }
   },
 };
@@ -176,11 +189,12 @@ export default {
   <CruResource
     class="project"
     :done-route="'c-cluster-product-projectsnamespaces'"
-    :errors="errors"
+    :errors="fvUnreportedValidationErrors"
     :mode="mode"
     :resource="value"
     :subtypes="[]"
     :can-yaml="false"
+    :validation-passed="fvFormIsValid"
     @error="e=>errors = e"
     @finish="save"
     @cancel="done"
@@ -193,9 +207,10 @@ export default {
       :description-disabled="isDescriptionDisabled"
       name-key="spec.displayName"
       :normalize-name="false"
+      :rules="{ name: fvGetAndReportPathRules('spec.displayName'), namespace: [], description: [] }"
     />
-    <div class="row">
-      <div class="col span-12">
+    <div class="row mb-20">
+      <div class="col span-3">
         <LabeledSelect
           v-if="pspOptions"
           v-model="value.spec.podSecurityPolicyTemplateId"
@@ -230,7 +245,12 @@ export default {
         :label="t('project.resourceQuotas')"
         :weight="9"
       >
-        <ResourceQuota v-model="value" :mode="canEditTabElements" :types="isHarvester ? HARVESTER_TYPES : RANCHER_TYPES" />
+        <ResourceQuota
+          v-model="value"
+          :mode="canEditTabElements"
+          :types="isHarvester ? HARVESTER_TYPES : RANCHER_TYPES"
+          @remove="removeQuota"
+        />
       </Tab>
       <Tab
         name="container-default-resource-limit"
@@ -254,18 +274,3 @@ export default {
     </Tabbed>
   </CruResource>
 </template>
-
-<style lang="scss" scoped>
-.project {
-  ::v-deep {
-    .tabs {
-      min-width: 250px;
-    }
-  }
-
-  .psp {
-    position: relative;
-    top: -20px;
-  }
-}
-</style>

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

@@ -1,12 +1,12 @@
 <script>
 import CruResource from '@shell/components/CruResource';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import CreateEditView from '@shell/mixins/create-edit-view';
-import TextAreaAutoGrow from '@shell/components/form/TextAreaAutoGrow';
+import { TextAreaAutoGrow } from '@components/Form/TextArea';
 
 import { ALLOWED_SETTINGS, SETTING } from '@shell/config/settings';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { RadioGroup } from '@components/Form/Radio';
 import { setBrand } from '@shell/config/private-label';
 
 export default {
@@ -48,6 +48,9 @@ export default {
   },
 
   methods: {
+    convertToString(event) {
+      this.value.value = `${ event.target.value }`;
+    },
     saveSettings(done) {
       const t = this.$store.getters['i18n/t'];
 
@@ -130,6 +133,14 @@ export default {
           :min-height="254"
         />
       </div>
+      <div v-else-if="setting.kind === 'integer'">
+        <input
+          :value="parseInt(value.value, 10)"
+          type="number"
+          min="0"
+          @input="convertToString($event)"
+        />
+      </div>
       <div v-else>
         <LabeledInput
           v-model="value.value"

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

@@ -3,7 +3,7 @@ import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import GlobalRoleBindings from '@shell/components/GlobalRoleBindings.vue';
 import ChangePassword from '@shell/components/form/ChangePassword';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import CruResource from '@shell/components/CruResource';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { _CREATE, _EDIT } from '@shell/config/query-params';

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

@@ -36,7 +36,7 @@ export default {
 
     this.alertmanagerConfigId = alertmanagerConfigId;
     this.alertmanagerConfigResource = alertmanagerConfigResource;
-    this.alertmanagerConfigDetailRoute = alertmanagerConfigResource.getAlertmanagerConfigDetailRoute();
+    this.alertmanagerConfigDetailRoute = alertmanagerConfigResource._detailLocation;
 
     const alertmanagerConfigActions = alertmanagerConfigResource.availableActions;
     const receiverActions = alertmanagerConfigResource.getReceiverActions(alertmanagerConfigActions);
@@ -50,7 +50,7 @@ export default {
     const defaultReceiverValues = {};
     const receiverSchema = this.$store.getters['cluster/schemaFor'](MONITORING.SPOOFED.ALERTMANAGERCONFIG_RECEIVER_SPEC);
     const routeSchema = this.$store.getters['cluster/schemaFor'](MONITORING.SPOOFED.ALERTMANAGERCONFIG_ROUTE_SPEC);
-    const receiverOptions = this.value.spec.receivers.map(receiver => receiver.name);
+    const receiverOptions = (this.value?.spec?.receivers || []).map(receiver => receiver.name);
 
     return {
       actionMenuTargetElement:  null,
@@ -163,7 +163,7 @@ export default {
       const nameOfReceiverToDelete = this.selectedReceiverName;
       // Remove it from the configuration of the parent AlertmanagerConfig
       // resource.
-      const existingReceivers = this.alertmanagerConfigResource.spec.receivers;
+      const existingReceivers = this.alertmanagerConfigResource.spec.receivers || [];
       const receiversMinusDeletedItem = existingReceivers.filter((receiver) => {
         return receiver.name !== nameOfReceiverToDelete;
       });
@@ -201,7 +201,7 @@ export default {
         <ResourceTable
           :headers="receiverTableHeaders"
           :schema="receiverSchema"
-          :rows="value.spec.receivers"
+          :rows="value.spec.receivers || []"
           :get-custom-detail-link="getReceiverDetailLink"
           :table-actions="false"
           :custom-actions="value.receiverActions"

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

@@ -2,9 +2,9 @@
 import { MONITORING } from '@shell/config/types';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import Loading from '@shell/components/Loading';
-import Banner from '@shell/components/Banner';
+import { Banner } from '@components/Banner';
 import CruResource from '@shell/components/CruResource';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
@@ -148,7 +148,6 @@ export default {
       EDITOR_MODES,
       expectedFields,
       fileFound:            false,
-      receiver:             {},
       receiverTypes:        RECEIVERS_TYPES,
       suffixYaml,
       view:                 _VIEW,
@@ -156,6 +155,15 @@ export default {
     };
   },
 
+  mounted() {
+    if (this.mode === this.create) {
+      if (!this.alertmanagerConfigResource.spec.receivers) {
+        this.alertmanagerConfigResource.spec.receivers = [];
+      }
+      this.alertmanagerConfigResource.spec.receivers.push(this.value);
+    }
+  },
+
   computed: {
     editorMode() {
       if ( this.$route.query.mode === _VIEW ) {
@@ -221,20 +229,12 @@ export default {
     },
 
     redirectAfterCancel() {
-      this.$router.push(this.alertmanagerConfigResource.getAlertmanagerConfigDetailRoute());
-    },
-
-    redirectToReceiverDetail(name) {
-      this.$router.push(this.alertmanagerConfigResource.getReceiverDetailLink(name));
+      this.$router.push(this.alertmanagerConfigResource._detailLocation);
     },
 
     createAddOptions(receiverType) {
       return receiverType.addOptions.map();
     },
-
-    getReceiverDetailRoute(name) {
-      return JSON.stringify(this.alertmanagerConfigResource.getReceiverDetailLink(name));
-    }
   }
 };
 </script>
@@ -242,7 +242,7 @@ export default {
 <template>
   <CruResource
     class="receiver"
-    :done-route="getReceiverDetailRoute(value.name)"
+    :done-route="alertmanagerConfigResource._detailLocation"
     :mode="mode"
     :resource="alertmanagerConfigResource"
     :subtypes="[]"

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

@@ -1,7 +1,7 @@
 <script>
 import ArrayList from '@shell/components/form/ArrayList';
-import Banner from '@shell/components/Banner';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { Banner } from '@components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { _VIEW } from '@shell/config/query-params';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
@@ -12,7 +12,7 @@ export default {
     Banner,
     ArrayListGrouped,
     LabeledInput,
-    LabeledSelect
+    LabeledSelect,
   },
   props: {
     mode: {
@@ -21,11 +21,11 @@ export default {
     },
     value: {
       type:     Object,
-      required: true
+      required: true,
     },
     receiverOptions: {
       type:     Array,
-      required: true
+      required: true,
     },
   },
   data() {
@@ -39,16 +39,20 @@ export default {
         { label: 'Match Not Equal', value: '!=' },
         { label: 'Match Regexp', value: '=~' },
         { label: 'Match Not Regexp', value: '!~' },
-      ]
+      ],
     };
   },
-
 };
-
 </script>
 <template>
   <div>
-    <h3>Receiver <i v-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')" class="icon icon-info" /></h3>
+    <h3>
+      Receiver
+      <i
+        v-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')"
+        class="icon icon-info"
+      />
+    </h3>
     <Banner
       color="info"
       :label="t('monitoring.alertmanagerConfig.routeInfo')"
@@ -67,6 +71,10 @@ export default {
       <div class="col span-6">
         <span class="label">
           {{ t("monitoringRoute.groups.addGroupByLabel'") }}
+          <i
+            v-tooltip="t('monitoringRoute.groups.groupByTooltip')"
+            class="icon icon-info"
+          />
         </span>
         <ArrayList
           v-model="value.groupBy"
@@ -109,7 +117,7 @@ export default {
       class="mt-20"
       :mode="mode"
       :add-label="t('monitoringRoute.matching.addMatcher')"
-      :default-add-value="{matchers:[]}"
+      :default-add-value="{ matchers: [] }"
     >
       <template #default="props">
         <div class="row mt-20 mb-20">

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

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Banner from '@shell/components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Banner } from '@components/Banner';
 import SimpleSecretSelector from '@shell/components/form/SimpleSecretSelector';
 import { _VIEW } from '@shell/config/query-params';
 

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

@@ -1,6 +1,6 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Checkbox from '@shell/components/form/Checkbox';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Checkbox } from '@components/Form/Checkbox';
 import TLS from '../tls';
 import SimpleSecretSelector from '@shell/components/form/SimpleSecretSelector';
 import { _VIEW } from '@shell/config/query-params';
@@ -30,7 +30,8 @@ export default {
     return {
       view:                          _VIEW,
       initialAuthPasswordSecretName:  this.value?.authPassword?.name ? this.value.authPassword.name : '',
-      initialAuthPasswordSecretKey:  this.value.authPassword?.key ? this.value.authPassword.key : ''
+      initialAuthPasswordSecretKey:  this.value.authPassword?.key ? this.value.authPassword.key : '',
+      none:                          '__[[NONE]]__',
     };
   },
 
@@ -39,10 +40,14 @@ export default {
       const existingKey = this.value.authPassword?.key || '';
 
       if (this.value.authPassword) {
-        this.value.authPassword = {
-          key: existingKey,
-          name
-        };
+        if (name === this.none) {
+          delete this.value.authPassword;
+        } else {
+          this.value.authPassword = {
+            key: existingKey,
+            name,
+          };
+        }
       } else {
         this.value['authPassword'] = {
           key: '',

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

@@ -1,8 +1,8 @@
 <script>
 import ArrayList from '@shell/components/form/ArrayList';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import Select from '@shell/components/form/Select';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 import InputWithSelect from '@shell/components/form/InputWithSelect';
 import SimpleSecretSelector from '@shell/components/form/SimpleSecretSelector';
 import { _VIEW } from '@shell/config/query-params';
@@ -85,7 +85,8 @@ export default {
       TYPES,
       view:                          _VIEW,
       initialApiKeySecretName:  this.value?.apiKey?.name ? this.value.apiKey.name : '',
-      initialApiKeySecretKey:  this.value?.apiKey?.key ? this.value.apiKey.key : ''
+      initialApiKeySecretKey:  this.value?.apiKey?.key ? this.value.apiKey.key : '',
+      none:                    '__[[NONE]]__',
     };
   },
 
@@ -126,10 +127,14 @@ export default {
       const existingKey = this.value.apiKey?.key || '';
 
       if (this.value.apiKey) {
-        this.value.apiKey = {
-          key: existingKey,
-          name
-        };
+        if (name === this.none) {
+          delete this.value.apiKey;
+        } else {
+          this.value.apiKey = {
+            key: existingKey,
+            name,
+          };
+        }
       } else {
         this.value['apiKey'] = {
           key: '',

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

@@ -1,7 +1,7 @@
 <script>
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 import SimpleSecretSelector from '@shell/components/form/SimpleSecretSelector';
 import { _VIEW } from '@shell/config/query-params';
 
@@ -42,7 +42,8 @@ export default {
       initialRoutingKeySecretName: this.value.routingKey?.name || '',
       initialServiceKeySecretKey:  this.value.serviceKey?.key || '',
       initialServiceKeySecretName: this.value.serviceKey?.name || '',
-      view:                        _VIEW
+      view:                        _VIEW,
+      none:                        '__[[NONE]]__',
     };
   },
   watch: {
@@ -57,10 +58,14 @@ export default {
       const existingKey = this.value.routingKey?.key || '';
 
       if (this.value.routingKey) {
-        this.value.routingKey = {
-          key: existingKey,
-          name
-        };
+        if (name === this.none) {
+          delete this.value.routingKey;
+        } else {
+          this.value.routingKey = {
+            key: existingKey,
+            name,
+          };
+        }
       } else {
         this.value['routingKey'] = {
           key: '',
@@ -87,10 +92,14 @@ export default {
       const existingKey = this.value.serviceKey?.key || '';
 
       if (this.value.serviceKey) {
-        this.value.serviceKey = {
-          key: existingKey,
-          name
-        };
+        if (name === this.none) {
+          delete this.value.serviceKey;
+        } else {
+          this.value.serviceKey = {
+            key: existingKey,
+            name,
+          };
+        }
       } else {
         this.value['serviceKey'] = {
           key: '',