dashboard-shell-shell 0.0.1000000000001137 → 0.0.1000000000001140

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.
@@ -19,7 +19,7 @@ $input-width: 400px;
19
19
 
20
20
  $input-padding-lg: 18px;
21
21
  $input-padding-sm: 10px;
22
- $input-line-height: 18px;
22
+ $input-line-height: 32px;
23
23
 
24
24
  $column-gutter: 1.75%;
25
25
 
@@ -10,7 +10,6 @@
10
10
 
11
11
  &.compact-input {
12
12
  min-height: $unlabeled-input-height;
13
- padding: 0 10px;
14
13
 
15
14
  INPUT.no-label {
16
15
  line-height: $input-line-height;
@@ -104,3 +104,8 @@
104
104
  }
105
105
  }
106
106
  }
107
+
108
+
109
+ .sortable-table tbody tr.group-row td:first-of-type {
110
+ background-color: var(--sortable-table-bg) !important;
111
+ }
@@ -895,6 +895,7 @@ form.create-resource-container .cru {
895
895
  display: flex;
896
896
  flex-direction: column;
897
897
  flex-grow: 1;
898
+ height: 100%;
898
899
  }
899
900
 
900
901
  &__content {
@@ -470,6 +470,18 @@ export default {
470
470
  :resource="MANAGEMENT.PROJECT"
471
471
  :main-button-visible="true"
472
472
  >
473
+ <template
474
+ v-if="showCreateNsButton"
475
+ #extraActions
476
+ >
477
+ <router-link
478
+ :to="createNamespaceLocationFlatList()"
479
+ class="btn role-primary mr-10"
480
+ data-testid="create_project_namespaces"
481
+ >
482
+ {{ t('projectNamespaces.createNamespace') }}
483
+ </router-link>
484
+ </template>
473
485
  <template #group-by="group">
474
486
  <div
475
487
  class="project-bar"
@@ -218,7 +218,7 @@ export default defineComponent({
218
218
  :key="i"
219
219
  class="row row--y-center mb-20"
220
220
  >
221
- <span class="col span-2">
221
+ <span class="col">
222
222
  <Checkbox
223
223
  v-if="!labelsAlwaysActive"
224
224
  v-model:value="psaControl.active"
@@ -400,7 +400,9 @@ export default {
400
400
  demoDisplay() {
401
401
  const product = this.$store.getters['productId'];
402
402
 
403
- const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this.location.params.resource);
403
+ const resources = this.location?.params?.resource || ''
404
+
405
+ const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
404
406
 
405
407
  if (productId === undefined) {
406
408
  return '';
@@ -420,8 +422,10 @@ export default {
420
422
  },
421
423
  menuIcon() {
422
424
  const product = this.$store.getters['productId'];
425
+
426
+ const resources = this.location?.params?.resource || ''
423
427
 
424
- return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(this.location.params.resource));
428
+ return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(resources));
425
429
  },
426
430
 
427
431
  location() {
@@ -10,7 +10,7 @@ export const NONE = 'none';
10
10
 
11
11
  export default {
12
12
  mounted() {
13
- const table = this.$el.querySelector('TABLE');
13
+ const table = this.$el && this.$el.querySelector('TABLE');
14
14
 
15
15
  this._onRowClickBound = this.onRowClick.bind(this);
16
16
  this._onRowMousedownBound = this.onRowMousedown.bind(this);
@@ -22,7 +22,7 @@ export default {
22
22
  },
23
23
 
24
24
  beforeUnmount() {
25
- const table = this.$el.querySelector('TABLE');
25
+ const table = this.$el && this.$el.querySelector('TABLE');
26
26
 
27
27
  table.removeEventListener('click', this._onRowClickBound);
28
28
  table.removeEventListener('mousedown', this._onRowMousedownBound);
@@ -499,7 +499,7 @@ margin: 0px -20px;
499
499
  // }
500
500
  & .tab {
501
501
  /* width: 100%; */
502
- width: 120px;
502
+ min-width: 120px;
503
503
  height: 36px;
504
504
  /* border-top: solid 5px transparent; */
505
505
  display: flex;
@@ -72,13 +72,13 @@ export default {
72
72
  <template>
73
73
  <div>
74
74
  <div class="headers mb-10">
75
- <div class="mr-10">
75
+ <div style="width: 400px;">
76
76
  <label>{{ t('resourceQuota.headers.resourceType') }}</label>
77
77
  </div>
78
- <div class="mr-10">
78
+ <div style="width: 400px;">
79
79
  <label>{{ t('resourceQuota.headers.projectResourceAvailability') }}</label>
80
80
  </div>
81
- <div class="mr-20">
81
+ <div style="width: 400px;">
82
82
  <label>{{ t('resourceQuota.headers.limit') }}</label>
83
83
  </div>
84
84
  </div>
@@ -101,7 +101,7 @@ export default {
101
101
  .headers {
102
102
  display: flex;
103
103
  flex-direction: row;
104
- justify-content: space-evenly;
104
+ justify-content: space-between;
105
105
  align-items: center;
106
106
  border-bottom: 1px solid var(--border);
107
107
  height: 30px;
@@ -173,16 +173,15 @@ export default {
173
173
  <template>
174
174
  <div
175
175
  v-if="typeOption"
176
- class="row"
176
+ class="rowNew"
177
177
  >
178
178
  <Select
179
- class="mr-10"
180
179
  :mode="mode"
181
180
  :value="type"
182
181
  :disabled="true"
183
182
  :options="types"
184
183
  />
185
- <div class="resource-availability mr-10">
184
+ <div class="resource-availability">
186
185
  <PercentageBar
187
186
  v-clean-tooltip="tooltip"
188
187
  class="percentage-bar"
@@ -208,13 +207,12 @@ export default {
208
207
  .resource-availability {
209
208
  align-self: center;
210
209
  }
211
- .row {
210
+ .rowNew {
212
211
  display: flex;
213
- flex-direction: row;
214
- justify-content: space-evenly;
212
+ justify-content: space-between;
215
213
 
216
214
  & > * {
217
- width: 100%;
215
+ width: 400px;
218
216
  }
219
217
  }
220
218
  </style>
@@ -57,14 +57,14 @@ export default {
57
57
  </script>
58
58
  <template>
59
59
  <div>
60
- <div class="headers mb-10">
61
- <div class="mr-10">
60
+ <div style="justify-content: right;" class="headers mb-10">
61
+ <div style="width: 400px;">
62
62
  <label>{{ t('resourceQuota.headers.resourceType') }}</label>
63
63
  </div>
64
- <div class="mr-20">
64
+ <div style="width: 400px;">
65
65
  <label>{{ t('resourceQuota.headers.projectLimit') }}</label>
66
66
  </div>
67
- <div class="mr-10">
67
+ <div style="width: 400px;">
68
68
  <label>{{ t('resourceQuota.headers.namespaceDefaultLimit') }}</label>
69
69
  </div>
70
70
  </div>
@@ -70,11 +70,11 @@ export default {
70
70
  <template>
71
71
  <div
72
72
  v-if="typeOption"
73
- class="row"
73
+ style="justify-content: right;"
74
+ class="rowNew"
74
75
  >
75
76
  <Select
76
77
  :value="type"
77
- class="mr-10"
78
78
  :mode="mode"
79
79
  :options="types"
80
80
  data-testid="projectrow-type-input"
@@ -82,7 +82,6 @@ export default {
82
82
  />
83
83
  <UnitInput
84
84
  :value="resourceQuotaLimit[type]"
85
- class="mr-10"
86
85
  :mode="mode"
87
86
  :placeholder="typeOption.placeholder"
88
87
  :increment="typeOption.increment"
@@ -107,9 +106,8 @@ export default {
107
106
  </template>
108
107
 
109
108
  <style lang='scss' scoped>
110
- .row {
109
+ .rowNew {
111
110
  display: flex;
112
- flex-direction: row;
113
- justify-content: space-evenly;
111
+ justify-content: space-between;
114
112
  }
115
113
  </style>
@@ -238,10 +238,10 @@ export default {
238
238
  @update:value="update"
239
239
  @blur="update($event.target.value)"
240
240
  >
241
- <template #suffix>
241
+ <template #suffixNew>
242
242
  <div
243
243
  v-if="displayUnit"
244
- class="addon"
244
+ class="addonNew"
245
245
  :class="{'with-tooltip': tooltip || tooltipKey}"
246
246
  >
247
247
  {{ displayUnit }}
@@ -251,7 +251,12 @@ export default {
251
251
  </template>
252
252
 
253
253
  <style lang="scss" scoped>
254
- .addon.with-tooltip {
254
+ .addonNew.with-tooltip {
255
255
  padding-right: 42px;
256
256
  }
257
+ .addonNew {
258
+ display: flex;
259
+ align-items: center;
260
+ margin-left: 10px;
261
+ }
257
262
  </style>
@@ -420,8 +420,10 @@ export default {
420
420
  },
421
421
  menuIcon() {
422
422
  const product = this.$store.getters['productId'];
423
+
424
+ const resources = this.location?.params?.resource || ''
423
425
 
424
- return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(this.location.params.resource));
426
+ return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(resources));
425
427
  },
426
428
 
427
429
  location() {
@@ -162,7 +162,7 @@ export const NAMESPACE = {
162
162
  name: 'namespace',
163
163
  labelKey: 'tableHeaders.namespace',
164
164
  value: 'namespace',
165
- getValue: row => row.namespace.replace('harvester', 'cloud'),
165
+ getValue: row => row && row.namespace && row.namespace.replace('harvester', 'cloud'),
166
166
  sort: 'namespace',
167
167
  dashIfEmpty: true,
168
168
  };
@@ -189,7 +189,7 @@ $row-height: 40px;
189
189
  height: 100%;
190
190
 
191
191
  input.no-label {
192
- height: calc($row-height - 2px);
192
+ height: 32px;
193
193
  padding: 10px;
194
194
  }
195
195
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dashboard-shell-shell",
3
- "version": "0.0.1000000000001137",
3
+ "version": "0.0.1000000000001140",
4
4
  "description": "Rancher Dashboard Shell",
5
5
  "repository": "https://github.com/rancherlabs/dashboard",
6
6
  "license": "Apache-2.0",
@@ -196,8 +196,8 @@ $icon-size: 24px;
196
196
  }
197
197
 
198
198
  .info & {
199
- /* background: var(--info-banner-bg); */
200
- background: #f2f2f2;
199
+ background: var(--info-banner-bg);
200
+ // background: #f2f2f2;
201
201
  border-color: var(--info);
202
202
  }
203
203
 
@@ -464,6 +464,7 @@ export default defineComponent({
464
464
  />
465
465
  </div>
466
466
  </div>
467
+ <slot name="suffixNew" />
467
468
  </div>
468
469
  </template>
469
470
  <style scoped lang="scss">
@@ -108,7 +108,7 @@ export default defineComponent({
108
108
  * (unless the input is long)
109
109
  */
110
110
  style(): string {
111
- return `height: ${ this.curHeight }px; overflow: ${ this.overflow };`;
111
+ return `height: ${ this.curHeight }px; overflow: ${ this.overflow };min-height:${ this.curHeight }px;`;
112
112
  },
113
113
 
114
114
  className(): string | unknown[] | Record<string, boolean> {