initial checkin for layout help

Author: robertpatrick

electron/app/js/witInspect.js

@@ -64,7 +64,7 @@ function getInspectEnvironment(javaHome, options, httpsProxyUrl, bypassProxyHost
 }
 
 function getImageToolInspectArgs(imageTag, options) {
-  const args = [ 'inspect', `--image=${imageTag}`, '--format=JSON' ];
+  const args = [ 'inspect', `--image=${imageTag}`, '--patches', '--format=JSON' ];
   if ('buildEngine' in options && options.buildEngine) {
     args.push(`--builder=${options['buildEngine']}`);
   }

electron/app/locales/en/webui.json

@@ -817,6 +817,21 @@
   "wit-inspect-results-java-message": "Inspection of image {{imageTag}} found {{javaMessage}}.",
   "wit-inspector-empty-contents-message": "Inspection of image {{imageTag}} did not find Java or Oracle Fusion Middleware installations",
 
+  "inspect-dialog-default-title": "Image Contents",
+  "inspect-dialog-default-message": "Unknown image contents",
+  "inspect-dialog-os-section-title": "Operating System:",
+  "inspect-dialog-os-name-label": "Name:",
+  "inspect-dialog-os-version-label": "Version:",
+  "inspect-dialog-java-home-section-title": "Java Development Kit:",
+  "inspect-dialog-java-home-path-label": "Location:",
+  "inspect-dialog-java-home-version-label": "Version:",
+  "inspect-dialog-oracle-home-section-title": "Oracle Fusion Middleware:",
+  "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:",
+
   "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",
   "wit-creator-invalid-java-home-error-prefix": "Unable to create image due to the Java Home being invalid",
@@ -1121,7 +1136,6 @@
   "flow-getting-k8s-domain-status-in-progress": "Getting domain {{domain}} status",
   "flow-checking-operator-version-in-progress": "Checking operator version",
 
-
   "add-archive-file-title": "Add Archive File",
   "add-archive-file-replace-message": "This will replace the existing archive, continue?",
   "add-model-file-title": "Add Model File",

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

@@ -88,7 +88,12 @@ define(['utils/wit-actions-base', 'models/wkt-project', 'utils/i18n', 'utils/pro
             this.project.image.setBaseImageContents(inspectResults.contents);
             const title = i18n.t('wit-inspector-inspect-complete-title');
             const message = this.getInspectSuccessMessage(baseImageTag, inspectResults.contents);
-            await window.api.ipc.invoke('show-info-message', title, message);
+            const dialogOptions = {
+              title: title,
+              message: message,
+              contents: inspectResults.contents
+            };
+            dialogHelper.openDialog('inspect-dialog', dialogOptions);
             return Promise.resolve(true);
           } else {
             errTitle = i18n.t('wit-inspector-inspect-failed-title');

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

@@ -210,6 +210,10 @@ define(['utils/wkt-logger'],
         return !this.project.image.baseImageContentsIncludesMiddleware();
       };
 
+      this.needsInstallers = () => {
+
+      };
+
       this.chooseJDK = () => {
         window.api.ipc.invoke('get-jdk-installer-location')
           .then(jdkInstaller => {

webui/src/js/viewModels/inspect-dialog.js

@@ -0,0 +1,136 @@
+/**
+ * @license
+ * Copyright (c) 2021, 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/view-helper', 'ojs/ojarraydataprovider', 'ojs/ojknockout',
+  'ojs/ojinputtext', 'ojs/ojlabel', 'ojs/ojbutton', 'ojs/ojdialog', 'ojs/ojformlayout' ],
+function(accUtils, ko, i18n, viewHelper) {
+  function InspectDialogModel(config) {
+    const DIALOG_SELECTOR = '#wktInspectDialog';
+
+    this.connected = () => {
+      accUtils.announce('Validation Error dialog loaded.', 'assertive');
+
+      this.dialogContainer = $(DIALOG_SELECTOR)[0];
+
+      // open the dialog when the container is ready.
+      // using oj-dialog initial-visibility="show" causes vertical centering issues.
+      viewHelper.componentReady(this.dialogContainer).then(() => {
+        this.dialogContainer.open();
+      });
+    };
+
+    this.labelMapper = (labelId, payload) => {
+      return i18n.t(`inspect-dialog-${labelId}`, payload);
+    };
+
+    this.i18n = i18n;
+    this.config = config;
+    this.contents = config.contents;
+
+    this.getTitle = () => {
+      return this.config.title || this.labelMapper('default-title');
+    };
+
+    this.getMessage = () => {
+      return this.config.message || this.labelMapper('default-message');
+    };
+
+    this.hasOsInfo = () => {
+      return !!this.contents.os && !!this.contents.os.name && !!this.contents.os.version;
+    };
+
+    this.getOsName = () => {
+      return this.contents.os.name;
+    };
+
+    this.getOsVersion = () => {
+      return this.contents.os.version;
+    };
+
+    this.hasJavaHome = () => {
+      return !!this.contents.javaHome;
+    };
+
+    this.getJavaHome = () => {
+      return this.contents.javaHome;
+    };
+
+    this.getJavaVersion = () => {
+      return this.contents.javaVersion;
+    };
+
+    this.hasOracleHome = () => {
+      return !!this.contents.oracleHome;
+    };
+
+    this.getOracleHome = () => {
+      return this.contents.oracleHome;
+    };
+
+    this.getWlsVersion = () => {
+      return this.contents.wlsVersion;
+    };
+
+    this.getOpatchVersion = () => {
+      return this.contents.opatchVersion;
+    };
+
+    this.hasOraclePatches = () => {
+      return !!this.contents.oraclePatches && this.contents.oraclePatches.length > 0;
+    };
+
+    this.patches = { };
+
+    this.buildPatchesData = () => {
+      const namedPatches = [ ];
+      const oneOffPatches = [ ];
+
+      if (this.hasOraclePatches()) {
+        this.contents.oraclePatches.forEach(patch => {
+          if (patch.description.toLowerCase() === 'one-off') {
+            oneOffPatches.push({ number: patch.patch });
+          } else {
+            namedPatches.push({ name: patch.description, number: patch.patch });
+          }
+        });
+        if (namedPatches.length > 0) {
+          this.patches['namedPatches'] = namedPatches;
+        }
+        if (oneOffPatches.length > 0) {
+          this.patches['oneOffPatches'] = oneOffPatches;
+        }
+      }
+    };
+
+    this.hasNamedPatches = () => {
+      return !!this.patches.namedPatches;
+    };
+
+    this.hasOneOffPatches = () => {
+      return !!this.patches.oneOffPatches;
+    };
+
+    this.getNamedPatches = () => {
+      return this.patches.namedPatches;
+    };
+
+    this.getOneOffPatches = () => {
+      return this.patches.oneOffPatches;
+    };
+
+    this.dismissDialog = () => {
+      const dialog = this.dialogContainer;
+      if (dialog) {
+        dialog.close();
+      }
+    };
+
+    this.buildPatchesData();
+  }
+
+  return InspectDialogModel;
+});