dashboard-shell-shell 3.0.5-test.50 → 3.0.5-test.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/components/form/NameNsDescription.vue +2 -3
  2. package/components/form/SecretSelector.vue +25 -22
  3. package/config/product/uiplugins.js +13 -10
  4. package/edit/logging-flow/index.vue +1 -2
  5. package/edit/logging.banzaicloud.io.output/providers/awsElasticsearch.vue +2 -2
  6. package/edit/logging.banzaicloud.io.output/providers/azurestorage.vue +18 -18
  7. package/edit/logging.banzaicloud.io.output/providers/cloudwatch.vue +23 -23
  8. package/edit/logging.banzaicloud.io.output/providers/datadog.vue +17 -17
  9. package/package.json +1 -1
  10. package/pages/auth/login.vue +1 -1
  11. package/scripts/publish-shell.sh +1 -1
package/components/form/NameNsDescription.vue CHANGED
@@ -514,9 +514,8 @@ export default {
514
514
  </div>
515
515
 
516
516
  <!-- 自定义插槽，可插入额外内容 -->
517
- <div :class=" isDialog? 'namespace-item-row mb-20': 'col span-6'">
518
- <slot name="customize" />
519
- </div>
517
+ <slot name="customize" />
518
+
520
519
  <!-- <div
521
520
  v-show="!descriptionHidden"
522
521
  :data-testid="componentTestid + '-description'"
package/components/form/SecretSelector.vue CHANGED
@@ -209,32 +209,35 @@ export default {
209
209
 
210
210
  <template>
211
211
  <div
212
- class="secret-selector"
212
+ class="secret-selector row"
213
213
  :class="{'show-key-selector': showKeySelector}"
214
214
  >
215
215
  <div class="input-container">
216
216
  <!-- key by namespace to ensure label select current page is recreated on ns change -->
217
- <ResourceLabeledSelect
218
- :key="namespace"
219
- v-model:value="name"
220
- :disabled="!isView && disabled"
221
- :label="secretNameLabel"
222
- :mode="mode"
223
- :resource-type="SECRET"
224
- :in-store="inStore"
225
- :paginated-resource-settings="paginateSecretsSetting"
226
- :all-resources-settings="allSecretsSettings"
227
- />
228
- <LabeledSelect
229
- v-if="showKeySelector"
230
- :key="namespace"
231
- v-model:value="key"
232
- class="col span-6"
233
- :disabled="isKeyDisabled"
234
- :options="keys"
235
- :label="keyNameLabel"
236
- :mode="mode"
237
- />
217
+ <div class="col span-6"">
218
+ <ResourceLabeledSelect
219
+ :key="namespace"
220
+ v-model:value="name"
221
+ :disabled="!isView && disabled"
222
+ :label="secretNameLabel"
223
+ :mode="mode"
224
+ :resource-type="SECRET"
225
+ :in-store="inStore"
226
+ :paginated-resource-settings="paginateSecretsSetting"
227
+ :all-resources-settings="allSecretsSettings"
228
+ />
229
+ </div>
230
+ <div class="col span-6">
231
+ <LabeledSelect
232
+ v-if="showKeySelector"
233
+ :key="namespace"
234
+ v-model:value="key"
235
+ :disabled="isKeyDisabled"
236
+ :options="keys"
237
+ :label="keyNameLabel"
238
+ :mode="mode"
239
+ />
240
+ </div>
238
241
  </div>
239
242
  </div>
240
243
  </template>
package/config/product/uiplugins.js CHANGED
@@ -5,14 +5,17 @@ export const NAME = 'uiplugins';
5
5
  export function init(store) {
6
6
  const { product } = DSL(store, NAME);
7
7
 
8
- // Add a product for UI Plugins - will appear in the top-level menu
9
- product({
10
- ifHave: IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
11
- inStore: 'management',
12
- icon: 'extension',
13
- removable: false,
14
- showClusterSwitcher: false,
15
- category: 'configuration',
16
- weight: 50,
17
- });
8
+ if (sessionStorage.getItem('TOPLEVELPERMISSIONS') && sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
9
+ // Add a product for UI Plugins - will appear in the top-level menu
10
+ product({
11
+ ifHave: IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
12
+ inStore: 'management',
13
+ icon: 'extension',
14
+ removable: false,
15
+ showClusterSwitcher: false,
16
+ category: 'configuration',
17
+ weight: 50,
18
+ });
19
+ }
20
+
18
21
  }
package/edit/logging-flow/index.vue CHANGED
@@ -418,10 +418,9 @@ export default {
418
418
  class="mt-0"
419
419
  :label="t('logging.flow.matches.banner')"
420
420
  />
421
- <div v-if="isHarvester">
421
+ <div class="mb-20" v-if="isHarvester">
422
422
  <LabeledSelect
423
423
  v-model:value="loggingType"
424
- class="mb-20"
425
424
  :options="flowTypeOptions"
426
425
  :mode="mode"
427
426
  :disabled="!isCreate"
package/edit/logging.banzaicloud.io.output/providers/awsElasticsearch.vue CHANGED
@@ -51,7 +51,7 @@ export default {
51
51
  </div>
52
52
  </div>
53
53
  <div class="row mb-10">
54
- <div class="col span-6">
54
+ <div>
55
55
  <SecretSelector
56
56
  v-model:value="value.endpoint.access_key_id"
57
57
  :mode="mode"
@@ -61,7 +61,7 @@ export default {
61
61
  :show-key-selector="true"
62
62
  />
63
63
  </div>
64
- <div class="col span-6">
64
+ <div>
65
65
  <SecretSelector
66
66
  v-model:value="value.endpoint.secret_access_key"
67
67
  :mode="mode"
package/edit/logging.banzaicloud.io.output/providers/azurestorage.vue CHANGED
@@ -36,29 +36,29 @@ export default {
36
36
  </div>
37
37
  <div class="row mb-10">
38
38
  <div class="col span-6">
39
- <LabeledInput
40
- v-model:value="value.azure_container"
41
- :mode="mode"
42
- :disabled="disabled"
43
- :label="t('logging.azurestorage.container')"
39
+ <LabeledInput
40
+ v-model:value="value.azure_container"
41
+ :mode="mode"
42
+ :disabled="disabled"
43
+ :label="t('logging.azurestorage.container')"
44
44
  />
45
45
  </div>
46
46
  <div class="col span-6">
47
- <LabeledInput
48
- v-model:value="value.path"
49
- :mode="mode"
50
- :disabled="disabled"
51
- :label="t('logging.azurestorage.path')"
47
+ <LabeledInput
48
+ v-model:value="value.path"
49
+ :mode="mode"
50
+ :disabled="disabled"
51
+ :label="t('logging.azurestorage.path')"
52
52
  />
53
53
  </div>
54
54
  </div>
55
55
  <div class="row">
56
56
  <div class="col span-6">
57
- <LabeledInput
58
- v-model:value="value.store_as"
59
- :mode="mode"
60
- :disabled="disabled"
61
- :label="t('logging.azurestorage.storeAs')"
57
+ <LabeledInput
58
+ v-model:value="value.store_as"
59
+ :mode="mode"
60
+ :disabled="disabled"
61
+ :label="t('logging.azurestorage.storeAs')"
62
62
  />
63
63
  </div>
64
64
  </div>
@@ -68,8 +68,8 @@ export default {
68
68
  <h3>{{ t('logging.output.sections.access') }}</h3>
69
69
  </div>
70
70
  </div>
71
- <div class="row mb-10">
72
- <div class="col span-6">
71
+ <div>
72
+ <div>
73
73
  <SecretSelector
74
74
  v-model:value="value.azure_storage_account"
75
75
  :mode="mode"
@@ -79,7 +79,7 @@ export default {
79
79
  :show-key-selector="true"
80
80
  />
81
81
  </div>
82
- <div class="col span-6">
82
+ <div>
83
83
  <SecretSelector
84
84
  v-model:value="value.azure_storage_access_key"
85
85
  :mode="mode"
package/edit/logging.banzaicloud.io.output/providers/cloudwatch.vue CHANGED
@@ -36,19 +36,19 @@ export default {
36
36
  </div>
37
37
  <div class="row">
38
38
  <div class="col span-6">
39
- <LabeledInput
40
- v-model:value="value.region"
41
- :mode="mode"
42
- :disabled="disabled"
43
- :label="t('logging.cloudwatch.region')"
39
+ <LabeledInput
40
+ v-model:value="value.region"
41
+ :mode="mode"
42
+ :disabled="disabled"
43
+ :label="t('logging.cloudwatch.region')"
44
44
  />
45
45
  </div>
46
46
  <div class="col span-6">
47
- <LabeledInput
48
- v-model:value="value.endpoint"
49
- :mode="mode"
50
- :disabled="disabled"
51
- :label="t('logging.cloudwatch.endpoint')"
47
+ <LabeledInput
48
+ v-model:value="value.endpoint"
49
+ :mode="mode"
50
+ :disabled="disabled"
51
+ :label="t('logging.cloudwatch.endpoint')"
52
52
  />
53
53
  </div>
54
54
  </div>
@@ -57,8 +57,8 @@ export default {
57
57
  <h3>{{ t('logging.output.sections.access') }}</h3>
58
58
  </div>
59
59
  </div>
60
- <div class="row mb-10">
61
- <div class="col span-6">
60
+ <div>
61
+ <div>
62
62
  <SecretSelector
63
63
  v-model:value="value.aws_key_id"
64
64
  :mode="mode"
@@ -68,7 +68,7 @@ export default {
68
68
  :show-key-selector="true"
69
69
  />
70
70
  </div>
71
- <div class="col span-6">
71
+ <div>
72
72
  <SecretSelector
73
73
  v-model:value="value.aws_sec_key"
74
74
  :mode="mode"
@@ -86,19 +86,19 @@ export default {
86
86
  </div>
87
87
  <div class="row">
88
88
  <div class="col span-6">
89
- <LabeledInput
90
- v-model:value="value.log_group_name"
91
- :mode="mode"
92
- :disabled="disabled"
93
- :label="t('logging.cloudwatch.logGroupName')"
89
+ <LabeledInput
90
+ v-model:value="value.log_group_name"
91
+ :mode="mode"
92
+ :disabled="disabled"
93
+ :label="t('logging.cloudwatch.logGroupName')"
94
94
  />
95
95
  </div>
96
96
  <div class="col span-6">
97
- <LabeledInput
98
- v-model:value="value.log_stream_name"
99
- :mode="mode"
100
- :disabled="disabled"
101
- :label="t('logging.cloudwatch.logStreamName')"
97
+ <LabeledInput
98
+ v-model:value="value.log_stream_name"
99
+ :mode="mode"
100
+ :disabled="disabled"
101
+ :label="t('logging.cloudwatch.logStreamName')"
102
102
  />
103
103
  </div>
104
104
  </div>
package/edit/logging.banzaicloud.io.output/providers/datadog.vue CHANGED
@@ -39,11 +39,11 @@ export default {
39
39
  </div>
40
40
  <div class="row">
41
41
  <div class="col span-6">
42
- <LabeledInput
43
- v-model:value="value.host"
44
- :mode="mode"
45
- :disabled="disabled"
46
- :label="t('logging.datadog.host')"
42
+ <LabeledInput
43
+ v-model:value="value.host"
44
+ :mode="mode"
45
+ :disabled="disabled"
46
+ :label="t('logging.datadog.host')"
47
47
  />
48
48
  </div>
49
49
  </div>
@@ -53,8 +53,8 @@ export default {
53
53
  <h3>{{ t('logging.output.sections.access') }}</h3>
54
54
  </div>
55
55
  </div>
56
- <div class="row">
57
- <div class="col span-6">
56
+ <div>
57
+ <div>
58
58
  <SecretSelector
59
59
  v-model:value="value.api_key"
60
60
  :mode="mode"
@@ -73,21 +73,21 @@ export default {
73
73
  </div>
74
74
  <div class="row mb-10">
75
75
  <div class="col span-6">
76
- <Checkbox
77
- v-model:value="value.use_ssl"
78
- :mode="mode"
79
- :disabled="disabled"
80
- :label="t('logging.datadog.useSSL')"
76
+ <Checkbox
77
+ v-model:value="value.use_ssl"
78
+ :mode="mode"
79
+ :disabled="disabled"
80
+ :label="t('logging.datadog.useSSL')"
81
81
  />
82
82
  </div>
83
83
  </div>
84
84
  <div class="row mb-10">
85
85
  <div class="col span-6">
86
- <Checkbox
87
- v-model:value="value.use_compression"
88
- :mode="mode"
89
- :disabled="disabled"
90
- :label="t('logging.datadog.useCompression')"
86
+ <Checkbox
87
+ v-model:value="value.use_compression"
88
+ :mode="mode"
89
+ :disabled="disabled"
90
+ :label="t('logging.datadog.useCompression')"
91
91
  />
92
92
  </div>
93
93
  </div>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dashboard-shell-shell",
3
- "version": "3.0.5-test.50",
3
+ "version": "3.0.5-test.52",
4
4
  "description": "Rancher Dashboard Shell",
5
5
  "repository": "https://github.com/rancherlabs/dashboard",
6
6
  "license": "Apache-2.0",
package/pages/auth/login.vue CHANGED
@@ -312,7 +312,7 @@ export default {
312
312
  this.$store.dispatch('auth/setInitialPass', this.password);
313
313
  this.$router.push({ name: 'auth-setup' });
314
314
  } else {
315
- this.$router.push({ name: 'home' });
315
+ this.$router.push({ name: 'index' });
316
316
  }
317
317
 
318
318
  } catch (err) {
package/scripts/publish-shell.sh CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
3
  # 执行命令示例：
4
- # TAG=shell-pkg-v3.0.5-test.50 ./shell/scripts/publish-shell.sh
4
+ # TAG=shell-pkg-v3.0.5-test.52 ./shell/scripts/publish-shell.sh
5
5
 
6
6
  set -euo pipefail
7
7