adding Operator Node Selector, fixing bugs with node selector tables, and adding tooltips to all icon buttons (#160)

* adding Operator Node Selector, fixing bugs with node selector taables, and adding tooltips to all icon buttons

* moving to Jet 13.0.2 and creating new TPL file for release

Author: robertpatrick

THIRD_PARTY_LICENSES.txt

@@ -233,6 +233,8 @@ function processHelmChartValues(args, helmChartValues) {
     for (const [propertyName, propertyValue] of Object.entries(helmChartValues)) {
       if (propertyName === 'imagePullSecrets') {
         args.push(...formatArrayOfObjectsSetArgument(propertyName, propertyValue));
+      } else if (propertyName === 'nodeSelector') {
+        args.push(...formatNodeSelectorSetArgument(propertyValue));
       } else {
         args.push('--set', formatSetArgument(propertyName, propertyValue));
       }
@@ -270,6 +272,22 @@ function formatArrayOfObjectsSetArgument(name, objectArray) {
   return result;
 }
 
+function formatNodeSelectorSetArgument(nodeSelectorMap) {
+  const result = [];
+  for (const [key, value] of Object.entries(nodeSelectorMap)) {
+    result.push('--set', formatSetArgument(`nodeSelector.${_getQuotedInnerKey(key)}`, value, true));
+  }
+  return result;
+}
+
+function _getQuotedInnerKey(key) {
+  let result = key;
+  if (key.includes('.')) {
+    result = `${key.replaceAll('.', '\\.')}`;
+  }
+  return result;
+}
+
 module.exports = {
   addOrUpdateWkoHelmChart,
   installWko,

electron/app/js/helmUtils.js

@@ -10,7 +10,7 @@
     "jet-audit": "ojaf"
   },
   "dependencies": {
-    "@oracle/oraclejet": "^13.0.1",
+    "@oracle/oraclejet": "^13.0.2",
     "@oracle/wrc-jet-pack": "~2.3.0",
     "i18next": "^21.9.1",
     "jquery": "^3.6.0",

electron/app/locales/en/webui.json

@@ -96,7 +96,9 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
         this.memoryLimit = props.createProperty();
         this.memoryLimit.addValidator(...validationHelper.getK8sMemoryValidators());
 
-        this.domainNodeSelector = props.createListProperty(['name', 'value']);
+        // Jet tables do not work if you allow changing the value used as the primary key so always add a uid...
+        //
+        this.domainNodeSelector = props.createListProperty(['uid', 'name', 'value']);
 
         // update the secrets list when the uid changes.
         this.uid.observable.subscribe(() => {

webui/package-lock.json

@@ -64,6 +64,10 @@ define(['utils/observable-properties', 'utils/validation-helper'],
         this.javaLoggingFileSizeLimit = props.createProperty(20000000);
         this.javaLoggingFileCount = props.createProperty(10);
 
+        // Jet tables do not work if you allow changing the value used as the primary key so always add a uid...
+        //
+        this.nodeSelector = props.createListProperty(['uid', 'name', 'value']);
+
         // internal fields that should not be read or written to the project file.
         this.internal = {
           operatorImagePullRegistryAddress: props.createProperty()

webui/package.json

@@ -234,6 +234,17 @@ function(WktActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val
       this.addHelmChartValueIfSet(helmChartValues, 'javaLoggingFileSizeLimit', this.project.wko.javaLoggingFileSizeLimit);
       this.addHelmChartValueIfSet(helmChartValues, 'javaLoggingFileCount', this.project.wko.javaLoggingFileCount);
 
+      if (this.project.wko.nodeSelector.hasValue()) {
+        const nodeSelectorMap = {};
+        this.project.wko.nodeSelector.value.forEach(label => {
+          nodeSelectorMap[label.name] = label.value;
+        });
+
+        if (Object.keys(nodeSelectorMap).length > 0) {
+          helmChartValues['nodeSelector'] = nodeSelectorMap;
+        }
+      }
+
       return helmChartValues;
     }
 
@@ -336,4 +347,4 @@ function(WktActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val
   }
 
   return WkoActionsBase;
-});
+});

webui/src/js/models/k8s-domain-definition.js

@@ -213,6 +213,10 @@ function(accUtils, ko, i18n, project, wktConsole, dialogHelper, viewHelper, scre
       return this.navCollapsed() ? 'oj-ux-ico-arrow-right' : 'oj-ux-ico-arrow-left';
     }, this);
 
+    this.collapseArrowTooltip = ko.computed(() => {
+      return this.navCollapsed() ? this.labelMapper('expand-arrow-tooltip') : this.labelMapper('collapse-arrow-tooltip');
+    });
+
     this.collapseNav = () => {
       this.navCollapsed(!this.navCollapsed());
 

webui/src/js/models/wko-definition.js

@@ -21,14 +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();
-      }));
-
       subscriptions.push(project.image.createPrimaryImage.observable.subscribe(() => {
         document.getElementById('create-image-switch').refresh();
         const primaryImageTag = document.getElementById('primary-image-tag');
@@ -423,8 +415,8 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
       },
     ];
 
-    this.domainNodeSelectorDP =
-      new ArrayDataProvider(this.project.k8sDomain.domainNodeSelector.observable, { keyAttributes: 'name' });
+    this.domainNodeSelectorDP = new BufferingDataProvider(
+      new ArrayDataProvider(this.project.k8sDomain.domainNodeSelector.observable, { keyAttributes: 'uid' }));
 
     this.handleAddDomainNodeSelector = () => {
       const labelNames = [];
@@ -437,7 +429,11 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
         nextIndex++;
       }
 
-      this.project.k8sDomain.domainNodeSelector.addNewItem({ name: `new-label-${nextIndex + 1}`, value: '' });
+      this.project.k8sDomain.domainNodeSelector.addNewItem({
+        uid: utils.getShortUuid(),
+        name: `new-label-${nextIndex + 1}`,
+        value: ''
+      });
     };
   }