Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4538751

Browse files
robertpatrickrakillen
andauthored
clean up the tables to make them more uniform (#220)
* cleanup up the tables to make them more uniform * Remove resizable from table columns before buttons --------- Co-authored-by: Richard Killen <richard.killen@oracle.com>
1 parent d9ab188 commit 4538751

16 files changed

+225
-201
lines changed

‎webui/package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webui/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@oracle/oraclejet": "^13.1.7",
14-
"@oracle/wrc-jet-pack": "^2.4.2-develop.202303071626",
14+
"@oracle/wrc-jet-pack": "^2.4.2-develop.202303162018",
1515
"ace-builds": "^1.15.0",
1616
"i18next": "^22.4.9",
1717
"jquery": "^3.6.3",

‎webui/src/js/viewModels/discover-result-dialog.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,14 @@ function(accUtils, ko, i18n, viewHelper, ArrayDataProvider) {
6262

6363
this.typesColumnData = [
6464
{
65-
'headerText': this.labelMapper('file-location-header'),
66-
'sortProperty': 'file'
65+
headerText: this.labelMapper('file-location-header'),
66+
sortProperty: 'file',
67+
resizeable: 'enabled'
6768
},
6869
{
69-
'headerText': this.labelMapper('archive-path-header'),
70-
'sortable': 'disable'
70+
headerText: this.labelMapper('archive-path-header'),
71+
sortable: 'disable',
72+
resizeable: 'enabled'
7173
}
7274
];
7375

‎webui/src/js/viewModels/domain-design-view.js‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
55
*/
66
define(['models/wkt-project', 'accUtils', 'utils/common-utilities', 'knockout', 'utils/i18n', 'utils/screen-utils',
@@ -261,42 +261,47 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
261261
this.clusterColumnData = [
262262
{
263263
headerText: this.labelMapper('clusters-name-heading'),
264-
sortProperty: 'name'
264+
sortProperty: 'name',
265+
resizable: 'enabled'
265266
},
266267
{
267268
headerText: this.labelMapper('clusters-replicas-heading'),
268-
sortProperty: 'replicas'
269+
sortProperty: 'replicas',
270+
resizable: 'enabled'
269271
},
270272
{
271273
headerText: this.labelMapper('clusters-min-heap-heading'),
272-
sortProperty: 'minHeap'
274+
sortProperty: 'minHeap',
275+
resizable: 'enabled'
273276
},
274277
{
275278
headerText: this.labelMapper('clusters-max-heap-heading'),
276-
sortProperty: 'maxHeap'
279+
sortProperty: 'maxHeap',
280+
resizable: 'enabled'
277281
},
278282
{
279283
headerText: this.labelMapper('clusters-cpu-request-heading'),
280-
sortProperty: 'cpuRequest'
284+
sortProperty: 'cpuRequest',
285+
resizable: 'enabled'
281286
},
282287
{
283288
headerText: this.labelMapper('clusters-memory-request-heading'),
284289
sortProperty: 'memoryRequest'
285290
},
286291
{
287-
'className': 'wkt-table-delete-cell',
288-
'headerClassName': 'wkt-table-add-header',
289-
'headerTemplate': 'chooseHeaderTemplate',
290-
'template': 'actionTemplate',
291-
'sortable': 'disable',
292+
className: 'wkt-table-delete-cell',
293+
headerClassName: 'wkt-table-add-header',
294+
headerTemplate: 'chooseHeaderTemplate',
295+
template: 'actionTemplate',
296+
sortable: 'disable',
292297
width: viewHelper.BUTTON_COLUMN_WIDTH
293298
},
294299
{
295-
'className': 'wkt-table-delete-cell',
296-
'headerClassName': 'wkt-table-add-header',
297-
'headerTemplate': 'headerTemplate',
298-
'template': 'actionTemplate',
299-
'sortable': 'disable',
300+
className: 'wkt-table-delete-cell',
301+
headerClassName: 'wkt-table-add-header',
302+
headerTemplate: 'headerTemplate',
303+
template: 'actionTemplate',
304+
sortable: 'disable',
300305
width: viewHelper.BUTTON_COLUMN_WIDTH
301306
},
302307
];
@@ -379,9 +384,9 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
379384

380385
this.propertyTableColumnMetadata = () => {
381386
return [
382-
{'headerText': this.labelMapper('propname-header'), 'sortProperty': 'Name', 'resizable': 'enabled'},
383-
{'headerText': this.labelMapper('propvalue-header'), 'sortProperty': 'Value', 'resizable': 'enabled'},
384-
{'headerText': this.labelMapper('propoverride-header'), 'sortProperty': 'Override', 'resizable': 'enabled'},
387+
{headerText: this.labelMapper('propname-header'), sortProperty: 'Name', resizable: 'enabled'},
388+
{headerText: this.labelMapper('propvalue-header'), sortProperty: 'Value', resizable: 'enabled'},
389+
{headerText: this.labelMapper('propoverride-header'), sortProperty: 'Override', resizable: 'enabled'},
385390
];
386391
};
387392

@@ -414,18 +419,19 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
414419
this.nodeSelectorColumnMetadata = [
415420
{
416421
headerText: this.labelMapper('domain-node-selector-label-name-header'),
417-
sortProperty: 'name'
422+
sortProperty: 'name',
423+
resizable: 'enabled'
418424
},
419425
{
420426
headerText: this.labelMapper('domain-node-selector-label-value-header'),
421427
sortable: 'disabled'
422428
},
423429
{
424-
'className': 'wkt-table-delete-cell',
425-
'headerClassName': 'wkt-table-add-header',
426-
'headerTemplate': 'headerTemplate',
427-
'template': 'actionTemplate',
428-
'sortable': 'disable',
430+
className: 'wkt-table-delete-cell',
431+
headerClassName: 'wkt-table-add-header',
432+
headerTemplate: 'headerTemplate',
433+
template: 'actionTemplate',
434+
sortable: 'disable',
429435
width: viewHelper.BUTTON_COLUMN_WIDTH
430436
},
431437
];

‎webui/src/js/viewModels/ingress-design-view-impl.js‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
55
*/
66

@@ -114,43 +114,48 @@ function(i18n, accUtils, ko, ArrayDataProvider, BufferingDataProvider, project,
114114
// this is dynamic to allow i18n fields to load correctly
115115
this.columnData = [
116116
{
117-
'headerText': this.labelMapper('ingress-route-name-label'),
118-
'sortProperty': 'name'
117+
headerText: this.labelMapper('ingress-route-name-label'),
118+
sortProperty: 'name',
119+
resizable: 'enabled'
119120
},
120121
{
121-
'headerText': this.labelMapper('ingress-route-virtualhost-label'),
122-
'sortProperty': 'virtualHost'
122+
headerText: this.labelMapper('ingress-route-virtualhost-label'),
123+
sortProperty: 'virtualHost',
124+
resizable: 'enabled'
123125
},
124126
{
125-
'headerText': this.labelMapper('ingress-route-path-label'),
126-
'sortProperty': 'path'
127+
headerText: this.labelMapper('ingress-route-path-label'),
128+
sortProperty: 'path',
129+
resizable: 'enabled'
127130
},
128131
{
129-
'headerText': this.labelMapper('ingress-route-targetservice-label'),
130-
'sortProperty': 'targetService'
132+
headerText: this.labelMapper('ingress-route-targetservice-label'),
133+
sortProperty: 'targetService',
134+
resizable: 'enabled'
131135
},
132136
{
133-
'headerText': this.labelMapper('ingress-route-targetport-label'),
134-
'sortProperty': 'targetPort'
137+
headerText: this.labelMapper('ingress-route-targetport-label'),
138+
sortProperty: 'targetPort',
139+
resizable: 'enabled'
135140
},
136141
{
137-
'headerText': this.labelMapper('ingress-route-accesspoint-label'),
138-
'sortProperty': 'targetServiceNameSpace'
142+
headerText: this.labelMapper('ingress-route-accesspoint-label'),
143+
sortProperty: 'targetServiceNameSpace'
139144
},
140145
{
141-
'className': 'wkt-table-delete-cell',
142-
'headerClassName': 'wkt-table-add-header',
143-
'headerTemplate': 'chooseHeaderTemplate',
144-
'template': 'actionTemplate',
145-
'sortable': 'disable',
146+
className: 'wkt-table-delete-cell',
147+
headerClassName: 'wkt-table-add-header',
148+
headerTemplate: 'chooseHeaderTemplate',
149+
template: 'actionTemplate',
150+
sortable: 'disable',
146151
width: viewHelper.BUTTON_COLUMN_WIDTH
147152
},
148153
{
149-
'className': 'wkt-table-delete-cell',
150-
'headerClassName': 'wkt-table-add-header',
151-
'headerTemplate': 'headerTemplate',
152-
'template': 'actionTemplate',
153-
'sortable': 'disable',
154+
className: 'wkt-table-delete-cell',
155+
headerClassName: 'wkt-table-add-header',
156+
headerTemplate: 'headerTemplate',
157+
template: 'actionTemplate',
158+
sortable: 'disable',
154159
width: viewHelper.BUTTON_COLUMN_WIDTH
155160
}];
156161

‎webui/src/js/viewModels/kubectl-page.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,24 @@ function(accUtils, ko, project, i18n, ArrayDataProvider, BufferingDataProvider,
4444
this.vzManagedClustersColumnData = [
4545
{
4646
headerText: this.labelMapper('vz-managed-cluster-name-heading'),
47-
sortProperty: 'name'
47+
sortProperty: 'name',
48+
resizable: 'enabled'
4849
},
4950
{
5051
headerText: this.labelMapper('vz-managed-cluster-kubeconfig-heading'),
51-
'sortable': 'disable'
52+
sortable: 'disable',
53+
resizable: 'enabled'
5254
},
5355
{
5456
headerText: this.labelMapper('vz-managed-cluster-kubecontext-heading'),
5557
sortProperty: 'kubeContext'
5658
},
5759
{
58-
'className': 'wkt-table-delete-cell',
59-
'headerClassName': 'wkt-table-add-header',
60-
'headerTemplate': 'headerTemplate',
61-
'template': 'actionTemplate',
62-
'sortable': 'disable',
60+
className: 'wkt-table-delete-cell',
61+
headerClassName: 'wkt-table-add-header',
62+
headerTemplate: 'headerTemplate',
63+
template: 'actionTemplate',
64+
sortable: 'disable',
6365
width: viewHelper.BUTTON_COLUMN_WIDTH
6466
},
6567
];

‎webui/src/js/viewModels/macos-environment-variables-dialog.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ function(accUtils, ko, i18n, viewHelper, ArrayDataProvider, ListDataProviderView
5151

5252
this.environmentVariablesColumnData = [
5353
{
54-
'className': 'wkt-table-env-vars-cell',
55-
'headerClassName': 'wkt-table-env-vars-header',
56-
'headerText': this.labelMapper('name-header'),
57-
'field': 'name',
58-
'resizable': 'enabled',
59-
'weight': 30
54+
className: 'wkt-table-env-vars-cell',
55+
headerClassName: 'wkt-table-env-vars-header',
56+
headerText: this.labelMapper('name-header'),
57+
field: 'name',
58+
resizable: 'enabled',
59+
weight: 30
6060
},
6161
{
62-
'className': 'wkt-table-env-vars-cell',
63-
'headerClassName': 'wkt-table-env-vars-header',
64-
'headerText': this.labelMapper('value-header'),
65-
'field': 'value',
66-
'resizable': 'enabled',
67-
'weight': 70
62+
className: 'wkt-table-env-vars-cell',
63+
headerClassName: 'wkt-table-env-vars-header',
64+
headerText: this.labelMapper('value-header'),
65+
field: 'value',
66+
resizable: 'enabled',
67+
weight: 70
6868
}
6969
];
7070

‎webui/src/js/viewModels/macos-path-directories-dialog.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ function(accUtils, ko, i18n, viewHelper, ArrayDataProvider) {
4545

4646
this.pathDirectoriesColumnData = [
4747
{
48-
'className': 'wkt-table-env-vars-cell',
49-
'headerClassName': 'wkt-table-env-vars-header',
50-
'headerText': this.labelMapper('name-header'),
51-
'field': 'value',
52-
'sortable': 'disable'
48+
className: 'wkt-table-env-vars-cell',
49+
headerClassName: 'wkt-table-env-vars-header',
50+
headerText: this.labelMapper('name-header'),
51+
field: 'value',
52+
sortable: 'disable'
5353
}
5454
];
5555

‎webui/src/js/viewModels/model-properties-view.js‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
55
*/
66
define(['accUtils', 'knockout', 'utils/i18n', 'utils/view-helper', 'ojs/ojarraydataprovider',
@@ -20,21 +20,20 @@ function (accUtils, ko, i18n, viewHelper, ArrayDataProvider, BufferingDataProvid
2020
// this is dynamic to allow i18n fields to load correctly
2121
this.columnData = [
2222
{
23-
'headerText': this.labelMapper('name-header'),
24-
'sortProperty': 'Name',
25-
'resizable': 'enabled'
23+
headerText: this.labelMapper('name-header'),
24+
sortProperty: 'Name',
25+
resizable: 'enabled'
2626
},
2727
{
28-
'headerText': this.labelMapper('value-header'),
29-
'sortProperty': 'Value',
30-
'resizable': 'enabled'
28+
headerText: this.labelMapper('value-header'),
29+
sortProperty: 'Value'
3130
},
3231
{
33-
'className': 'wkt-table-delete-cell',
34-
'headerClassName': 'wkt-table-add-header',
35-
'headerTemplate': 'headerTemplate',
36-
'template': 'actionTemplate',
37-
'sortable': 'disable',
32+
className: 'wkt-table-delete-cell',
33+
headerClassName: 'wkt-table-add-header',
34+
headerTemplate: 'headerTemplate',
35+
template: 'actionTemplate',
36+
sortable: 'disable',
3837
width: viewHelper.BUTTON_COLUMN_WIDTH
3938
}];
4039

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /