dashboard-shell-shell 1.0.122 → 1.0.1000000081

package/edit/cloudcredential.vue

@@ -100,6 +100,30 @@ export default {
   computed: {
     rke2Enabled: mapFeature(RKE2_FEATURE),
 
+    hasCustomCloudCredentialComponent() {
+      const driverName = this.driverName;
+
+      return this.$store.getters['type-map/hasCustomCloudCredentialComponent'](driverName);
+    },
+
+    cloudCredentialComponent() {
+      const driverName = this.driverName;
+
+      return this.$store.getters['type-map/importCloudCredential'](driverName);
+    },
+
+    genericCloudCredentialComponent() {
+      return this.$store.getters['type-map/importCloudCredential']('generic');
+    },
+
+    cloudComponent() {
+      if (this.hasCustomCloudCredentialComponent) {
+        return this.cloudCredentialComponent;
+      }
+
+      return this.genericCloudCredentialComponent;
+    },
+
     validationPassed() {
       return this.credCustomComponentValidation && this.nameRequiredValidation;
     },
@@ -112,14 +136,6 @@ export default {
       return this.value?.provider;
     },
 
-    cloudComponent() {
-      if (this.$store.getters['type-map/hasCustomCloudCredentialComponent'](this.driverName)) {
-        return this.$store.getters['type-map/importCloudCredential'](this.driverName);
-      }
-
-      return this.$store.getters['type-map/importCloudCredential']('generic');
-    },
-
     // array of id, label, description, initials for type selection step
     secretSubTypes() {
       const out = [];
@@ -194,7 +210,6 @@ export default {
   },
 
   methods: {
-
     createValidationChanged(passed) {
       this.credCustomComponentValidation = passed;
     },

package/edit/fleet.cattle.io.clustergroup.vue

@@ -149,14 +149,16 @@ export default {
       :namespace-type="FLEET_WORKSPACE"
       @update:value="$emit('input', $event)"
     />
-
-    <h2 v-t="'fleet.clusterGroup.selector.label'" />
     <MatchExpressions
       :mode="mode"
       :value="expressions"
       :show-remove="false"
       @update:value="matchChanged($event)"
-    />
+    >
+      <template #header>
+        <h2 v-t="'fleet.clusterGroup.selector.label'" />
+      </template>
+    </MatchExpressions>
     <Banner
       v-if="matchingClusters"
       :color="(matchingClusters.isNone || matchingClusters.isAll ? 'warning' : 'success')"

package/edit/fleet.cattle.io.gitrepo.vue

@@ -103,6 +103,7 @@ export default {
     if (!pollingInterval) {
       if (this.realMode === _CREATE) {
         pollingInterval = DEFAULT_POLLING_INTERVAL;
+        this.value.spec.pollingInterval = this.durationSeconds(pollingInterval);
       } else if (this.realMode === _EDIT || this.realMode === _VIEW) {
         pollingInterval = MINIMUM_POLLING_INTERVAL;
       }
@@ -658,6 +659,7 @@ export default {
         :initial-empty-row="false"
         :value-placeholder="t('fleet.gitRepo.paths.placeholder')"
         :add-label="t('fleet.gitRepo.paths.addLabel')"
+        :a11y-label="t('fleet.gitRepo.paths.ariaLabel')"
         :add-icon="'icon-plus'"
         :protip="t('fleet.gitRepo.paths.empty')"
       />

package/edit/logging-flow/Match.vue

@@ -124,7 +124,7 @@ export default {
         <div class="row">
           <div class="col span-12">
             <Select
-              v-model="value.namespaces"
+              v-model:value="value.namespaces"
               class="lg"
               :options="namespaces"
               :placeholder="t('logging.flow.matches.namespaces.placeholder')"

package/edit/logging.banzaicloud.io.output/__tests__/logging.banzaicloud.io.output.test.ts

@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils';
 import Banzai from '@shell/edit/logging.banzaicloud.io.output/index.vue';
+import { createStore } from 'vuex';
 
 const outputSchema = {
   id:    'logging.banzaicloud.io.output',
@@ -109,16 +110,26 @@ describe('view: logging.banzaicloud.io.output', () => {
     ['http://localhost:3100', []],
     ['not a proper URL', ['logging.loki.urlInvalid']],
   ])('should validate Loki URL on save', (url, expectation) => {
+    const store = createStore({
+      getters: {
+        namespaces:          () => () => ({}),
+        currentStore:        () => () => 'cluster',
+        'cluster/schemaFor': () => jest.fn()
+      }
+    });
     const wrapper = mount(Banzai, {
       data:  () => ({ selectedProvider: 'loki' }),
       props: {
         value: {
-          save: jest.fn(),
-          spec: { loki: { url } }
+          save:          jest.fn(),
+          setAnnotation: jest.fn(),
+          spec:          { loki: { url } },
+          metadata:      {},
         }
       },
       global: {
-        mocks: {
+        provide: { store },
+        mocks:   {
           $fetchState: { pending: false },
           $store:      {
             dispatch: jest.fn(),
@@ -149,16 +160,26 @@ describe('view: logging.banzaicloud.io.output', () => {
   });
 
   it('should load the default YAML data for output buffer config (from schema) in a CREATE scenario', async() => {
+    const store = createStore({
+      getters: {
+        namespaces:          () => () => ({}),
+        currentStore:        () => () => 'cluster',
+        'cluster/schemaFor': () => jest.fn()
+      }
+    });
     const wrapper = mount(Banzai, {
       data:  () => ({ selectedProvider: 'awsElasticsearch' }),
       props: {
         value: {
-          save: jest.fn(),
-          spec: {}
+          save:          jest.fn(),
+          setAnnotation: jest.fn(),
+          spec:          {},
+          metadata:      {},
         }
       },
       global: {
-        mocks: {
+        provide: { store },
+        mocks:   {
           $fetchState: { pending: false },
           $store:      {
             dispatch(arg: any) {
@@ -230,16 +251,26 @@ describe('view: logging.banzaicloud.io.output', () => {
   });
 
   it('should load current output buffer config in an EDIT scenario', async() => {
+    const store = createStore({
+      getters: {
+        namespaces:          () => () => ({}),
+        currentStore:        () => () => 'cluster',
+        'cluster/schemaFor': () => jest.fn()
+      }
+    });
     const wrapper = mount(Banzai, {
       data:  () => ({ selectedProvider: 'awsElasticsearch' }),
       props: {
         value: {
-          save: jest.fn(),
-          spec: { awsElasticsearch: { buffer: '#chunk_limit_records: int' } }
+          save:          jest.fn(),
+          setAnnotation: jest.fn(),
+          spec:          { awsElasticsearch: { buffer: '#chunk_limit_records: int' } },
+          metadata:      {}
         }
       },
       global: {
-        mocks: {
+        provide: { store },
+        mocks:   {
           $fetchState: { pending: false },
           $store:      {
             dispatch(arg: any) {

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

@@ -15,6 +15,8 @@ export default {
     ChangePassword, GlobalRoleBindings, CruResource, LabeledInput, Loading
   },
 
+  emits: ['update:mode'],
+
   mixins: [
     CreateEditView
   ],
@@ -40,6 +42,7 @@ export default {
         roles:        !showGlobalRoles,
         rolesChanged: false,
       },
+      watchOverride: false,
     };
   },
 
@@ -115,7 +118,11 @@ export default {
         this.$router.replace({ name: this.doneRoute });
         buttonDone(true);
       } catch (err) {
-        this.errors = exceptionToErrorsArray(err);
+        if (err?.message?.includes('errors due to escalation')) {
+          this.errors = [this.t('rbac.errors.escalation')];
+        } else {
+          this.errors = exceptionToErrorsArray(err);
+        }
         buttonDone(false);
       }
     },
@@ -150,7 +157,7 @@ export default {
 
       const normanUser = await this.$store.dispatch('rancher/find', {
         type: NORMAN.USER,
-        id:   this.value.id,
+        id:   this.value.id || this.user?.id,
       });
 
       // Save change of password
@@ -181,8 +188,25 @@ export default {
     },
 
     async updateRoles(userId) {
-      if (this.$refs.grb) {
+      if (!this.$refs.grb) {
+        return;
+      }
+
+      try {
         await this.$refs.grb.save(userId);
+      } catch (err) {
+        if (this.isCreate) {
+          this.watchOverride = true;
+          this.$emit(
+            'update:mode',
+            {
+              userId,
+              mode:     _EDIT,
+              resource: 'management.cattle.io.user',
+            }
+          );
+        }
+        throw err;
       }
     }
   }
@@ -255,6 +279,7 @@ export default {
         :user-id="value.id || liveValue.id"
         :mode="mode"
         :real-mode="realMode"
+        :watch-override="watchOverride"
         type="user"
         @hasChanges="validation.rolesChanged = $event"
         @canLogIn="validation.roles = $event"

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

@@ -243,14 +243,14 @@ export default {
           v-model:value="authType"
           :disabled="mode === view"
           :options="authOptions"
-          label="Auth Type"
+          label="验证类型"
           @update:value="initializeType(authOptions, authType)"
         />
       </div>
     </div>
-    <div
-      v-if="authType === 'basicAuth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basicAuth'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -265,16 +265,16 @@ export default {
         @updateSecretName="updateBasicAuthUsernameSecretName"
         @updateSecretKey="updateBasicAuthUsernameSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>
     </div>
-    <div
-      v-if="authType === 'basicAuth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basicAuth'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -289,16 +289,16 @@ export default {
         @updateSecretName="updateBasicAuthPasswordSecretName"
         @updateSecretKey="updateBasicAuthPasswordSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>
     </div>
-    <div
-      v-if="authType === 'bearerTokenSecret'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'bearerTokenSecret'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -313,9 +313,9 @@ export default {
         @updateSecretName="updateBearerTokenSecretName"
         @updateSecretKey="updateBearerTokenSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>

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

@@ -17,14 +17,14 @@ import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 // i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
-  {
-    name:  'slack',
-    label: 'monitoringReceiver.slack.label',
-    title: 'monitoringReceiver.slack.title',
-    info:  'monitoringReceiver.slack.info',
-    key:   'slackConfigs',
-    logo:  require(`@shell/assets/images/vendor/slack.svg`)
-  },
+  // {
+  //   name:  'slack',
+  //   label: 'monitoringReceiver.slack.label',
+  //   title: 'monitoringReceiver.slack.title',
+  //   info:  'monitoringReceiver.slack.info',
+  //   key:   'slackConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  // },
   {
     name:  'email',
     label: 'monitoringReceiver.email.label',
@@ -32,21 +32,21 @@ export const RECEIVERS_TYPES = [
     key:   'emailConfigs',
     logo:  require(`@shell/assets/images/vendor/email.svg`)
   },
-  {
-    name:  'pagerduty',
-    label: 'monitoringReceiver.pagerduty.label',
-    title: 'monitoringReceiver.pagerduty.title',
-    info:  'monitoringReceiver.pagerduty.info',
-    key:   'pagerdutyConfigs',
-    logo:  require(`@shell/assets/images/vendor/pagerduty.svg`)
-  },
-  {
-    name:  'opsgenie',
-    label: 'monitoringReceiver.opsgenie.label',
-    title: 'monitoringReceiver.opsgenie.title',
-    key:   'opsgenieConfigs',
-    logo:  require(`@shell/assets/images/vendor/email.svg`)
-  },
+  // {
+  //   name:  'pagerduty',
+  //   label: 'monitoringReceiver.pagerduty.label',
+  //   title: 'monitoringReceiver.pagerduty.title',
+  //   info:  'monitoringReceiver.pagerduty.info',
+  //   key:   'pagerdutyConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/pagerduty.svg`)
+  // },
+  // {
+  //   name:  'opsgenie',
+  //   label: 'monitoringReceiver.opsgenie.label',
+  //   title: 'monitoringReceiver.opsgenie.title',
+  //   key:   'opsgenieConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/email.svg`)
+  // },
   {
     name:  'webhook',
     label: 'monitoringReceiver.webhook.label',
@@ -54,14 +54,14 @@ export const RECEIVERS_TYPES = [
     key:   'webhookConfigs',
     logo:  require(`@shell/assets/images/vendor/webhook.svg`),
   },
-  {
-    name:  'custom',
-    label: 'monitoringReceiver.custom.label',
-    title: 'monitoringReceiver.custom.title',
-    info:  'monitoringReceiver.custom.info',
-    key:   'webhookConfigs',
-    logo:  require(`@shell/assets/images/vendor/custom.svg`)
-  },
+  // {
+  //   name:  'custom',
+  //   label: 'monitoringReceiver.custom.label',
+  //   title: 'monitoringReceiver.custom.title',
+  //   info:  'monitoringReceiver.custom.info',
+  //   key:   'webhookConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/custom.svg`)
+  // },
 ];
 
 export default {

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

@@ -46,30 +46,34 @@ export default {
 </script>
 <template>
   <div>
-    <h3>
-      Receiver
+    <div class="route-title-config  mb-20">
+      接收器
       <i
         v-clean-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')"
         class="icon icon-info"
       />
-    </h3>
+    </div>
     <Banner
       color="info"
       :label="t('monitoring.alertmanagerConfig.routeInfo')"
     />
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.receiver"
           :mode="mode"
+          :isLabel="true"
+          :leftWidth="'225px'"
           :options="receiverOptions"
         />
       </div>
     </div>
-    <h3>Grouping</h3>
-    <div class="row mb-20">
+    <div class="route-title-config  config-top  mb-20">
+      分组
+    </div>
+    <div class="row">
       <div class="col span-6">
-        <span class="label">
+        <span class="label mb-10">
           {{ t("monitoringRoute.groups.addGroupByLabel'") }}
           <i
             v-clean-tooltip="t('monitoringRoute.groups.groupByTooltip')"
@@ -84,8 +88,10 @@ export default {
         />
       </div>
     </div>
-    <h3>Waiting and Intervals</h3>
-    <div class="row mb-20">
+    <div class="route-title-config config-top  mb-20">
+      等待和间隔
+    </div>
+    <div class="row">
       <div class="col span-6">
         <LabeledInput
           v-model:value="value.groupWait"
@@ -101,7 +107,7 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-6">
         <LabeledInput
           v-model:value="value.repeatInterval"
@@ -111,7 +117,9 @@ export default {
       </div>
     </div>
 
-    <h3>Matchers</h3>
+    <div class="route-title-config config-top mb-20  mb-20">
+      匹配器
+    </div>
     <ArrayListGrouped
       v-model:value="value.matchers"
       class="mt-20"
@@ -120,7 +128,7 @@ export default {
       :default-add-value="{ matchers: [] }"
     >
       <template #default="props">
-        <div class="row mt-20 mb-20">
+        <div class="row ">
           <div class="col span-4">
             <LabeledInput
               v-model:value="props.row.value.name"
@@ -150,3 +158,19 @@ export default {
     </ArrayListGrouped>
   </div>
 </template>
+
+<style scoped>
+.route-title-config{
+  font-size: 14px;
+}
+
+.row{
+  flex-wrap: wrap;
+}
+.col{
+  width: 49.125%;
+}
+.config-top{
+  margin-top: 32px;
+}
+</style>

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

@@ -80,7 +80,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -88,7 +88,7 @@ export default {
         <LabeledInput
           v-model:value="value.to"
           :mode="mode"
-          label="Default Recipient Address"
+          label="默认收件人地址"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -97,7 +97,7 @@ export default {
           v-model:value="value.sendResolved"
           :mode="mode"
           class="mt-20"
-          label="Enable send resolved alerts"
+          label="启用发送已解决的警报"
         />
       </div>
     </div>
@@ -109,7 +109,7 @@ export default {
         <LabeledInput
           v-model:value="value.from"
           :mode="mode"
-          label="Sender"
+          label="发件人"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -119,7 +119,7 @@ export default {
         <LabeledInput
           v-model:value="value.smarthost"
           :mode="mode"
-          label="Host"
+          label="主机"
           placeholder="e.g. 192.168.1.121:587"
         />
       </div>
@@ -128,7 +128,7 @@ export default {
           v-model:value="value.requireTLS"
           :mode="mode"
           class="mt-20"
-          label="Use TLS"
+          label="启用TLS"
         />
       </div>
     </div>

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

@@ -165,7 +165,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -192,7 +192,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -201,12 +201,12 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
     <div class="row">
       <div class="col span-12">
-        <h3>Responders</h3>
+        <h3>响应者</h3>
         <ArrayList
           v-model:value="responders"
           :mode="mode"
@@ -219,18 +219,18 @@ export default {
                 class="row"
                 :class="{'mb-15': isView, 'mb-10': !isView}"
               >
-                <div class="col span-6">
-                  <span class="text-label">Type</span>
+              <div class="col" style="width:400px">
+                  <span class="text-label">类型</span>
                 </div>
-                <div class="col span-6 send-to">
-                  <span class="text-label">Send To</span>
+                <div class="col send-to ml-10" style="flex: 1;">
+                  <span class="text-label">发送至</span>
                 </div>
               </div>
             </div>
           </template>
           <template v-slot:columns="scope">
             <div class="row responder">
-              <div class="col span-6">
+              <div style="width:400px">
                 <span v-if="isView">{{ typeLabel(scope.row.value.type) }}</span>
                 <Select
                   v-else
@@ -239,7 +239,7 @@ export default {
                   :options="TYPES"
                 />
               </div>
-              <div class="col-span-6 target-container">
+              <div class="target-container ml-10" style="flex: 1;">
                 <span v-if="isView">{{ targetLabel(scope.row.value.target) }}: {{ scope.row.value.value }}</span>
                 <InputWithSelect
                   v-else