Provide a list of server and cluster hosts for ingress rule dialog (#213)

* Provide a list of server and cluster hosts for ingress rule dialog

* Use template for string assignment

* Use template for string assignment

Author: rakillen

electron/app/js/wdtPrepareModel.js

@@ -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 v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 'use strict';
@@ -291,6 +291,16 @@ function formatResultsData(jsonContent) {
   }
   domain['clusters'] = clustersResult;
 
+  const servers = jsonContent['servers'] || [];
+  const serversResult = [];
+  for (const [serverName] of Object.entries(servers)) {
+    const serverResult = {
+      serverName: serverName
+    };
+    serversResult.push(serverResult);
+  }
+  domain['servers'] = serversResult;
+
   results['domain'] = domain;
   return results;
 }

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

@@ -75,6 +75,11 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
         ];
         this.clusters = props.createListProperty(this.clusterKeys).persistByKey('uid');
 
+        this.serverKeys = [
+          'uid', 'name'
+        ];
+        this.servers = props.createListProperty(this.serverKeys).persistByKey('uid');
+
         this.modelConfigMapName = props.createProperty('${1}-config-map', this.uid.observable);
         this.modelConfigMapName.addValidator(...validationHelper.getK8sNameValidators());
 
@@ -219,6 +224,21 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
               return remove;
             });
           }
+
+          if (domain && Array.isArray(domain.servers)) {
+            domain.servers.forEach(server => this.setServerRow(server));
+            // Remove any servers that are no longer in the model
+            this.servers.observable.remove(server => {
+              let remove = true;
+              for (const prepareModelServer of domain.servers) {
+                if (prepareModelServer.serverName === server.name) {
+                  remove = false;
+                  break;
+                }
+              }
+              return remove;
+            });
+          }
         };
 
         this.setClusterRow = (prepareModelCluster) => {
@@ -245,6 +265,24 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
           }
         };
 
+        this.setServerRow = (prepareModelServer) => {
+          let server;
+          for (const row of this.servers.observable()) {
+            if (row.name === prepareModelServer.serverName) {
+              server = row;
+              break;
+            }
+          }
+          if (server) {
+            this.servers.observable.replace(server, server);
+          } else {
+            this.servers.addNewItem({
+              uid: utils.getShortUuid(),
+              name: prepareModelServer.serverName
+            });
+          }
+        };
+
         this.handlePrepareModelSecrets = (secrets) => {
           if (secrets && secrets.length) {
             wktLogger.debug('handlePrepareModelSecrets() working on %d secrets', secrets.length);

webui/src/js/viewModels/vz-ingress-trait-rule-edit-dialog.js

@@ -1,15 +1,17 @@
 /**
  * @license
- * Copyright (c) 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 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/
  */
 'use strict';
 
-define(['accUtils', 'knockout', 'utils/i18n', 'utils/observable-properties', 'utils/validation-helper',
-  'ojs/ojarraydataprovider', 'ojs/ojconverter-number', 'utils/common-utilities', 'utils/wkt-logger',
-  'ojs/ojselectcombobox', 'ojs/ojinputtext', 'ojs/ojlabel', 'ojs/ojbutton', 'ojs/ojdialog', 'ojs/ojformlayout',
-  'ojs/ojvalidationgroup'],
-function(accUtils, ko, i18n, props, validationHelper, ArrayDataProvider, ojConverterNumber, utils, wktLogger) {
+define(['accUtils', 'knockout', 'utils/i18n', 'models/wkt-project', 'utils/observable-properties',
+  'utils/validation-helper', 'ojs/ojarraydataprovider', 'ojs/ojconverter-number', 'utils/common-utilities',
+  'utils/wkt-logger', 'ojs/ojselectcombobox', 'ojs/ojinputtext', 'ojs/ojlabel', 'ojs/ojbutton', 'ojs/ojdialog',
+  'ojs/ojformlayout', 'ojs/ojvalidationgroup'],
+function(accUtils, ko, i18n, project, props, validationHelper,
+  ArrayDataProvider, ojConverterNumber, utils, wktLogger) {
+
   function VerrazzanoIngressTraitRuleEditDialogModel(args) {
     const DIALOG_SELECTOR = '#vzIngressTraitEditRuleDialog';
 
@@ -181,6 +183,28 @@ function(accUtils, ko, i18n, props, validationHelper, ArrayDataProvider, ojConve
       }
     ];
 
+    this.destinationHostNames = ko.computed(() => {
+      let options = [];
+      const domainName = project.wdtModel.domainName();
+
+      const clusters = project.k8sDomain.clusters.observable();
+      for (const cluster of clusters) {
+        const clusterHostName = utils.toLegalK8sName(`${domainName}-cluster-${cluster.name}`);
+        options.push( { id : cluster.uid, value: clusterHostName, text: clusterHostName});
+      }
+
+      const servers = project.k8sDomain.servers.observable();
+      for (const server of servers) {
+        const serverHostName = utils.toLegalK8sName(`${domainName}-${server.name}`);
+        options.push( { id : server.uid, value: serverHostName, text: serverHostName});
+      }
+
+      options.sort(function(a, b) {
+        return a.text.localeCompare(b.text);
+      });
+      return options;
+    });
+
     this.pathTypeOptions = [
       { value: 'prefix', label: this.labelMapper('path-type-prefix-label') },
       { value: 'exact', label: this.labelMapper('path-type-exact-label') },

webui/src/js/views/vz-ingress-trait-rule-edit-dialog.html

@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2022, Oracle and/or its affiliates.
+ Copyright (c) 2022, 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/
  -->
 <oj-dialog id="vzIngressTraitEditRuleDialog" class="wkt-add-to-archive-dialog" initial-visibility="hide">
@@ -76,10 +76,11 @@ <h6 class="wkt-subheading">
           <oj-bind-text value="[[labelMapper('destination-title')]]"></oj-bind-text>
         </h6>
         <oj-form-layout max-columns="2" direction="row">
-          <oj-input-text label-hint="[[labelMapper('destination-host-label')]]"
-                         value="{{destinationHost.observable}}"
-                         help.instruction="[[labelMapper('destination-host-help')]]">
-          </oj-input-text>
+          <oj-combobox-one value="{{destinationHost.observable}}"
+                           label-hint="[[labelMapper('destination-host-label')]]"
+                           help.instruction="[[labelMapper('destination-host-help')]]"
+                           options="[[destinationHostNames]]">
+          </oj-combobox-one>
           <oj-input-number label-hint="[[labelMapper('destination-port-label')]]"
                            value="{{destinationPort}}"
                            converter="[[portNumberConverter]]"