Merge branch 'wktui-417' into 'main'

Adding Inspect Image button to allow helping the user locate the WDT Model and Install Homes from existing images

See merge request weblogic-cloud/weblogic-toolkit-ui!251

Author: robertpatrick

electron/app/locales/en/webui.json

@@ -570,6 +570,8 @@
   "domain-design-image-wdt-install-home-help": "The location of the WebLogic Deploy Tooling installation within the primary image.",
   "domain-design-image-model-home-label": "WebLogic Deploy Tooling Model Home in Primary Image",
   "domain-design-image-model-home-help": "The directory location of the WebLogic Deploy Tooling model files within the primary image.",
+  "domain-design-image-inspect-button": "Inspect Primary Image",
+  "domain-design-image-inspect-hints": "Find WDT and Model Home from Primary Image.",
   "domain-design-image-registry-pull-requires-authentication-label": "Specify Image Pull Credentials",
   "domain-design-image-registry-pull-requires-authentication-help": "Whether you want to specify authentication credentials for pulling the image from the registry.",
   "domain-design-image-registry-use-existing-pull-secret-label": "Use Existing Image Pull Secret",
@@ -597,6 +599,8 @@
   "domain-design-aux-image-source-wdt-home-help": "The source location of the WebLogic Deploy Tooling installation within the auxiliary image.",
   "domain-design-aux-image-source-model-home-label": "WebLogic Deploy Tooling Model Home in Auxiliary Image",
   "domain-design-aux-image-source-model-home-help": "The source directory location of the WebLogic Deploy Tooling model files within the auxiliary image.",
+  "domain-design-aux-image-inspect-button": "Inspect Auxiliary Image",
+  "domain-design-aux-image-inspect-hints": "Find WDT and Model Home from Auxiliary Image.",
   "domain-design-aux-image-registry-pull-requires-authentication-label": "Specify Auxiliary Image Pull Credentials",
   "domain-design-aux-image-registry-pull-requires-authentication-help": "Whether you want to specify authentication credentials for pulling the auxiliary image from the registry.",
   "domain-design-aux-image-registry-use-existing-pull-secret-label": "Use Existing Auxiliary Image Pull Secret",
@@ -1010,6 +1014,18 @@
   "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",
 
+  "wit-inspector-wdt-primary-aborted-error-title": "Inspect Primary Image Aborted",
+  "wit-inspect-primary-results-success-message": "Inspector found both the WDT install home and model home and updated the project.",
+  "wit-inspect-primary-results-no-wdt-or-models-message": "Inspector was unable to find WDT and models in the primary image so the project was not updated.  This does not necessarily mean that they are not present.  It could be that the image was not created using the WebLogic Image Tool.",
+  "wit-inspect-primary-results-no-wdt-message": "Inspector was unable to find WDT but found models at {{wdtModelHome}} in the primary image so the project was not updated.",
+  "wit-inspect-primary-results-no-models-message": "Inspector was unable to find models but found WDT  at {{wdtInstallHome}} in the primary image so the project was not updated.",
+
+  "wit-inspector-wdt-auxiliary-aborted-error-title": "Inspect Auxiliary Image Aborted",
+  "wit-inspect-auxiliary-results-success-message": "Inspector found both the WDT install home and model home and updated the project.",
+  "wit-inspect-auxiliary-results-no-wdt-or-models-message": "Inspector was unable to find WDT and models in the auxiliary image so the project was not updated.  This does not necessarily mean that they are not present.  It could be that the image was not created using the WebLogic Image Tool.",
+  "wit-inspect-auxiliary-results-no-wdt-message": "Inspector was unable to find WDT but found models at {{wdtModelHome}} in the auxiliary image so the project was not updated.",
+  "wit-inspect-auxiliary-results-no-models-message": "Inspector was unable to find models but found WDT  at {{wdtInstallHome}} in the auxiliary image so the project was not updated.",
+
   "inspect-dialog-default-title": "Image Contents",
   "inspect-dialog-default-message": "Unknown image contents",
   "inspect-dialog-os-section-title": "Operating System:",
@@ -1324,6 +1340,8 @@
   "flow-validate-model-name": "Validate Model",
   "flow-prepare-model-name": "Prepare Model",
   "flow-inspect-base-image-name": "Inspect Base Image",
+  "flow-inspect-primary-image-name": "Inspect Primary Image",
+  "flow-inspect-auxiliary-image-name": "Inspect Auxiliary Image",
   "flow-create-image-name": "Create Primary Image",
   "flow-create-aux-image-name": "Create Auxiliary Image",
   "flow-push-image-name": "Push Primary Image",

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

@@ -53,7 +53,7 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
         // not using an Auxiliary Image at all.
         //
         this.imageModelHome = props.createProperty(imageDefinition.modelHomePath.value);
-        this.imageWDTInstallHome = props.createProperty(imageDefinition.wdtHomePath.value);
+        this.imageWDTInstallHome = props.createProperty(imageDefinition.wdtHomePath.value + '/weblogic-deploy');
 
         // Auxiliary image-related properties
         this.auxImageRegistryPullRequireAuthentication = props.createProperty(false);