@rancher/shell 0.3.9 → 0.3.11

package/core/plugin-routes.ts

@@ -153,20 +153,39 @@ export class PluginRoutes {
     // Using the existing router and adding routes to it will force nuxt middleware (specifically authenticated on default layout) to
     // execute many times (nuxt middleware boils down to router.beforeEach). This issue was seen refreshing in a harvester cluster with a
     // dynamically loaded cluster
-    const newRouter: Router = new Router({
-      mode:   'history',
-      routes: allRoutes
-    });
 
+    const pluginRoutesWithParents: any[] = [];
+    const orderedPluginRoutes: any[] = [];
+
+    // separate plugin routes that have parent and not
     newRoutes.forEach((r: any) => {
+      let foundParentRoute;
+
       if (r.parent) {
-        newRouter.addRoute(r.parent, r.route);
-      } else {
-        newRouter.addRoute(r.route);
+        foundParentRoute = allRoutes.find(route => route.name === r.parent);
+
+        if (foundParentRoute) {
+          pluginRoutesWithParents.push(r);
+        }
       }
+
+      if (!foundParentRoute) {
+        orderedPluginRoutes.push(r.route);
+      }
+
       this.pluginRoutes.push(r.route);
     });
 
+    const newRouter: Router = new Router({
+      mode:   'history',
+      routes: [...orderedPluginRoutes, ...allRoutes]
+    });
+
+    // handle plugin routes with parent
+    pluginRoutesWithParents.forEach((r: any) => {
+      newRouter.addRoute(r.parent, r.route);
+    });
+
     // Typing is incorrect
     (this.router as any).matcher = (newRouter as any).matcher;
   }

package/core/plugins-loader.js

@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import $ from 'jquery';
 import JSZip from 'jszip';
 import jsyaml from 'js-yaml';
 
@@ -25,6 +26,7 @@ export default function({
     window.Vue = Vue;
 
     // Global libraries - allows us to externalise these to reduce package bundle size
+    window.$ = $;
     window.__jszip = JSZip;
     window.__jsyaml = jsyaml;
   }

package/detail/helm.cattle.io.projecthelmchart.vue

@@ -43,8 +43,8 @@ export default {
       };
     },
     monitoringNamespace() {
-      // arbitrarily picking the alertmanagerURL here, they're all going to be the same.
-      return this.pullKeyFromUrl(this.relativeDashboardValues.alertmanagerURL, 'namespaces');
+      // picking the prometheusURL here, they're all going to be the same, but alertmanager and grafana can be deactivated
+      return this.pullKeyFromUrl(this.relativeDashboardValues.prometheusURL, 'namespaces');
     },
     alertServiceEndpoint() {
       return this.pullServiceEndpointFromUrl(this.relativeDashboardValues.alertmanagerURL);

package/detail/provisioning.cattle.io.cluster.vue

@@ -751,7 +751,7 @@ export default {
                 />
                 <template v-if="value.hasLink('update') && group.ref.showScalePool">
                   <button
-                    v-tooltip="t('node.list.scaleDown')"
+                    v-clean-tooltip="t('node.list.scaleDown')"
                     :disabled="!group.ref.canScaleDownPool()"
                     type="button"
                     class="btn btn-sm role-secondary"
@@ -760,7 +760,7 @@ export default {
                     <i class="icon icon-sm icon-minus" />
                   </button>
                   <button
-                    v-tooltip="t('node.list.scaleUp')"
+                    v-clean-tooltip="t('node.list.scaleUp')"
                     :disabled="!group.ref.canScaleUpPool()"
                     type="button"
                     class="btn btn-sm role-secondary ml-10"
@@ -836,7 +836,7 @@ export default {
                 />
                 <template v-if="group.ref.hasLink('update')">
                   <button
-                    v-tooltip="t('node.list.scaleDown')"
+                    v-clean-tooltip="t('node.list.scaleDown')"
                     :disabled="group.ref.spec.quantity < 2"
                     type="button"
                     class="btn btn-sm role-secondary"
@@ -845,7 +845,7 @@ export default {
                     <i class="icon icon-sm icon-minus" />
                   </button>
                   <button
-                    v-tooltip="t('node.list.scaleUp')"
+                    v-clean-tooltip="t('node.list.scaleUp')"
                     type="button"
                     class="btn btn-sm role-secondary ml-10"
                     @click="group.ref.scalePool(1)"

package/edit/cis.cattle.io.clusterscan.vue

@@ -266,7 +266,7 @@ export default {
           class="col span-6"
         >
           <span>{{ t('cis.scoreWarning.label') }}</span> <i
-            v-tooltip="t('cis.scoreWarning.protip')"
+            v-clean-tooltip="t('cis.scoreWarning.protip')"
             class="icon icon-info"
           />
           <RadioGroup

package/edit/k8s.cni.cncf.io.networkattachmentdefinition.vue

@@ -2,24 +2,20 @@
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import { RadioGroup } from '@components/Form/Radio';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
+import KeyValue from '@shell/components/form/KeyValue';
 
-import { HCI } from '@shell/config/labels-annotations';
 import CreateEditView from '@shell/mixins/create-edit-view';
 
-const AUTO = 'auto';
-const MANUAL = 'manual';
+import { set } from '@shell/utils/object';
 
 export default {
   components: {
     Tab,
     Tabbed,
     CruResource,
-    LabeledInput,
     NameNsDescription,
-    RadioGroup,
+    KeyValue,
   },
 
   mixins: [CreateEditView],
@@ -31,83 +27,24 @@ export default {
     }
   },
 
-  data() {
-    const config = JSON.parse(this.value.spec.config);
-    const annotations = this.value?.metadata?.annotations || {};
-    const layer3Network = JSON.parse(annotations[HCI.NETWORK_ROUTE] || '{}');
-
-    return {
-      config,
-      type:          'L2VlanNetwork',
-      layer3Network: {
-        mode:         layer3Network.mode || AUTO,
-        serverIPAddr: layer3Network.serverIPAddr || '',
-        cidr:         layer3Network.cidr || '',
-        gateway:      layer3Network.gateway || '',
-      },
-    };
-  },
-
   created() {
     if (this.registerBeforeHook) {
-      this.registerBeforeHook(this.updateBeforeSave);
+      this.registerBeforeHook(this.willSave);
     }
   },
 
-  computed: {
-    modeOptions() {
-      return [{
-        label: this.t('harvester.network.layer3Network.mode.auto'),
-        value: AUTO,
-      }, {
-        label: this.t('harvester.network.layer3Network.mode.manual'),
-        value: MANUAL,
-      }];
-    },
+  data() {
+    const config = JSON.parse(this.value?.spec?.config || '{}');
+
+    return { config };
   },
 
   methods: {
-    async saveNetwork(buttonCb) {
-      const errors = [];
-
-      if (!this.config.vlan) {
-        errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('tableHeaders.networkVlan') }));
-      }
-
-      if (this.layer3Network.mode === MANUAL) {
-        if (!this.layer3Network.gateway) {
-          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.layer3Network.gateway.label') }));
-        }
-        if (!this.layer3Network.cidr) {
-          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.layer3Network.cidr.label') }));
-        }
-      }
-
-      if (errors.length > 0) {
-        buttonCb(false);
-        this.errors = errors;
-
-        return false;
-      }
-
-      this.value.setAnnotation(HCI.NETWORK_ROUTE, JSON.stringify(this.layer3Network));
+    willSave() {
+      set(this.value, 'spec.config', JSON.stringify(this.config));
 
-      await this.save(buttonCb);
+      return Promise.resolve();
     },
-
-    input(neu) {
-      const pattern = /^([1-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-9][0-4])$/;
-
-      if (!pattern.test(neu) && neu !== '') {
-        this.config.vlan = neu > 4094 ? 4094 : 1;
-      }
-    },
-
-    updateBeforeSave() {
-      this.value.setLabel(HCI.NETWORK_TYPE, this.type);
-      this.config.name = this.value.metadata.name;
-      this.value.spec.config = JSON.stringify(this.config);
-    }
   }
 };
 </script>
@@ -119,7 +56,7 @@ export default {
     :mode="mode"
     :errors="errors"
     :apply-hooks="applyHooks"
-    @finish="saveNetwork"
+    @finish="save"
   >
     <NameNsDescription
       ref="nd"
@@ -134,86 +71,19 @@ export default {
     >
       <Tab
         name="basics"
-        :label="t('harvester.network.tabs.basics')"
+        :label="t('networkAttachmentDefinition.tabs.config')"
         :weight="99"
         class="bordered-table"
       >
-        <LabeledInput
-          v-model="type"
-          class="mb-20"
-          :label="t('harvester.fields.type')"
-          :disabled="true"
-          required
-        />
-
-        <LabeledInput
-          v-model.number="config.vlan"
-          v-int-number
-          class="mb-20"
-          required
-          type="number"
-          placeholder="e.g. 1-4094"
-          :label="t('tableHeaders.networkVlan')"
+        <KeyValue
+          key="config"
+          v-model="config"
           :mode="mode"
-          @input="input"
+          :read-allowed="false"
+          :value-multiline="false"
+          :initialEmptyRow="true"
         />
       </Tab>
-      <Tab
-        name="layer3Network"
-        :label="t('harvester.network.tabs.layer3Network')"
-        :weight="98"
-        class="bordered-table"
-      >
-        <div class="row mt-10">
-          <div class="col span-6">
-            <RadioGroup
-              v-model="layer3Network.mode"
-              name="layer3NetworkMode"
-              :label="t('harvester.network.layer3Network.mode.label')"
-              :mode="mode"
-              :options="modeOptions"
-            />
-          </div>
-        </div>
-        <div
-          v-if="layer3Network.mode === 'auto'"
-          class="row mt-10"
-        >
-          <div class="col span-6">
-            <LabeledInput
-              v-model="layer3Network.serverIPAddr"
-              class="mb-20"
-              :label="t('harvester.network.layer3Network.serverIPAddr.label')"
-              :mode="mode"
-            />
-          </div>
-        </div>
-        <div
-          v-else
-          class="row mt-10"
-        >
-          <div class="col span-6">
-            <LabeledInput
-              v-model="layer3Network.cidr"
-              class="mb-20"
-              :label="t('harvester.network.layer3Network.cidr.label')"
-              :placeholder="t('harvester.network.layer3Network.cidr.placeholder')"
-              :mode="mode"
-              required
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model="layer3Network.gateway"
-              class="mb-20"
-              :label="t('harvester.network.layer3Network.gateway.label')"
-              :placeholder="t('harvester.network.layer3Network.gateway.placeholder')"
-              :mode="mode"
-              required
-            />
-          </div>
-        </div>
-      </Tab>
     </Tabbed>
   </CruResource>
 </template>

package/edit/logging-flow/index.vue

@@ -433,7 +433,7 @@ export default {
           <template #selected-option="option">
             <i
               v-if="isTag(clusterOutputChoices, option)"
-              v-tooltip="t('logging.flow.clusterOutputs.doesntExistTooltip')"
+              v-clean-tooltip="t('logging.flow.clusterOutputs.doesntExistTooltip')"
               class="icon icon-info status-icon text-warning"
             />
             {{ option.label }}
@@ -454,7 +454,7 @@ export default {
           <template #selected-option="option">
             <i
               v-if="isTag(outputChoices, option)"
-              v-tooltip="t('logging.flow.outputs.doesntExistTooltip')"
+              v-clean-tooltip="t('logging.flow.outputs.doesntExistTooltip')"
               class="icon icon-info status-icon text-warning"
             />
             {{ option.label }}

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

@@ -45,6 +45,11 @@ export default {
       if (typeof this.value.ssl_version === 'undefined') {
         this.$set(this.value, 'ssl_version', sslVersions[0]);
       }
+
+      // Suppress type name by default
+      if (typeof this.value.suppress_type_name === 'undefined') {
+        this.$set(this.value, 'suppress_type_name', true);
+      }
     }
 
     return { protocolOptions: protocol, sslVersions };
@@ -208,6 +213,13 @@ export default {
           :disabled="disabled"
           :mode="mode"
         />
+        <Checkbox
+          v-model="value.suppress_type_name"
+          :label="t('logging.elasticsearch.suppressTypeName.label')"
+          :tooltip="t('logging.elasticsearch.suppressTypeName.elasticSearchTips')"
+          :disabled="disabled"
+          :mode="mode"
+        />
       </div>
     </div>
   </div>

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

@@ -45,6 +45,11 @@ export default {
       if (typeof this.value.ssl_version === 'undefined') {
         this.$set(this.value, 'ssl_version', sslVersions[0]);
       }
+
+      // Suppress type name by default
+      if (typeof this.value.suppress_type_name === 'undefined') {
+        this.$set(this.value, 'suppress_type_name', true);
+      }
     }
 
     return { protocolOptions: protocol, sslVersions };
@@ -199,6 +204,13 @@ export default {
           :disabled="disabled"
           :mode="mode"
         />
+        <Checkbox
+          v-model="value.suppress_type_name"
+          :label="t('logging.elasticsearch.suppressTypeName.label')"
+          :tooltip="t('logging.elasticsearch.suppressTypeName.openSearchTips')"
+          :disabled="disabled"
+          :mode="mode"
+        />
       </div>
     </div>
   </div>

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

@@ -29,6 +29,11 @@ export default {
     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 });
     }
+
+    // User can only change the PSP if the user has permissions to see the binding schema for PSP Templates
+    const pspBindingSchema = this.$store.getters['management/schemaFor'](MANAGEMENT.PSP_TEMPLATE_BINDING);
+
+    this.canEditPSPBindings = !!pspBindingSchema;
   },
   data() {
     this.$set(this.value, 'spec', this.value.spec || {});
@@ -52,6 +57,7 @@ export default {
       HARVESTER_TYPES,
       RANCHER_TYPES,
       fvFormRuleSets:     [{ path: 'spec.displayName', rules: ['required'] }],
+      canEditPSPBindings: true,
     };
   },
   computed: {
@@ -225,6 +231,7 @@ export default {
           class="psp"
           :mode="mode"
           :options="pspOptions"
+          :disabled="!canEditPSPBindings"
           :label="t('project.psp.label')"
         />
       </div>

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

@@ -236,7 +236,7 @@ export default {
                 {{ t('monitoring.receiver.addReceiver') }}
                 <i
                   v-if="mode === create"
-                  v-tooltip="t('monitoring.alertmanagerConfig.disabledReceiverButton')"
+                  v-clean-tooltip="t('monitoring.alertmanagerConfig.disabledReceiverButton')"
                   class="icon icon-info"
                 />
               </button>

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

@@ -49,7 +49,7 @@ export default {
     <h3>
       Receiver
       <i
-        v-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')"
+        v-clean-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')"
         class="icon icon-info"
       />
     </h3>
@@ -72,7 +72,7 @@ export default {
         <span class="label">
           {{ t("monitoringRoute.groups.addGroupByLabel'") }}
           <i
-            v-tooltip="t('monitoringRoute.groups.groupByTooltip')"
+            v-clean-tooltip="t('monitoringRoute.groups.groupByTooltip')"
             class="icon icon-info"
           />
         </span>

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

@@ -33,9 +33,10 @@ export default {
       expr:   '',
       for:    '0s',
       labels: {
-        severity:   'none',
-        namespace:  'default',
-        cluster_id: this.$store.getters['clusterId']
+        severity:     'none',
+        namespace:    'default',
+        cluster_id:   this.$store.getters['clusterId'],
+        cluster_name: this.$store.getters['currentCluster'].spec.displayName
       },
     };
 
@@ -95,9 +96,11 @@ export default {
           record: '',
           expr:   '',
           labels: {
-            severity:   'none',
-            namespace:  'default',
-            cluster_id: this.$store.getters['clusterId']
+            severity:     'none',
+            namespace:    'default',
+            cluster_id:   this.$store.getters['clusterId'],
+            cluster_name: this.$store.getters['currentCluster'].spec.displayName
+
           },
         });
         break;
@@ -122,7 +125,7 @@ export default {
         <t k="prometheusRule.recordingRules.label" />
         <i
           v-if="disableAddRecord"
-          v-tooltip="t('validation.prometheusRule.groups.singleAlert')"
+          v-clean-tooltip="t('validation.prometheusRule.groups.singleAlert')"
           class="icon icon-info"
         />
       </h3>
@@ -165,7 +168,7 @@ export default {
           <t k="prometheusRule.alertingRules.label" />
           <i
             v-if="disableAddAlert"
-            v-tooltip="t('validation.prometheusRule.groups.singleAlert')"
+            v-clean-tooltip="t('validation.prometheusRule.groups.singleAlert')"
             class="icon icon-info"
           />
         </h3>

package/edit/networking.k8s.io.networkpolicy/PolicyRule.vue

@@ -54,7 +54,7 @@ export default {
         <h2>
           {{ t(`networkpolicy.${type}.ruleLabel`) }}
           <i
-            v-tooltip="t(`networkpolicy.${type}.ruleHint`)"
+            v-clean-tooltip="t(`networkpolicy.${type}.ruleHint`)"
             class="icon icon-info"
           />
         </h2>
@@ -83,7 +83,7 @@ export default {
         <h2>
           {{ t('networkpolicy.rules.ports.label') }}
           <i
-            v-tooltip="t(`networkpolicy.${type}.portHint`)"
+            v-clean-tooltip="t(`networkpolicy.${type}.portHint`)"
             class="icon icon-info"
           />
         </h2>

package/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue

@@ -74,6 +74,7 @@ export default {
       POD,
       TARGET_OPTIONS,
       targetOptions:      Object.values(TARGET_OPTIONS),
+      throttleTime:       250,
     };
   },
   computed: {
@@ -139,7 +140,7 @@ export default {
         handler: throttle(function() {
           this.matchingNamespaces = this.getMatchingNamespaces();
           this.matchingPods = this.getMatchingPods();
-        }, 250, { leading: true }),
+        }, this.throttle, { leading: true }),
         immediate: true
       };
     },
@@ -213,6 +214,7 @@ export default {
       <div class="col span-6">
         <LabeledSelect
           v-model="targetType"
+          data-testid="labeled-select-type-selector"
           :mode="mode"
           :tooltip="targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? t('networkpolicy.selectors.matchingNamespacesAndPods.tooltip') : null"
           :options="selectTargetOptions"
@@ -226,6 +228,7 @@ export default {
         <div class="col span-6">
           <LabeledInput
             v-model="value[TARGET_OPTIONS.IP_BLOCK].cidr"
+            data-testid="labeled-input-ip-block-selector"
             :mode="mode"
             :placeholder="t('networkpolicy.rules.ipBlock.cidr.placeholder')"
             :label="t('networkpolicy.rules.ipBlock.cidr.label')"
@@ -277,6 +280,7 @@ export default {
         <div class="col span-12">
           <MatchExpressions
             v-model="podSelectorExpressions"
+            data-testid="match-expression-pod-selector"
             :mode="mode"
             :show-remove="false"
             :initial-empty-row="true"
@@ -297,6 +301,7 @@ export default {
         <div class="col span-12">
           <MatchExpressions
             v-model="namespaceSelectorExpressions"
+            data-testid="match-expression-namespace-selector"
             :mode="mode"
             :show-remove="false"
             :initial-empty-row="true"
@@ -329,6 +334,7 @@ export default {
         <div class="col span-11">
           <MatchExpressions
             v-model="namespaceSelectorExpressions"
+            data-testid="match-expression-namespace-and-pod-selector-ns-rule"
             :mode="mode"
             :show-add-button="false"
             :show-remove-button="false"
@@ -347,6 +353,7 @@ export default {
         <div class="col span-11">
           <MatchExpressions
             v-model="podSelectorExpressions"
+            data-testid="match-expression-namespace-and-pod-selector-pod-rule"
             :mode="mode"
             :show-add-button="false"
             :show-remove-button="false"
@@ -362,13 +369,14 @@ export default {
 
 <style lang='scss' scoped>
   .namespace-pod-rule {
+    display: table;
     width: 100px;
-    margin: 0;
+    padding: 0, 10px, 0, 0;
     text-align: center;
 
     .label {
-      display: block;
-      margin-top: 32px;
+      display:table-cell;
+      vertical-align:middle;
     }
   }
 </style>