cleaning up inspect dialog message, behavior, and usages of ko.computed

Author: robertpatrick

electron/app/locales/en/webui.json

@@ -809,12 +809,8 @@
   "wit-inspector-inspect-failed-title": "Inspect Image Failed",
   "wit-inspector-inspect-failed-error-message":"Unable to inspect image {{imageTag}}: {{error}}.",
   "wit-inspector-inspect-catch-all-error-message": "Inspect Image failed with an unexpected error: {{error}}",
-  "wit-inspector-fmw-version-message": "Oracle Fusion Middleware {{version}} installed at {{path}}",
-  "wit-inspector-fmw-message": "Oracle Fusion Middleware installed at {{path}}",
-  "wit-inspector-java-version-message": "Java {{version}} installed at {{path}}",
-  "wit-inspector-java-message": "Java installed at {{path}}",
-  "wit-inspect-results-fmw-message": "Inspection of image {{imageTag}} found {{javaMessage}} and {{fmwMessage}}.",
-  "wit-inspect-results-java-message": "Inspection of image {{imageTag}} found {{javaMessage}}.",
+  "wit-inspect-results-fmw-message": "Inspection of image {{imageTag}} found both Java and Oracle Fusion Middleware installations.",
+  "wit-inspect-results-java-message": "Inspection of image {{imageTag}} found a Java installation.",
   "wit-inspector-empty-contents-message": "Inspection of image {{imageTag}} did not find Java or Oracle Fusion Middleware installations",
 
   "inspect-dialog-default-title": "Image Contents",
@@ -829,8 +825,8 @@
   "inspect-dialog-oracle-home-path-label": "Location:",
   "inspect-dialog-oracle-home-version-label": "Version:",
   "inspect-dialog-opatch-version-label": "OPatch Version:",
-  "inspect-dialog-oracle-patches-section-title": "Oracle Patches Found:",
-  "inspect-dialog-oracle-one-off-patches-label": "One-Off Patches:",
+  "inspect-dialog-oracle-patches-section-title": "Oracle Patches:",
+  "inspect-dialog-oracle-one-off-patches-label": "Oracle One-Off Patches:",
 
   "wit-creator-image-not-create-message": "The Create New Primary Image option is off so there is nothing to do.",
   "wit-creator-aborted-error-title": "Create Image Aborted",

webui/src/js/utils/wit-inspector.js

@@ -142,39 +142,15 @@ define(['utils/wit-actions-base', 'models/wkt-project', 'utils/i18n', 'utils/pro
       }
 
       getInspectSuccessMessage(imageTag, imageContents) {
-        const hasJdk = 'javaHome' in imageContents;
-        const jdkPath = imageContents.javaHome;
-        const jdkVersion = imageContents.javaVersion;
-        const hasFmw = 'oracleHome' in imageContents;
-        const fmwPath = imageContents.oracleHome;
-        const fmwVersion = imageContents.wlsVersion;
-
-        const fmwMessage = this.getMessage('wit-inspector-fmw', hasFmw, fmwPath, fmwVersion);
-        const javaMessage = this.getMessage('wit-inspector-java', hasJdk, jdkPath, jdkVersion);
-
-        let message;
-        if (fmwMessage) {
-          message = i18n.t('wit-inspect-results-fmw-message',
-            { imageTag: imageTag, javaMessage: javaMessage, fmwMessage: fmwMessage });
-        } else if (javaMessage) {
-          message = i18n.t('wit-inspect-results-java-message',
-            { imageTag: imageTag, javaMessage: javaMessage });
+        let key;
+        if ('oracleHome' in imageContents) {
+          key = 'wit-inspect-results-fmw-message';
+        } else if ('javaHome' in imageContents) {
+          key = 'wit-inspect-results-java-message';
         } else {
-          message = i18n.t('wit-inspector-empty-contents-message', { imageTag: imageTag });
+          key = 'wit-inspector-empty-contents-message';
         }
-        return message;
-      }
-
-      getMessage(i18nPrefix, isInstalled, path, version) {
-        let message;
-        if (isInstalled) {
-          if (version) {
-            message = i18n.t(`${i18nPrefix}-version-message`, { path: path, version: version });
-          } else {
-            message = i18n.t(`${i18nPrefix}-message`, { path: path });
-          }
-        }
-        return message;
+        return i18n.t(key, { imageTag: imageTag });
       }
     }
 

webui/src/js/viewModels/app-main.js

@@ -198,7 +198,7 @@ function(accUtils, ko, i18n, project, wktConsole, dialogHelper, viewHelper, Arra
 
     this.collapseArrowClass = ko.computed(() => {
       return this.navCollapsed() ? 'oj-ux-ico-arrow-right' : 'oj-ux-ico-arrow-left';
-    });
+    }, this);
 
     this.collapseNav = () => {
       this.navCollapsed(!this.navCollapsed());

webui/src/js/viewModels/domain-design-view.js

@@ -33,15 +33,15 @@ function (project, accUtils, utils, ko, i18n, BufferingDataProvider,
 
     this.isDomainInPV = ko.computed(() => {
       return this.project.settings.targetDomainLocation.observable() === 'pv';
-    });
+    }, this);
 
     this.isDomainInImage = ko.computed(() => {
       return this.project.settings.targetDomainLocation.observable() === 'dii';
-    });
+    }, this);
 
     this.isModelInImage = ko.computed(() => {
       return this.project.settings.targetDomainLocation.observable() === 'mii';
-    });
+    }, this);
 
     // Disable JRF as the domain type since the application does not (yet?) provide the mechanisms required
     // to specify the JRF schemas or the database connectivity and credential information needed to run RCU.
@@ -70,7 +70,7 @@ function (project, accUtils, utils, ko, i18n, BufferingDataProvider,
 
     this.usingAuxImage = ko.computed(() => {
       return this.isModelInImage() && this.project.image.useAuxImage.value;
-    });
+    }, this);
 
     this.hasNoClusters = () => {
       return this.project.k8sDomain.clusters.value.length === 0;

webui/src/js/viewModels/image-code-view.js

@@ -42,12 +42,12 @@ function(accUtils, ko, i18n, project, ImageScriptGenerator, ArrayDataProvider) {
 
     this.disablePrimaryImageScript = ko.computed(() => {
       return !this.project.image.createPrimaryImage.value;
-    });
+    }, this);
 
     this.disableAuxiliaryImageScript = ko.computed(() => {
       return !(this.project.settings.targetDomainLocation.value === 'mii' &&
         this.project.image.useAuxImage.value && this.project.image.createAuxImage.value);
-    });
+    }, this);
 
     this.subviews = [
       {
@@ -69,7 +69,7 @@ function(accUtils, ko, i18n, project, ImageScriptGenerator, ArrayDataProvider) {
 
     this.tabsStatus = ko.computed(() => {
       return this.disablePrimaryImageScript() && this.disableAuxiliaryImageScript() ? 'disabled' : 'enabled';
-    });
+    }, this);
 
     this.codeViewScriptLanguage = ko.observable(ImageScriptGenerator.getDefaultScriptingLanguage());
     this.codeViewScriptLanguages = [

webui/src/js/viewModels/image-design-view-impl.js

@@ -60,15 +60,15 @@ define(['utils/wkt-logger'],
 
       this.disableAuxImage = ko.computed(() => {
         return !(this.targetDomainLocationIsMII() && this.project.image.useAuxImage.value);
-      });
+      }, this);
 
       this.mainCreateImageSwitchHelp = ko.computed(() => {
         if (this.project.image.useAuxImage.value) {
           return this.labelMapper('create-image-aux-help');
         } else {
           return this.labelMapper('create-image-help');
         }
-      });
+      }, this);
 
       this.mainImageTagHelpMII = () => {
         let key = 'image-tag-mii-use-help';
@@ -116,15 +116,15 @@ define(['utils/wkt-logger'],
             break;
         }
         return this.labelMapper(key);
-      });
+      }, this);
 
       this.auxImageTagHelp = ko.computed(() => {
         if (this.project.image.createAuxImage.value) {
           return this.labelMapper('aux-image-tag-create-help');
         } else {
           return this.labelMapper('aux-image-tag-use-help');
         }
-      });
+      }, this);
 
       this.subviews = [
         {id: 'fmwImage', name: this.labelMapper('image-tab')},
@@ -144,7 +144,7 @@ define(['utils/wkt-logger'],
         } else {
           return this.labelMapper('fmw-title');
         }
-      });
+      }, this);
 
       this.mainImageRequiresWdt = () => {
         let result = false;
@@ -210,9 +210,15 @@ define(['utils/wkt-logger'],
         return !this.project.image.baseImageContentsIncludesMiddleware();
       };
 
-      this.needsInstallers = () => {
-
-      };
+      this.needsInstallers = ko.computed(function() {
+        let result = true;
+        if (this.project.image.useCustomBaseImage.observable()) {
+          if (this.project.image.baseImageContentsIncludesMiddleware()) {
+            result = false;
+          }
+        }
+        return result;
+      }, this);
 
       this.chooseJDK = () => {
         window.api.ipc.invoke('get-jdk-installer-location')

webui/src/js/viewModels/network-page.js

@@ -36,11 +36,11 @@ function(accUtils, ko, i18n, project) {
     this.topMessage = ko.computed(() => {
       const messageKey = this.connectOk() ? 'proceed' : 'warning';
       return this.labelMapper(messageKey);
-    });
+    }, this);
 
     this.topClass = ko.computed(() => {
       return this.connectOk() ? 'wkt-proceed' : 'wkt-warning';
-    });
+    }, this);
 
     this.tryConnect = () => {
       this.tryMessage(this.labelMapper('trying'));

webui/src/js/viewModels/project-settings-page.js

@@ -55,7 +55,7 @@ function(accUtils, ko, i18n, project, ArrayDataProvider) {
         key = 'java-directory-location-with-pv-answer-message';
       }
       return this.labelMapper(key);
-    });
+    }, this);
 
     this.requiresOracleHome = () => {
       return this.project.settings.targetDomainLocation.value !== 'pv';
@@ -103,7 +103,7 @@ function(accUtils, ko, i18n, project, ArrayDataProvider) {
         key = 'build-tool-type-with-pv-answer-message';
       }
       return this.labelMapper(key);
-    });
+    }, this);
 
     this.getBuilderExecutableFilePathLabel = () => {
       let name = this.getDockerLabelForBuilderType(this.project.settings.builderType.value) || '<Unknown>';

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

@@ -231,66 +231,70 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('patches-title')]]
                   </oj-bind-if>
                 </div>
               </oj-bind-if>
-
-              <oj-bind-if test="[[mainImageRequiresWdt() === true]]">
-                <div class="oj-panel">
-                  <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('wdt-installer-title')]]"></oj-bind-text></h6>
-                  <oj-form-layout max-columns="1" direction="row">
-                    <oj-switch label-hint="[[labelMapper('use-wdt-installer-label')]]"
-                               value="{{project.image.useLatestWdtVersion.observable}}"
-                               help.instruction="[[labelMapper('use-wdt-installer-help')]]">
-                    </oj-switch>
-                  </oj-form-layout>
-                  <oj-bind-if test="[[project.image.useLatestWdtVersion.observable() === false]]">
-                    <oj-form-layout max-columns="2" direction="row">
-                      <oj-input-text label-hint="[[labelMapper('wdt-installer-label')]]"
-                                     value="{{project.image.wdtInstaller.observable}}"
-                                     help.instruction="[[labelMapper('wdt-installer-help')]]">
-                        <oj-button slot="end" display="icons" chroming="borderless" on-oj-action="[[chooseWDT]]">
-                          <span slot="endIcon" class="oj-ux-ico-file-text" role="img"></span>
-                        </oj-button>
-                      </oj-input-text>
-                      <oj-input-text label-hint="[[labelMapper('wdt-installer-version-label')]]"
-                                     value="{{project.image.wdtInstallerVersion.observable}}"
-                                     help.instruction="[[labelMapper('wdt-installer-version-help')]]">
-                      </oj-input-text>
-                    </oj-form-layout>
-                  </oj-bind-if>
-                </div>
-              </oj-bind-if>
             </div>
           </oj-bind-if>
 
-          <oj-collapsible expanded='false'>
-            <h6 slot="header" class="wkt-subheading"><oj-bind-text value="[[labelMapper('page-design-advanced-label')]]"></oj-bind-text></h6>
+          <div>
             <oj-bind-if test="[[mainImageRequiresWdt() === true]]">
               <div class="oj-panel">
-                <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('wdt-section-title')]]"></oj-bind-text></h6>
-                <oj-form-layout max-columns="2" direction="row">
-                  <oj-bind-if test="[[targetDomainLocationIsDII() === true]]">
-                    <oj-select-single label-hint="[[labelMapper('domain-type-label')]]"
-                                      value="{{project.image.targetDomainType.observable}}"
-                                      data="{{wdtDomainTypesDP}}"
-                                      help.instruction="[[labelMapper('domain-type-help')]]">
-                    </oj-select-single>
-                  </oj-bind-if>
-                  <oj-bind-if test="[[targetDomainLocationIsDII() === true]]">
-                    <oj-input-text label-hint="[[labelMapper('wdt-domain-home-label')]]"
-                                   value="{{project.image.domainHomePath.observable}}"
-                                   help.instruction="[[labelMapper('wdt-domain-home-help')]]">
-                    </oj-input-text>
-                  </oj-bind-if>
-                  <oj-input-text label-hint="[[labelMapper('wdt-home-label')]]"
-                                 value="{{project.image.wdtHomePath.observable}}"
-                                 help.instruction="[[labelMapper('wdt-home-help')]]">
-                  </oj-input-text>
-                  <oj-input-text label-hint="[[labelMapper('wdt-model-home-label')]]"
-                                 value="{{project.image.modelHomePath.observable}}"
-                                 help.instruction="[[labelMapper('wdt-model-home-help')]]">
-                  </oj-input-text>
+                <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('wdt-installer-title')]]"></oj-bind-text></h6>
+                <oj-form-layout max-columns="1" direction="row">
+                  <oj-switch label-hint="[[labelMapper('use-wdt-installer-label')]]"
+                             value="{{project.image.useLatestWdtVersion.observable}}"
+                             help.instruction="[[labelMapper('use-wdt-installer-help')]]">
+                  </oj-switch>
                 </oj-form-layout>
+                <oj-bind-if test="[[project.image.useLatestWdtVersion.observable() === false]]">
+                  <oj-form-layout max-columns="2" direction="row">
+                    <oj-input-text label-hint="[[labelMapper('wdt-installer-label')]]"
+                                   value="{{project.image.wdtInstaller.observable}}"
+                                   help.instruction="[[labelMapper('wdt-installer-help')]]">
+                      <oj-button slot="end" display="icons" chroming="borderless" on-oj-action="[[chooseWDT]]">
+                        <span slot="endIcon" class="oj-ux-ico-file-text" role="img"></span>
+                      </oj-button>
+                    </oj-input-text>
+                    <oj-input-text label-hint="[[labelMapper('wdt-installer-version-label')]]"
+                                   value="{{project.image.wdtInstallerVersion.observable}}"
+                                   help.instruction="[[labelMapper('wdt-installer-version-help')]]">
+                    </oj-input-text>
+                  </oj-form-layout>
+                </oj-bind-if>
               </div>
             </oj-bind-if>
+          </div>
+
+          <oj-collapsible expanded='false'>
+            <h6 slot="header" class="wkt-subheading"><oj-bind-text value="[[labelMapper('page-design-advanced-label')]]"></oj-bind-text></h6>
+            <div>
+              <oj-bind-if test="[[mainImageRequiresWdt() === true]]">
+                <div class="oj-panel">
+                  <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('wdt-section-title')]]"></oj-bind-text></h6>
+                  <oj-form-layout max-columns="2" direction="row">
+                    <oj-bind-if test="[[targetDomainLocationIsDII() === true]]">
+                      <oj-select-single label-hint="[[labelMapper('domain-type-label')]]"
+                                        value="{{project.image.targetDomainType.observable}}"
+                                        data="{{wdtDomainTypesDP}}"
+                                        help.instruction="[[labelMapper('domain-type-help')]]">
+                      </oj-select-single>
+                    </oj-bind-if>
+                    <oj-bind-if test="[[targetDomainLocationIsDII() === true]]">
+                      <oj-input-text label-hint="[[labelMapper('wdt-domain-home-label')]]"
+                                     value="{{project.image.domainHomePath.observable}}"
+                                     help.instruction="[[labelMapper('wdt-domain-home-help')]]">
+                      </oj-input-text>
+                    </oj-bind-if>
+                    <oj-input-text label-hint="[[labelMapper('wdt-home-label')]]"
+                                   value="{{project.image.wdtHomePath.observable}}"
+                                   help.instruction="[[labelMapper('wdt-home-help')]]">
+                    </oj-input-text>
+                    <oj-input-text label-hint="[[labelMapper('wdt-model-home-label')]]"
+                                   value="{{project.image.modelHomePath.observable}}"
+                                   help.instruction="[[labelMapper('wdt-model-home-help')]]">
+                    </oj-input-text>
+                  </oj-form-layout>
+                </div>
+              </oj-bind-if>
+            </div>
 
             <div class="oj-panel">
               <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('build-config-title')]]"></oj-bind-text></h6>