@rancher/shell 0.2.5 → 0.3.0

package/assets/styles/themes/_dark.scss

@@ -29,6 +29,7 @@
   $contrasted-dark: $lightest !default;
   $contrasted-light: $darkest !default;
 
+  $drag-over: #DCDEE7;
 
   --default                    : #{$dark};
   --default-text               : #{$light};
@@ -91,6 +92,9 @@
   --checkbox-disabled-bg       : #{$disabled};
   --checkbox-ticked-bg         : var(--primary);
 
+  --drag-over-inner-bg         : #{rgba($drag-over, 0.9)};
+  --drag-over-outer-bg         : #{rgba($drag-over, 0)};
+
   --dropdown-bg                : #{mix($medium, $dark, 10%)};
   --dropdown-border            : #{$light};
   --dropdown-divider           : #{$light};

package/assets/styles/themes/_light.scss

@@ -40,6 +40,8 @@ $contrasted-light: $lightest !default;
 // The terminal alway uses a light background, so okay to use a fixed color
 $selected: rgba(#3D98D3, .5);
 
+$drag-over: #DCDEE7;
+
 BODY, .theme-light {
 
   --primary                    : #{$primary};
@@ -359,6 +361,9 @@ BODY, .theme-light {
   --checkbox-disabled-bg       : #{$disabled};
   --checkbox-ticked-bg         : #{$link};
 
+  --drag-over-inner-bg         : #{rgba($drag-over, 0.9)};
+  --drag-over-outer-bg         : #{rgba($drag-over, 0)};
+
   --dropdown-bg                : #{$lightest};
   --dropdown-border            : #{$medium};
   --dropdown-divider           : #{$medium};

package/assets/translations/en-us.yaml

@@ -139,7 +139,7 @@ nav:
     serviceDiscovery: Service Discovery
     starred: Starred
     storage: Storage
-    workload: Workload
+    workload: Workloads
     monitoring: Monitoring
     advanced: Advanced
     RKE1Configuration: RKE1 Configuration
@@ -878,7 +878,7 @@ catalog:
       valuesYaml: Edit YAML
       diff: Compare Changes
     slideIn:
-      dock: Dock to bottom
+      dock: Dock to shell
     steps:
       basics:
         label: Metadata
@@ -2556,6 +2556,15 @@ logging:
     clientKeyPass: Client Key Pass from Secret
     verifySsl: Verify SSL
     sslVersion: SSL Version
+  redis:
+    host: Host
+    port: Port
+    dbNumber: Redis database number
+    ttl: TTL for each key
+    password: Password from Secret
+    format:
+      title: Format
+      type: Type
   gelf:
     host: Host
     port: Port
@@ -2686,6 +2695,8 @@ logging:
       configuration: Configuration
   outputProviders:
     elasticsearch: Elasticsearch
+    opensearch: OpenSearch
+    redis: Redis
     splunkHec: Splunk
     kafka: Kafka
     forward: Fluentd
@@ -4907,6 +4918,7 @@ tableHeaders:
   condition: Condition
   customVerbs: Custom Verbs
   description: Description
+  duration: Duration
   expires: Expires
   providers: Providers
   cpu: CPU

package/assets/translations/zh-hans.yaml

@@ -492,7 +492,7 @@ authConfig:
         linkText: '在此处进行更新。'
       modal:
         title: 是否确认？此更新是不可逆的。
-        body: '<p><b>你可能需要进行额外的更改</b>。请确保 Azure AD 应用对 Microsoft Graph 具有以下应用权限：User.Read.All、Group.Read.All<br> 如果在 Rancher 中配置 Azure AD 身份验证时自定义了端点，这些端点将不会自动更新。</p>'
+        body: '<p><b>你可能需要进行额外的更改</b>。请确保 Azure AD 应用已将 Directory.Read.All <b>Application</b> 权限添加到 Microsoft Graph。<br> 如果在 Rancher 中配置 Azure AD 身份验证时自定义了端点，这些端点将不会自动更新。</p>'
   oidc:
     oidc: 配置 OIDC 账号
     keycloakoidc: 配置 Keycloak OIDC 账号
@@ -773,7 +773,7 @@ catalog:
   chart:
     registry:
       label: 容器镜像仓库
-      tooltip: 容器镜像是从 Cluster Container 中拉取的，如果拉取失败，则从系统容器镜像仓库中拉取。要更改默认行为，请在此处输入或更新镜像仓库。
+      tooltip: 容器镜像是从 Cluster Container Registry 中拉取的，如果拉取失败，则从系统容器镜像仓库中拉取。要更改默认行为，请在此处输入或更新镜像仓库。
       custom:
         checkBoxLabel: Rancher 系统容器镜像的容器镜像仓库
         inputLabel: 容器镜像仓库
@@ -812,6 +812,7 @@ catalog:
     windowsIncompatible: 仅 Linux
     versionWindowsIncompatible: 仅限 Linux 版本
     header: Chart
+    featuredCharts: 精选 Chart
     noCharts: '没有可用的 Chart，你有添加仓库吗？'
     noWindows: 你的应用商店没有能够部署在具有 Windows 节点的集群的 Chart。
     noWindowsAndLinux: 你的应用商店没有能部署在具有 Windows 和 Linux Worker 节点的集群的 Chart。
@@ -1744,7 +1745,6 @@ cluster:
         false: 仅在集群内可用
         true: 暴露给公共接口
   k3s:
-    techPreview: K3s 配置处于技术预览中
     systemService:
       coredns: 'CoreDNS'
       local-storage: '本地存储'
@@ -2497,7 +2497,7 @@ landing:
     cpuUsed: 已用 CPU
     memoryUsed: 已用内存
   seeWhatsNew: 点击右侧链接，了解此版本的新功能和优化。
-  whatsNewLink: "2.6 的新功能"
+  whatsNewLink: "2.7 的新功能"
   learnMore: 了解更多
   support: 支持
   psps: PSP
@@ -3781,7 +3781,9 @@ plugins:
       registry:
         title: 删除 Rancher Rancher Extensions 仓库
         prompt: Rancher Extensions 仓库提供了由 Rancher 发布的扩展。
-
+      crd:
+        title: 删除 Rancher Extensions CRD
+        prompt: 目前已安装了一个或多个扩展 - 如果你后续需要重新启用扩展支持，删除 CRD 后你需要手动重新安装这些扩展。
 prefs:
   title: 偏好设置
   theme:

package/chart/istio.vue

@@ -60,7 +60,7 @@ export default {
 
   hasTabs: true,
 
-  props:   {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/chart/monitoring/grafana/index.vue

@@ -129,7 +129,7 @@ export default {
           existingClaim: null,
           subPath:       null,
           type:          null,
-          enabled:          true,
+          enabled:       true,
         };
         break;
       case 'pvc':

package/chart/monitoring/index.vue

@@ -136,7 +136,7 @@ export default {
           rbac: {
             userRoles: {
               create:                  this.mergeValue(this.value?.global?.rbac?.userRoles?.create, true),
-              aggregateToDefaultRoles:  this.mergeValue(this.value?.global?.rbac?.userRoles?.aggregateToDefaultRoles, true),
+              aggregateToDefaultRoles: this.mergeValue(this.value?.global?.rbac?.userRoles?.aggregateToDefaultRoles, true),
             },
           },
         },

package/chart/monitoring/prometheus/index.vue

@@ -37,22 +37,22 @@ export default {
     },
 
     prometheusPods: {
-      type:     Array,
+      type:    Array,
       default: () => ([]),
     },
 
     storageClasses: {
-      type:     Array,
+      type:    Array,
       default: () => ([]),
     },
 
     value: {
-      type:     Object,
+      type:    Object,
       default: () => ({}),
     },
 
     workloads: {
-      type:     Array,
+      type:    Array,
       default: () => ([]),
     },
   },

package/components/AlertTable.vue

@@ -10,7 +10,7 @@ const MAX_FAILURES = 2;
 export default {
   components: { SortableTable },
 
-  props:      {
+  props: {
     monitoringNamespace: {
       type:    String,
       default: 'cattle-monitoring-system'

package/components/AssignTo.vue

@@ -28,7 +28,7 @@ export default {
     };
   },
 
-  computed:   {
+  computed: {
     ...mapState('action-menu', ['showAssignTo', 'toAssign']),
     ...mapGetters({ t: 'i18n/t' }),
     ...mapGetters(['workspace']),

package/components/AsyncButton.vue

@@ -129,8 +129,8 @@ export default Vue.extend({
       const color = typeHelper.memberOfComponent(this, key);
 
       const out = {
-        btn:      true,
-        [color]:  true,
+        btn:     true,
+        [color]: true,
       };
 
       if (this.size) {

package/components/BrandImage.vue

@@ -4,7 +4,7 @@ import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 
 export default {
-  props:      {
+  props: {
     fileName: {
       type:     String,
       required: true

package/components/ButtonGroup.vue

@@ -27,7 +27,7 @@ export default {
     },
 
     disabled: {
-      type:     Boolean,
+      type:    Boolean,
       default: false,
     }
 

package/components/ClusterProviderIcon.vue

@@ -6,8 +6,8 @@ export default {
       required: true,
     },
     small: {
-      type:     Boolean,
-      default:  false,
+      type:    Boolean,
+      default: false,
     }
   },
 

package/components/Collapse.vue

@@ -8,8 +8,8 @@ export default {
     },
 
     title: {
-      type:     String,
-      default:  ''
+      type:    String,
+      default: ''
     }
   },
 
@@ -26,15 +26,18 @@ export default {
     <slot name="title">
       <div
         class="advanced text-link"
+        data-testid="collapse-div"
         @click="showAdvanced"
       >
         <i
           v-if="open"
           class="icon icon-chevron-down"
+          data-testid="collapse-icon-down"
         />
         <i
           v-else
           class="icon icon-chevron-right"
+          data-testid="collapse-icon-right"
         />
         {{ title }}
       </div>
@@ -43,6 +46,7 @@ export default {
     <div
       v-if="open"
       class="content"
+      data-testid="collapse-content"
     >
       <slot />
     </div>

package/components/CollapsibleCard.vue

@@ -1,7 +1,7 @@
 <script>
 export default {
-  name:       'CollapsibleCard',
-  props:      {
+  name:  'CollapsibleCard',
+  props: {
     isCollapsed: {
       type:    Boolean,
       default: false

package/components/ConsumptionGauge.vue

@@ -12,7 +12,7 @@ export default {
      * The name of the resource to be displayed.
      */
     resourceName: {
-      type:     String,
+      type:    String,
       default: ''
     },
     /**
@@ -32,9 +32,9 @@ export default {
     /**
      * The units that should be displayed when referencing amounts of the resource.
      */
-    units:           {
-      type:     String,
-      default:  ''
+    units: {
+      type:    String,
+      default: ''
     },
     /**
      * A method which can be used to format the *capacity* and *used* numbers for display.

package/components/ContainerResourceLimit.vue

@@ -8,7 +8,7 @@ import { _VIEW } from '@shell/config/query-params';
 export default {
   components: { UnitInput },
 
-  props:      {
+  props: {
     mode: {
       type:    String,
       default: 'create'

package/components/CountBox.vue

@@ -3,7 +3,7 @@
 export default {
   name: 'CountBox',
 
-  props:      {
+  props: {
     name: {
       type:     String,
       required: true

package/components/CountGauge.vue

@@ -18,7 +18,7 @@ export default {
       required: true
     },
     primaryColorVar: {
-      type:     String,
+      type:    String,
       default: null,
     },
     warningCount: {

package/components/CruResource.vue

@@ -98,7 +98,7 @@ export default {
       default: null,
     },
     steps: {
-      type:     Array,
+      type:    Array,
       default: () => []
     },
 
@@ -362,6 +362,7 @@ export default {
       :is="(isView? 'div' : 'form')"
       class="create-resource-container cru__form"
       @submit.prevent
+      @keydown.enter.prevent
     >
       <div
         v-if="hasErrors"

package/components/DashboardMetrics.vue

@@ -11,8 +11,8 @@ export default {
       required: true,
     },
     summaryUrl: {
-      type:     String,
-      default:  '',
+      type:    String,
+      default: '',
     },
     vars: {
       type:    Object,

package/components/ExplorerProjectsNamespaces.vue

@@ -85,10 +85,10 @@ export default {
     },
     headers() {
       const project = {
-        name:          'project',
-        label:         'Project',
-        value:         'project.nameDisplay',
-        sort:          ['projectNameSort', 'nameSort'],
+        name:  'project',
+        label: 'Project',
+        value: 'project.nameDisplay',
+        sort:  ['projectNameSort', 'nameSort'],
       };
 
       return [
@@ -136,8 +136,8 @@ export default {
 
       if (this.showMockNotInProjectGroup) {
         fakeRows.push( {
-          groupByLabel:     this.t('resourceTable.groupLabel.notInAProject'), // Same as the groupByLabel for the namespace model
-          mainRowKey:       'fake-empty',
+          groupByLabel: this.t('resourceTable.groupLabel.notInAProject'), // Same as the groupByLabel for the namespace model
+          mainRowKey:   'fake-empty',
         });
       }
 

package/components/FixedBanner.vue

@@ -25,12 +25,12 @@ export default {
 
   data() {
     return {
-      showDialog:      true,
-      showHeader:      false,
-      showFooter:      false,
-      showConsent:     false,
-      banner:          {},
-      bannerSetting:   null
+      showDialog:    true,
+      showHeader:    false,
+      showFooter:    false,
+      showConsent:   false,
+      banner:        {},
+      bannerSetting: null
     };
   },
 

package/components/GlobalRoleBindings.vue

@@ -17,7 +17,7 @@ export default {
     Loading,
     Card
   },
-  props:      {
+  props: {
     mode: {
       type:    String,
       default: _VIEW,
@@ -38,11 +38,11 @@ export default {
       }
     },
     groupPrincipalId: {
-      type:     String,
+      type:    String,
       default: ''
     },
     userId: {
-      type:     String,
+      type:    String,
       default: ''
     }
   },
@@ -104,7 +104,7 @@ export default {
       return this.type === 'user';
     }
   },
-  watch:    {
+  watch: {
     groupPrincipalId(groupPrincipalId, oldGroupPrincipalId) {
       if (groupPrincipalId === oldGroupPrincipalId) {
         return;
@@ -201,8 +201,8 @@ export default {
     },
     async saveAddedRoles(userId) {
       const requestOptions = {
-        type:               MANAGEMENT.GLOBAL_ROLE_BINDING,
-        metadata:           { generateName: `grb-` },
+        type:     MANAGEMENT.GLOBAL_ROLE_BINDING,
+        metadata: { generateName: `grb-` },
       };
 
       if (this.groupPrincipalId) {

package/components/GradientBox.vue

@@ -3,13 +3,13 @@ export default {
   props: {
     // a "r, g, b" tuple
     primaryColorVar: {
-      type:     String,
+      type:    String,
       default: null,
     },
 
     // Show the left side
     showTab: {
-      type:     Boolean,
+      type:    Boolean,
       default: true,
     },
     showSolid: {

package/components/IconMessage.vue

@@ -1,8 +1,8 @@
 <script>
 export default {
-  props:      {
+  props: {
     vertical: {
-      type:     Boolean,
+      type:    Boolean,
       default: false,
     },
     icon: {
@@ -10,7 +10,7 @@ export default {
       required: true,
     },
     iconState: {
-      type:     String,
+      type:    String,
       default: null
     },
     message: {
@@ -22,7 +22,7 @@ export default {
       default: null
     },
     subtle: {
-      type:     Boolean,
+      type:    Boolean,
       default: false,
     }
   },

package/components/Import.vue

@@ -40,11 +40,11 @@ export default {
 
   data() {
     return {
-      currentYaml:      '',
-      allNamespaces:    null,
-      errors:           null,
-      rows:             null,
-      done:             false,
+      currentYaml:   '',
+      allNamespaces: null,
+      errors:        null,
+      rows:          null,
+      done:          false,
     };
   },
 

package/components/InputOrDisplay.vue

@@ -28,7 +28,7 @@ const component = Vue.component('InputOrDisplay', {
       required: true
     },
     value: {
-      type:     [Number, String, Array, undefined],
+      type:    [Number, String, Array, undefined],
       default: ''
     },
     mode: {

package/components/KeyValueView.vue

@@ -8,7 +8,7 @@ export default {
 
   props: {
     value: {
-      type:     [Array, Object],
+      type:    [Array, Object],
       default: null,
     },
 

package/components/LabelValue.vue

@@ -6,7 +6,7 @@ export default {
       required: true
     },
     value: {
-      type:     [Number, String, undefined],
+      type:    [Number, String, undefined],
       default: ''
     }
   }

package/components/ModalWithCard.vue

@@ -10,7 +10,7 @@ export default {
     Card, Banner, AsyncButton
   },
 
-  props:      {
+  props: {
     name: {
       type:     String,
       required: true

package/components/MoveModal.vue

@@ -44,7 +44,7 @@ export default {
     }
   },
 
-  watch:    {
+  watch: {
     showPromptMove(show) {
       if (show) {
         this.$modal.show(this.modalName);

package/components/PercentageBar.vue

@@ -17,8 +17,8 @@ export default {
      * A value representing the percentage to be displayed. *Must be a value between 0 and 100*.
      */
     value: {
-      type:      Number,
-      required:  true,
+      type:     Number,
+      required: true,
       validator(value) {
         return value >= 0;
       }

package/components/PromptChangePassword.vue

@@ -11,7 +11,7 @@ export default {
   data() {
     return { valid: false, password: '' };
   },
-  computed:   { ...mapGetters({ t: 'i18n/t' }) },
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
   methods:  {
     show(show) {
       if (show) {

package/components/PromptModal.vue

@@ -13,7 +13,7 @@ export default {
     return { opened: false, backgroundClosing: null };
   },
 
-  computed:   {
+  computed: {
     ...mapState('action-menu', ['showModal', 'modalData']),
 
     resources() {

package/components/PromptRemove.vue

@@ -40,7 +40,7 @@ export default {
       chartsDeleteCrd:     false
     };
   },
-  computed:   {
+  computed: {
     names() {
       return this.toRemove.map(obj => obj.nameDisplay).slice(0, 5);
     },
@@ -153,7 +153,7 @@ export default {
     ...mapGetters({ t: 'i18n/t' }),
   },
 
-  watch:    {
+  watch: {
     showPromptRemove(show) {
       if (show) {
         const selected = this.toRemove[0];