fixing discover domain and base image inspect bugs

Author: robertpatrick

electron/app/js/witCreate.js

@@ -23,11 +23,14 @@ async function createImage(currentWindow, stdoutChannel, stderrChannel, createCo
     DOCKER_BUILDKIT: '0',
     WLSIMG_BLDDIR: app.getPath('temp')
   };
+  // imagetool only honors the lower-cased versions of these variables...
   if (httpsProxyUrl) {
     env['HTTPS_PROXY'] = httpsProxyUrl;
+    env['https_proxy'] = httpsProxyUrl;
   }
   if (bypassProxyHosts) {
     env['NO_PROXY'] = bypassProxyHosts;
+    env['no_proxy'] = bypassProxyHosts;
   }
 
   const result = {

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

@@ -135,6 +135,10 @@ define(['knockout', 'utils/observable-properties', 'utils/validation-helper'],
             host = window.api.k8s.getRegistryAddressFromImageTag(value);
           }
           this.internal.baseImageRegistryAddress.observable(host);
+
+          // any time the baseImage changes, reset these fields...
+          this.baseImageInspected.observable(false);
+          this.customBaseImageContents.observable([]);
         });
 
         this.auxBaseImage.observable.subscribe(value => {
@@ -183,12 +187,14 @@ define(['knockout', 'utils/observable-properties', 'utils/validation-helper'],
           }
         };
 
+        // Ignore the customBaseImageContents field if using custom base image is turned off...
         this.baseImageContentsIncludesJava = () => {
-          return this.customBaseImageContents.value.includes('javaHome');
+          return this.useCustomBaseImage.value && this.customBaseImageContents.value.includes('javaHome');
         };
 
+        // Ignore the customBaseImageContents field if using custom base image is turned off...
         this.baseImageContentsIncludesMiddleware = () => {
-          return this.customBaseImageContents.value.includes('oracleHome');
+          return this.useCustomBaseImage.value && this.customBaseImageContents.value.includes('oracleHome');
         };
       }
 

webui/src/js/utils/wdt-discoverer.js

@@ -21,7 +21,7 @@ function (WdtActionsBase, ko, project, wktConsole, dialogHelper, projectIO, i18n
     // open the discover configuration dialog.
     async startDiscoverDomain(online) {
       const discoverConfig = {'online': online};
-      dialogHelper.openDialog('wdt-discover', discoverConfig);
+      dialogHelper.openDialog('discover-dialog', discoverConfig);
     }
 
     // the dialog will call this when the OK button is clicked.

webui/src/js/views/image-design-view.html

@@ -159,7 +159,7 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('jdk-installer-tit
               </div>
             </oj-bind-if>
 
-            <oj-bind-if test="[[customImageDoesNotContainsOracleHome]]">
+            <oj-bind-if test="[[customImageDoesNotContainsOracleHome() == true]]">
               <div class="oj-panel">
                 <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('fmw-installer-title')]]"></oj-bind-text></h6>
                 <oj-form-layout max-columns="1" direction="row">
@@ -187,7 +187,7 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('fmw-installer-tit
           </div>
 
           <div>
-            <oj-bind-if test="[[customImageDoesNotContainsOracleHome]]">
+            <oj-bind-if test="[[customImageDoesNotContainsOracleHome() === true]]">
               <div class="oj-panel">
                 <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('patches-title')]]"></oj-bind-text></h6>
                 <oj-form-layout max-columns="1" direction="row">