dashboard-shell-shell 3.0.5-test.5 → 3.0.5-test.6

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

@@ -46,34 +46,30 @@ export default {
 </script>
 <template>
   <div>
-    <div class="route-title-config  mb-20">
-      接收器
+    <h3>
+      Receiver
       <i
         v-clean-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')"
         class="icon icon-info"
       />
-    </div>
+    </h3>
     <Banner
       color="info"
       :label="t('monitoring.alertmanagerConfig.routeInfo')"
     />
-    <div class="row">
+    <div class="row mb-20">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.receiver"
           :mode="mode"
-          :isLabel="true"
-          :leftWidth="'225px'"
           :options="receiverOptions"
         />
       </div>
     </div>
-    <div class="route-title-config  config-top  mb-20">
-      分组
-    </div>
-    <div class="row">
+    <h3>Grouping</h3>
+    <div class="row mb-20">
       <div class="col span-6">
-        <span class="label mb-10">
+        <span class="label">
           {{ t("monitoringRoute.groups.addGroupByLabel'") }}
           <i
             v-clean-tooltip="t('monitoringRoute.groups.groupByTooltip')"
@@ -88,10 +84,8 @@ export default {
         />
       </div>
     </div>
-    <div class="route-title-config config-top  mb-20">
-      等待和间隔
-    </div>
-    <div class="row">
+    <h3>Waiting and Intervals</h3>
+    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="value.groupWait"
@@ -107,7 +101,7 @@ export default {
         />
       </div>
     </div>
-    <div class="row">
+    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="value.repeatInterval"
@@ -117,9 +111,7 @@ export default {
       </div>
     </div>
 
-    <div class="route-title-config config-top mb-20  mb-20">
-      匹配器
-    </div>
+    <h3>Matchers</h3>
     <ArrayListGrouped
       v-model:value="value.matchers"
       class="mt-20"
@@ -128,7 +120,7 @@ export default {
       :default-add-value="{ matchers: [] }"
     >
       <template #default="props">
-        <div class="row ">
+        <div class="row mt-20 mb-20">
           <div class="col span-4">
             <LabeledInput
               v-model:value="props.row.value.name"
@@ -158,19 +150,3 @@ 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>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -88,7 +88,7 @@ export default {
         <LabeledInput
           v-model:value="value.to"
           :mode="mode"
-          label="默认收件人地址"
+          label="Default Recipient Address"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -97,7 +97,7 @@ export default {
           v-model:value="value.sendResolved"
           :mode="mode"
           class="mt-20"
-          label="启用发送已解决的警报"
+          label="Enable send resolved alerts"
         />
       </div>
     </div>
@@ -109,7 +109,7 @@ export default {
         <LabeledInput
           v-model:value="value.from"
           :mode="mode"
-          label="发件人"
+          label="Sender"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -119,7 +119,7 @@ export default {
         <LabeledInput
           v-model:value="value.smarthost"
           :mode="mode"
-          label="主机"
+          label="Host"
           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="启用TLS"
+          label="Use 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>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -192,7 +192,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="代理地址"
+          label="Proxy URL"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -201,12 +201,12 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="启用发送已解决的警报"
+        label="Enable send resolved alerts"
       />
     </div>
     <div class="row">
       <div class="col span-12">
-        <h3>响应者</h3>
+        <h3>Responders</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" style="width:400px">
-                  <span class="text-label">类型</span>
+                <div class="col span-6">
+                  <span class="text-label">Type</span>
                 </div>
-                <div class="col send-to ml-10" style="flex: 1;">
-                  <span class="text-label">发送至</span>
+                <div class="col span-6 send-to">
+                  <span class="text-label">Send To</span>
                 </div>
               </div>
             </div>
           </template>
           <template v-slot:columns="scope">
             <div class="row responder">
-              <div style="width:400px">
+              <div class="col span-6">
                 <span v-if="isView">{{ typeLabel(scope.row.value.type) }}</span>
                 <Select
                   v-else
@@ -239,7 +239,7 @@ export default {
                   :options="TYPES"
                 />
               </div>
-              <div class="target-container ml-10" style="flex: 1;">
+              <div class="col-span-6 target-container">
                 <span v-if="isView">{{ targetLabel(scope.row.value.target) }}: {{ scope.row.value.value }}</span>
                 <InputWithSelect
                   v-else

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

@@ -130,7 +130,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div
@@ -142,7 +142,7 @@ export default {
           v-model:value="integrationType"
           :options="integrationTypeOptions"
           :mode="mode"
-          label="整合型"
+          label="Integration Type"
         />
       </div>
     </div>
@@ -186,7 +186,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="代理地址"
+          label="Proxy URL"
           placeholder="e.g. http://my-proxy/"
           data-testid="v2-monitoring-receiver-pagerduty-proxy-url"
         />
@@ -196,7 +196,7 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="启用发送已解决的警报"
+        label="Enable send resolved alerts"
       />
     </div>
   </div>

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

@@ -82,7 +82,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -116,7 +116,7 @@ export default {
         <LabeledInput
           v-model:value="value.channel"
           :mode="mode"
-          label="默认频道"
+          label="Default Channel"
           placeholder="e.g. #example"
         />
       </div>
@@ -124,7 +124,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="代理地址"
+          label="Proxy URL"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -133,7 +133,7 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="启用发送已解决的警报"
+        label="Enable send resolved alerts"
       />
     </div>
   </div>

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

@@ -160,7 +160,7 @@ export default {
     <div class="row">
       <div class="col span-12">
         <h3 class="mb-0">
-          目标
+          Target
         </h3>
       </div>
     </div>

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

@@ -39,7 +39,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -47,7 +47,7 @@ export default {
         <LabeledInput
           v-model:value="value.to"
           :mode="mode"
-          label="默认收件人地址"
+          label="Default Recipient Address"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -56,7 +56,7 @@ export default {
           v-model:value="value.send_resolved"
           :mode="mode"
           class="mt-20"
-          label="启用发送已解决的警报"
+          label="Enable send resolved alerts"
         />
       </div>
     </div>
@@ -97,7 +97,7 @@ export default {
           v-model:value="value.require_tls"
           :mode="mode"
           class="mt-20"
-          label="启用TLS"
+          label="Use TLS"
         />
       </div>
     </div>
@@ -106,7 +106,7 @@ export default {
         <LabeledInput
           v-model:value="value.auth_username"
           :mode="mode"
-          label="用户名"
+          label="Username"
           placeholder="e.g. John"
         />
       </div>
@@ -114,7 +114,7 @@ export default {
         <LabeledInput
           v-model:value="value.auth_password"
           :mode="mode"
-          label="密码"
+          label="Password"
           type="password"
           autocomplete="current-password"
         />

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

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

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

@@ -56,7 +56,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -65,14 +65,14 @@ export default {
           v-model:value="integrationType"
           :options="integrationTypeOptions"
           :mode="mode"
-          label="整合型"
+          label="Integration Type"
         />
       </div>
       <div class="col span-6">
         <LabeledInput
           v-model:value="value[integrationMapping[integrationType]]"
           :mode="mode"
-          label="默认集成密钥"
+          label="Default Integration Key"
         />
       </div>
     </div>
@@ -81,7 +81,7 @@ export default {
         <LabeledInput
           v-model:value="value.http_config.proxy_url"
           :mode="mode"
-          label="代理地址"
+          label="Proxy URL"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -90,7 +90,7 @@ export default {
       <Checkbox
         v-model:value="value.send_resolved"
         :mode="mode"
-        label="启用发送已解决的警报"
+        label="Enable send resolved alerts"
       />
     </div>
   </div>

package/edit/monitoring.coreos.com.receiver/types/slack.vue

@@ -40,7 +40,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>目标</h3>
+        <h3>Target</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -64,7 +64,7 @@ export default {
         <LabeledInput
           v-model:value="value.channel"
           :mode="mode"
-          label="默认频道"
+          label="Default Channel"
           placeholder="e.g. #example"
         />
       </div>
@@ -72,7 +72,7 @@ export default {
         <LabeledInput
           v-model:value="value.http_config.proxy_url"
           :mode="mode"
-          label="代理地址"
+          label="Proxy URL"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -81,7 +81,7 @@ export default {
       <Checkbox
         v-model:value="value.send_resolved"
         :mode="mode"
-        label="启用发送已解决的警报"
+        label="Enable send resolved alerts"
       />
     </div>
   </div>

package/edit/namespace.vue

@@ -184,10 +184,11 @@ export default {
       :value="value"
       :namespaced="false"
       :mode="mode"
+      :extra-columns="['project-col']"
     >
       <template
         v-if="flatView && isCreate"
-        #customize
+        #project-col
       >
         <LabeledSelect
           v-model:value="projectName"

package/edit/token.vue

@@ -175,16 +175,7 @@ export default {
 
 <template>
   <div v-if="!created">
-    <div
-      v-for="(err,idx) in errors"
-      :key="idx"
-    >
-      <Banner
-        color="error"
-        :label="err"
-      />
-    </div>
-    <div class="pr-10">
+    <div class="pl-10 pr-10">
       <LabeledInput
         key="description"
         v-model:value="value.description"
@@ -193,20 +184,19 @@ export default {
         mode="edit"
         :min-height="30"
       />
-      <div class="mt-20">
-        <LabeledSelect
-          v-model:value="value.clusterId"
-          class="scope-select"
-          label-key="accountAndKeys.apiKeys.add.scope"
-          :options="scopes"
-        />
-      </div>
 
-      <div style="font-size: 14px; margin-top: 32px;">
+      <LabeledSelect
+        v-model:value="value.clusterId"
+        class="mt-20 scope-select"
+        label-key="accountAndKeys.apiKeys.add.scope"
+        :options="scopes"
+      />
+
+      <h5 class="pt-20">
         {{ t('accountAndKeys.apiKeys.add.expiry.label') }}
-      </div>
+      </h5>
 
-      <div class="mt-20">
+      <div class="ml-10">
         <RadioGroup
           v-model:value="form.expiryType"
           :options="expiryOptions"
@@ -214,12 +204,11 @@ export default {
           class="mr-20"
           name="expiryGroup"
         />
-        <div class="mt-20 expiry">
+        <div class="ml-20 mt-10 expiry">
           <input
             v-model="form.customExpiry"
             :disabled="form.expiryType !== 'custom'"
             type="number"
-            class="expire-input"
             :mode="mode"
             :aria-label="t('accountAndKeys.apiKeys.add.ariaLabel.expiration')"
           >
@@ -310,14 +299,6 @@ export default {
       flex: 0 0 200px;
       margin-right: 10px;
     }
-    .expire-input{
-      border: solid var(--border-width) var(--input-border);
-      padding: 0px 0px 0px 11px;
-      line-height: 30px;
-      /* &['disabled']{
-        border: solid var(--border-width) var(--input-border);
-      } */
-    }
   }
 
   .buttons {

package/edit/workload/index.vue

@@ -108,7 +108,7 @@ export default {
       >
         <div
           v-if="isCronJob"
-          class="col span-6"
+          class="col span-3"
         >
           <LabeledInput
             v-model:value="spec.schedule"
@@ -122,7 +122,7 @@ export default {
         </div>
         <div
           v-if="isReplicable"
-          class="col span-6"
+          class="col span-3"
         >
           <LabeledInput
             v-model:value.number="spec.replicas"
@@ -135,7 +135,7 @@ export default {
         </div>
         <div
           v-if="isStatefulSet"
-          class="col span-6"
+          class="col span-3"
         >
           <LabeledSelect
             v-model:value="spec.serviceName"
@@ -664,7 +664,7 @@ export default {
 .deployment-tabs {
   > .tabs.horizontal {
     border-bottom: 1px solid var(--border);
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
 }
 .padded {