Skip to content

clean up the tables to make them more uniform #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions webui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@oracle/oraclejet": "^13.1.7",
"@oracle/wrc-jet-pack": "^2.4.2-develop.202303071626",
"@oracle/wrc-jet-pack": "^2.4.2-develop.202303162018",
"ace-builds": "^1.15.0",
"i18next": "^22.4.9",
"jquery": "^3.6.3",
Expand Down
10 changes: 6 additions & 4 deletions webui/src/js/viewModels/discover-result-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ function(accUtils, ko, i18n, viewHelper, ArrayDataProvider) {

this.typesColumnData = [
{
'headerText': this.labelMapper('file-location-header'),
'sortProperty': 'file'
headerText: this.labelMapper('file-location-header'),
sortProperty: 'file',
resizeable: 'enabled'
},
{
'headerText': this.labelMapper('archive-path-header'),
'sortable': 'disable'
headerText: this.labelMapper('archive-path-header'),
sortable: 'disable',
resizeable: 'enabled'
}
];

Expand Down
56 changes: 31 additions & 25 deletions webui/src/js/viewModels/domain-design-view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
*/
define(['models/wkt-project', 'accUtils', 'utils/common-utilities', 'knockout', 'utils/i18n', 'utils/screen-utils',
Expand Down Expand Up @@ -261,42 +261,47 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
this.clusterColumnData = [
{
headerText: this.labelMapper('clusters-name-heading'),
sortProperty: 'name'
sortProperty: 'name',
resizable: 'enabled'
},
{
headerText: this.labelMapper('clusters-replicas-heading'),
sortProperty: 'replicas'
sortProperty: 'replicas',
resizable: 'enabled'
},
{
headerText: this.labelMapper('clusters-min-heap-heading'),
sortProperty: 'minHeap'
sortProperty: 'minHeap',
resizable: 'enabled'
},
{
headerText: this.labelMapper('clusters-max-heap-heading'),
sortProperty: 'maxHeap'
sortProperty: 'maxHeap',
resizable: 'enabled'
},
{
headerText: this.labelMapper('clusters-cpu-request-heading'),
sortProperty: 'cpuRequest'
sortProperty: 'cpuRequest',
resizable: 'enabled'
},
{
headerText: this.labelMapper('clusters-memory-request-heading'),
sortProperty: 'memoryRequest'
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'chooseHeaderTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'chooseHeaderTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'headerTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'headerTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
},
];
Expand Down Expand Up @@ -379,9 +384,9 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider

this.propertyTableColumnMetadata = () => {
return [
{'headerText': this.labelMapper('propname-header'), 'sortProperty': 'Name', 'resizable': 'enabled'},
{'headerText': this.labelMapper('propvalue-header'), 'sortProperty': 'Value', 'resizable': 'enabled'},
{'headerText': this.labelMapper('propoverride-header'), 'sortProperty': 'Override', 'resizable': 'enabled'},
{ headerText: this.labelMapper('propname-header'), sortProperty: 'Name', resizable: 'enabled' },
{ headerText: this.labelMapper('propvalue-header'), sortProperty: 'Value', resizable: 'enabled' },
{ headerText: this.labelMapper('propoverride-header'), sortProperty: 'Override', resizable: 'enabled' },
];
};

Expand Down Expand Up @@ -414,18 +419,19 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
this.nodeSelectorColumnMetadata = [
{
headerText: this.labelMapper('domain-node-selector-label-name-header'),
sortProperty: 'name'
sortProperty: 'name',
resizable: 'enabled'
},
{
headerText: this.labelMapper('domain-node-selector-label-value-header'),
sortable: 'disabled'
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'headerTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'headerTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
},
];
Expand Down
51 changes: 28 additions & 23 deletions webui/src/js/viewModels/ingress-design-view-impl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
*/

Expand Down Expand Up @@ -114,43 +114,48 @@ function(i18n, accUtils, ko, ArrayDataProvider, BufferingDataProvider, project,
// this is dynamic to allow i18n fields to load correctly
this.columnData = [
{
'headerText': this.labelMapper('ingress-route-name-label'),
'sortProperty': 'name'
headerText: this.labelMapper('ingress-route-name-label'),
sortProperty: 'name',
resizable: 'enabled'
},
{
'headerText': this.labelMapper('ingress-route-virtualhost-label'),
'sortProperty': 'virtualHost'
headerText: this.labelMapper('ingress-route-virtualhost-label'),
sortProperty: 'virtualHost',
resizable: 'enabled'
},
{
'headerText': this.labelMapper('ingress-route-path-label'),
'sortProperty': 'path'
headerText: this.labelMapper('ingress-route-path-label'),
sortProperty: 'path',
resizable: 'enabled'
},
{
'headerText': this.labelMapper('ingress-route-targetservice-label'),
'sortProperty': 'targetService'
headerText: this.labelMapper('ingress-route-targetservice-label'),
sortProperty: 'targetService',
resizable: 'enabled'
},
{
'headerText': this.labelMapper('ingress-route-targetport-label'),
'sortProperty': 'targetPort'
headerText: this.labelMapper('ingress-route-targetport-label'),
sortProperty: 'targetPort',
resizable: 'enabled'
},
{
'headerText': this.labelMapper('ingress-route-accesspoint-label'),
'sortProperty': 'targetServiceNameSpace'
headerText: this.labelMapper('ingress-route-accesspoint-label'),
sortProperty: 'targetServiceNameSpace'
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'chooseHeaderTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'chooseHeaderTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'headerTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'headerTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
}];

Expand Down
16 changes: 9 additions & 7 deletions webui/src/js/viewModels/kubectl-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,24 @@ function(accUtils, ko, project, i18n, ArrayDataProvider, BufferingDataProvider,
this.vzManagedClustersColumnData = [
{
headerText: this.labelMapper('vz-managed-cluster-name-heading'),
sortProperty: 'name'
sortProperty: 'name',
resizable: 'enabled'
},
{
headerText: this.labelMapper('vz-managed-cluster-kubeconfig-heading'),
'sortable': 'disable'
sortable: 'disable',
resizable: 'enabled'
},
{
headerText: this.labelMapper('vz-managed-cluster-kubecontext-heading'),
sortProperty: 'kubeContext'
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'headerTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'headerTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
},
];
Expand Down
24 changes: 12 additions & 12 deletions webui/src/js/viewModels/macos-environment-variables-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ function(accUtils, ko, i18n, viewHelper, ArrayDataProvider, ListDataProviderView

this.environmentVariablesColumnData = [
{
'className': 'wkt-table-env-vars-cell',
'headerClassName': 'wkt-table-env-vars-header',
'headerText': this.labelMapper('name-header'),
'field': 'name',
'resizable': 'enabled',
'weight': 30
className: 'wkt-table-env-vars-cell',
headerClassName: 'wkt-table-env-vars-header',
headerText: this.labelMapper('name-header'),
field: 'name',
resizable: 'enabled',
weight: 30
},
{
'className': 'wkt-table-env-vars-cell',
'headerClassName': 'wkt-table-env-vars-header',
'headerText': this.labelMapper('value-header'),
'field': 'value',
'resizable': 'enabled',
'weight': 70
className: 'wkt-table-env-vars-cell',
headerClassName: 'wkt-table-env-vars-header',
headerText: this.labelMapper('value-header'),
field: 'value',
resizable: 'enabled',
weight: 70
}
];

Expand Down
10 changes: 5 additions & 5 deletions webui/src/js/viewModels/macos-path-directories-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ function(accUtils, ko, i18n, viewHelper, ArrayDataProvider) {

this.pathDirectoriesColumnData = [
{
'className': 'wkt-table-env-vars-cell',
'headerClassName': 'wkt-table-env-vars-header',
'headerText': this.labelMapper('name-header'),
'field': 'value',
'sortable': 'disable'
className: 'wkt-table-env-vars-cell',
headerClassName: 'wkt-table-env-vars-header',
headerText: this.labelMapper('name-header'),
field: 'value',
sortable: 'disable'
}
];

Expand Down
23 changes: 11 additions & 12 deletions webui/src/js/viewModels/model-properties-view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright (c) 2021, Oracle and/or its affiliates.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
*/
define(['accUtils', 'knockout', 'utils/i18n', 'utils/view-helper', 'ojs/ojarraydataprovider',
Expand All @@ -20,21 +20,20 @@ function (accUtils, ko, i18n, viewHelper, ArrayDataProvider, BufferingDataProvid
// this is dynamic to allow i18n fields to load correctly
this.columnData = [
{
'headerText': this.labelMapper('name-header'),
'sortProperty': 'Name',
'resizable': 'enabled'
headerText: this.labelMapper('name-header'),
sortProperty: 'Name',
resizable: 'enabled'
},
{
'headerText': this.labelMapper('value-header'),
'sortProperty': 'Value',
'resizable': 'enabled'
headerText: this.labelMapper('value-header'),
sortProperty: 'Value'
},
{
'className': 'wkt-table-delete-cell',
'headerClassName': 'wkt-table-add-header',
'headerTemplate': 'headerTemplate',
'template': 'actionTemplate',
'sortable': 'disable',
className: 'wkt-table-delete-cell',
headerClassName: 'wkt-table-add-header',
headerTemplate: 'headerTemplate',
template: 'actionTemplate',
sortable: 'disable',
width: viewHelper.BUTTON_COLUMN_WIDTH
}];

Expand Down
Loading