From 60dc7589b396053556bc825a6c2bb5e615d6815a Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Thu, 16 Mar 2023 20:14:02 -0500 Subject: [PATCH 1/2] cleanup up the tables to make them more uniform --- webui/package-lock.json | 14 ++-- webui/package.json | 2 +- .../js/viewModels/discover-result-dialog.js | 10 +-- webui/src/js/viewModels/domain-design-view.js | 60 +++++++++------- .../js/viewModels/ingress-design-view-impl.js | 50 +++++++------ webui/src/js/viewModels/kubectl-page.js | 19 ++--- .../macos-environment-variables-dialog.js | 24 +++---- .../macos-path-directories-dialog.js | 10 +-- .../js/viewModels/model-properties-view.js | 22 +++--- .../src/js/viewModels/operator-design-view.js | 16 +++-- .../js/viewModels/project-settings-page.js | 56 ++++++++------- webui/src/js/viewModels/route-edit-dialog.js | 20 +++--- .../viewModels/vz-application-design-view.js | 40 +++++------ .../js/viewModels/vz-component-design-view.js | 70 ++++++++++--------- .../vz-ingress-trait-rule-edit-dialog.js | 20 +++--- webui/src/js/views/route-edit-dialog.html | 2 + 16 files changed, 234 insertions(+), 201 deletions(-) diff --git a/webui/package-lock.json b/webui/package-lock.json index 2fdbb86c6..ca230c9e5 100644 --- a/webui/package-lock.json +++ b/webui/package-lock.json @@ -6,7 +6,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", @@ -921,9 +921,9 @@ "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "node_modules/@oracle/wrc-jet-pack": { - "version": "2.4.2-develop.202303071626", - "resolved": "https://registry.npmjs.org/@oracle/wrc-jet-pack/-/wrc-jet-pack-2.4.2-develop.202303071626.tgz", - "integrity": "sha512-Fs6QHfAOkgY70GFhM1IjGYbGjbavpmTly5GQS/u8HWGjnIoOyROKr/JPQnHxrHYKoBZM2SKKfPGTsD2NKzWB9Q==", + "version": "2.4.2-develop.202303162018", + "resolved": "https://registry.npmjs.org/@oracle/wrc-jet-pack/-/wrc-jet-pack-2.4.2-develop.202303162018.tgz", + "integrity": "sha512-OjcG4RWb+zqa4CoC8TYJgYxUj3GKug5R3gKaLSuYxnHGUvqUx9nfBEDdOomsFXCZBA/f38R/iTA9ErbHCmhFHw==", "engines": { "node": ">=4.0.0" } @@ -7818,9 +7818,9 @@ } }, "@oracle/wrc-jet-pack": { - "version": "2.4.2-develop.202303071626", - "resolved": "https://registry.npmjs.org/@oracle/wrc-jet-pack/-/wrc-jet-pack-2.4.2-develop.202303071626.tgz", - "integrity": "sha512-Fs6QHfAOkgY70GFhM1IjGYbGjbavpmTly5GQS/u8HWGjnIoOyROKr/JPQnHxrHYKoBZM2SKKfPGTsD2NKzWB9Q==" + "version": "2.4.2-develop.202303162018", + "resolved": "https://registry.npmjs.org/@oracle/wrc-jet-pack/-/wrc-jet-pack-2.4.2-develop.202303162018.tgz", + "integrity": "sha512-OjcG4RWb+zqa4CoC8TYJgYxUj3GKug5R3gKaLSuYxnHGUvqUx9nfBEDdOomsFXCZBA/f38R/iTA9ErbHCmhFHw==" }, "@tootallnate/once": { "version": "2.0.0", diff --git a/webui/package.json b/webui/package.json index 6f3d33afa..493b03584 100644 --- a/webui/package.json +++ b/webui/package.json @@ -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", diff --git a/webui/src/js/viewModels/discover-result-dialog.js b/webui/src/js/viewModels/discover-result-dialog.js index 6eafe4d72..57129a2bb 100644 --- a/webui/src/js/viewModels/discover-result-dialog.js +++ b/webui/src/js/viewModels/discover-result-dialog.js @@ -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' } ]; diff --git a/webui/src/js/viewModels/domain-design-view.js b/webui/src/js/viewModels/domain-design-view.js index 7e265ba50..dd2c7d146 100644 --- a/webui/src/js/viewModels/domain-design-view.js +++ b/webui/src/js/viewModels/domain-design-view.js @@ -261,42 +261,48 @@ 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' + sortProperty: 'memoryRequest', + resizable: 'enabled' }, { - '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 }, ]; @@ -379,9 +385,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' }, ]; }; @@ -414,18 +420,20 @@ 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' + sortable: 'disabled', + resizable: 'enabled' }, { - '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 }, ]; diff --git a/webui/src/js/viewModels/ingress-design-view-impl.js b/webui/src/js/viewModels/ingress-design-view-impl.js index da5583e0c..f4a2305fc 100644 --- a/webui/src/js/viewModels/ingress-design-view-impl.js +++ b/webui/src/js/viewModels/ingress-design-view-impl.js @@ -114,43 +114,49 @@ 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', + resizable: 'enabled' }, { - '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 }]; diff --git a/webui/src/js/viewModels/kubectl-page.js b/webui/src/js/viewModels/kubectl-page.js index aca6cb4be..d5fcbe379 100644 --- a/webui/src/js/viewModels/kubectl-page.js +++ b/webui/src/js/viewModels/kubectl-page.js @@ -44,22 +44,25 @@ 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' + sortProperty: 'kubeContext', + resizable: 'enabled' }, { - '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 }, ]; diff --git a/webui/src/js/viewModels/macos-environment-variables-dialog.js b/webui/src/js/viewModels/macos-environment-variables-dialog.js index 61fab7a1d..beffb81ef 100644 --- a/webui/src/js/viewModels/macos-environment-variables-dialog.js +++ b/webui/src/js/viewModels/macos-environment-variables-dialog.js @@ -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 } ]; diff --git a/webui/src/js/viewModels/macos-path-directories-dialog.js b/webui/src/js/viewModels/macos-path-directories-dialog.js index 3a5941fb6..eda69214b 100644 --- a/webui/src/js/viewModels/macos-path-directories-dialog.js +++ b/webui/src/js/viewModels/macos-path-directories-dialog.js @@ -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' } ]; diff --git a/webui/src/js/viewModels/model-properties-view.js b/webui/src/js/viewModels/model-properties-view.js index 9aa4fd2a3..932a8dc50 100644 --- a/webui/src/js/viewModels/model-properties-view.js +++ b/webui/src/js/viewModels/model-properties-view.js @@ -20,21 +20,21 @@ 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', + resizable: 'enabled' }, { - '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 }]; diff --git a/webui/src/js/viewModels/operator-design-view.js b/webui/src/js/viewModels/operator-design-view.js index 01928290e..4618e37a0 100644 --- a/webui/src/js/viewModels/operator-design-view.js +++ b/webui/src/js/viewModels/operator-design-view.js @@ -95,18 +95,20 @@ function (i18n, accUtils, ko, CoreRouter, ModuleRouterAdapter, ArrayDataProvider this.nodeSelectorColumnMetadata = [ { headerText: this.labelMapper('node-selector-label-name-header'), - sortProperty: 'name' + sortProperty: 'name', + resizable: 'enabled' }, { headerText: this.labelMapper('node-selector-label-value-header'), - sortable: 'disabled' + sortable: 'disabled', + resizable: 'enabled' }, { - '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 }, ]; diff --git a/webui/src/js/viewModels/project-settings-page.js b/webui/src/js/viewModels/project-settings-page.js index 7ad124a29..55047ed49 100644 --- a/webui/src/js/viewModels/project-settings-page.js +++ b/webui/src/js/viewModels/project-settings-page.js @@ -30,25 +30,25 @@ function(accUtils, ko, i18n, project, ArrayDataProvider, this.extraPathColumnData = [ { - 'className': 'wkt-table-path-cell', - 'headerClassName': 'wkt-table-path-header', - 'headerText': this.labelMapper('extra-path-directory-header'), - 'sortable': 'disable' + className: 'wkt-table-path-cell', + headerClassName: 'wkt-table-path-header', + headerText: this.labelMapper('extra-path-directory-header'), + sortable: 'disable' }, { - '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 } ]; @@ -64,23 +64,25 @@ function(accUtils, ko, i18n, project, ArrayDataProvider, this.extraEnvironmentVariablesColumnData = [ { - 'className': 'wkt-table-env-vars-cell', - 'headerClassName': 'wkt-table-env-vars-header', - 'headerText': this.labelMapper('extra-environment-variable-name-header'), - 'sortProperty': 'name' + className: 'wkt-table-env-vars-cell', + headerClassName: 'wkt-table-env-vars-header', + headerText: this.labelMapper('extra-environment-variable-name-header'), + sortProperty: 'name', + resizable: 'enabled' }, { - 'className': 'wkt-table-env-vars-cell', - 'headerClassName': 'wkt-table-env-vars-header', - 'headerText': this.labelMapper('extra-environment-variable-value-header'), - 'sortable': 'disable' + className: 'wkt-table-env-vars-cell', + headerClassName: 'wkt-table-env-vars-header', + headerText: this.labelMapper('extra-environment-variable-value-header'), + sortable: 'disable', + resizable: 'enabled' }, { - '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 } ]; diff --git a/webui/src/js/viewModels/route-edit-dialog.js b/webui/src/js/viewModels/route-edit-dialog.js index 2a97ba4e9..9a8510567 100644 --- a/webui/src/js/viewModels/route-edit-dialog.js +++ b/webui/src/js/viewModels/route-edit-dialog.js @@ -80,19 +80,21 @@ function(accUtils, ko, i18n, project, viewHelper, ArrayDataProvider, BufferingDa // this is dynamic to allow i18n fields to load correctly this.annotationColumns = [ { - 'headerText': this.labelMapper('route-annotation-label'), - 'sortProperty': 'key' + headerText: this.labelMapper('route-annotation-label'), + sortProperty: 'key', + resizable: 'enabled' }, { - 'headerText': this.labelMapper('route-annotationValue-label'), - 'sortProperty': 'value' + headerText: this.labelMapper('route-annotationValue-label'), + sortProperty: 'value', + resizable: 'enabled' }, { - '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' } ]; diff --git a/webui/src/js/viewModels/vz-application-design-view.js b/webui/src/js/viewModels/vz-application-design-view.js index 2112473c8..d93655603 100644 --- a/webui/src/js/viewModels/vz-application-design-view.js +++ b/webui/src/js/viewModels/vz-application-design-view.js @@ -431,39 +431,39 @@ function (project, accUtils, utils, ko, i18n, BufferingDataProvider, ArrayDataPr // this is dynamic to allow i18n fields to load correctly this.ingressTraitRulesColumnData = [ { - 'headerText': this.labelMapper('ingress-trait-rules-hosts-label'), + headerText: this.labelMapper('ingress-trait-rules-hosts-label'), 'resizable': 'enabled', - 'sortable': 'disable' + sortable: 'disable' }, { - 'headerText': this.labelMapper('ingress-trait-rules-first-path-label'), + headerText: this.labelMapper('ingress-trait-rules-first-path-label'), 'resizable': 'enabled', - 'sortable': 'disable' + sortable: 'disable' }, { - 'headerText': this.labelMapper('ingress-trait-rules-first-path-url-label'), - 'resizable': 'enabled', - 'sortable': 'disable', - 'width': '35%' + headerText: this.labelMapper('ingress-trait-rules-first-path-url-label'), + resizable: 'enabled', + sortable: 'disable', + width: '35%' }, { - 'headerText': this.labelMapper('ingress-trait-rules-destination-label'), - 'sortable': 'disable' + headerText: this.labelMapper('ingress-trait-rules-destination-label'), + sortable: 'disable' }, { - '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 }, ]; diff --git a/webui/src/js/viewModels/vz-component-design-view.js b/webui/src/js/viewModels/vz-component-design-view.js index 954e80e71..cceacaa57 100644 --- a/webui/src/js/viewModels/vz-component-design-view.js +++ b/webui/src/js/viewModels/vz-component-design-view.js @@ -21,10 +21,6 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider this.applyAuxImageConfig(newValue); })); - // subscriptions.push(this.project.k8sDomain.clusters.observable.subscribe(() => { - // document.getElementById('clusters-table').refresh(); - // })); - subscriptions.push(this.project.k8sDomain.domainNodeSelector.observable.subscribe(() => { document.getElementById('domain-node-selector-table').refresh(); })); @@ -261,42 +257,48 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider this.clusterColumnData = [ { headerText: this.domainLabelMapper('clusters-name-heading'), - sortProperty: 'name' + sortProperty: 'name', + resizable: 'enabled' }, { headerText: this.domainLabelMapper('clusters-replicas-heading'), - sortProperty: 'replicas' + sortProperty: 'replicas', + resizable: 'enabled' }, { headerText: this.domainLabelMapper('clusters-min-heap-heading'), - sortProperty: 'minHeap' + sortProperty: 'minHeap', + resizable: 'enabled' }, { headerText: this.domainLabelMapper('clusters-max-heap-heading'), - sortProperty: 'maxHeap' + sortProperty: 'maxHeap', + resizable: 'enabled' }, { headerText: this.domainLabelMapper('clusters-cpu-request-heading'), - sortProperty: 'cpuRequest' + sortProperty: 'cpuRequest', + resizable: 'enabled' }, { headerText: this.domainLabelMapper('clusters-memory-request-heading'), - sortProperty: 'memoryRequest' + sortProperty: 'memoryRequest', + resizable: 'enabled' }, { - '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 }, ]; @@ -379,9 +381,9 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider this.propertyTableColumnMetadata = () => { return [ - {'headerText': this.domainLabelMapper('propname-header'), 'sortProperty': 'Name', 'resizable': 'enabled'}, - {'headerText': this.domainLabelMapper('propvalue-header'), 'sortProperty': 'Value', 'resizable': 'enabled'}, - {'headerText': this.domainLabelMapper('propoverride-header'), 'sortProperty': 'Override', 'resizable': 'enabled'}, + {'headerText': this.domainLabelMapper('propname-header'), sortProperty: 'Name', resizable: 'enabled'}, + {'headerText': this.domainLabelMapper('propvalue-header'), sortProperty: 'Value', resizable: 'enabled'}, + {'headerText': this.domainLabelMapper('propoverride-header'), sortProperty: 'Override', resizable: 'enabled'}, ]; }; @@ -402,9 +404,9 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider this.secretsTableColumnMetadata = () => { return [ - {'headerText': this.domainLabelMapper('secretname-header'), 'sortProperty': 'name', 'resizable': 'enabled'}, - {'headerText': this.domainLabelMapper('username-header'), 'sortable': 'disabled', 'resizable': 'enabled'}, - {'headerText': this.domainLabelMapper('password-header'), 'sortable': 'disabled', 'resizable': 'enabled'}, + {'headerText': this.domainLabelMapper('secretname-header'), sortProperty: 'name', resizable: 'enabled'}, + {'headerText': this.domainLabelMapper('username-header'), 'sortable': 'disabled', resizable: 'enabled'}, + {'headerText': this.domainLabelMapper('password-header'), 'sortable': 'disabled', resizable: 'enabled'}, ]; }; @@ -414,18 +416,20 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider this.nodeSelectorColumnMetadata = [ { headerText: this.domainLabelMapper('domain-node-selector-label-name-header'), - sortProperty: 'name' + sortProperty: 'name', + resizable: 'enabled' }, { headerText: this.domainLabelMapper('domain-node-selector-label-value-header'), - sortable: 'disabled' + sortable: 'disabled', + resizable: 'enabled' }, { - '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 }, ]; diff --git a/webui/src/js/viewModels/vz-ingress-trait-rule-edit-dialog.js b/webui/src/js/viewModels/vz-ingress-trait-rule-edit-dialog.js index 52d23458d..0d349a6f1 100644 --- a/webui/src/js/viewModels/vz-ingress-trait-rule-edit-dialog.js +++ b/webui/src/js/viewModels/vz-ingress-trait-rule-edit-dialog.js @@ -167,19 +167,21 @@ function(accUtils, ko, i18n, project, props, validationHelper, // this is dynamic to allow i18n fields to load correctly this.pathsColumns = [ { - 'headerText': this.labelMapper('path-type-label'), - 'sortProperty': 'pathType' + headerText: this.labelMapper('path-type-label'), + sortProperty: 'pathType', + resizable: 'enabled' }, { - 'headerText': this.labelMapper('path-label'), - 'sortProperty': 'path' + headerText: this.labelMapper('path-label'), + sortProperty: 'path', + resizable: 'enabled' }, { - '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' } ]; diff --git a/webui/src/js/views/route-edit-dialog.html b/webui/src/js/views/route-edit-dialog.html index c97d99517..63bbb7e9c 100644 --- a/webui/src/js/views/route-edit-dialog.html +++ b/webui/src/js/views/route-edit-dialog.html @@ -83,6 +83,8 @@
:aria-label="[[labelMapper('route-annotations-table-aria-label')]]" data="[[annotationsProvider]]" edit-mode="rowEdit" + horizontal-grid-visible="enabled" + vertical-grid-visible="enabled" columns='[[annotationColumns]]'>