Merge branch 'qa-bug-fixes' into 'main'

domain on pv related fixes

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

Author: robertpatrick

electron/app/js/kubectlUtils.js

@@ -1143,7 +1143,7 @@ function isNotFoundError(err) {
 }
 
 function _getOperatorVersionFromLogs(operatorLogs, results) {
-  const versionRegex = /^Oracle WebLogic Kubernetes Operator, version:\s*(\d+\.\d+\.\d+),.*$/;
+  const versionRegex = /^Oracle WebLogic Kubernetes Operator, version:\s*(\d+\.\d+\.\d+).*$/;
   if (Array.isArray(operatorLogs) && operatorLogs.length > 0) {
     for (const logEntry of operatorLogs) {
       const parsedEntry = _parseLogEntryAsJson(logEntry);

electron/app/locales/en/webui.json

@@ -618,6 +618,13 @@
   "domain-design-image-registry-pull-email-label": "Image Registry Pull Email Address",
   "domain-design-image-registry-pull-email-help": "The image registry user's email address used to create the Kubernetes image pull secret.",
 
+  "domain-design-aux-image-config-off-label": "Do not use an auxiliary image",
+  "domain-design-aux-image-config-use-label": "Use an existing auxiliary image created outside of this project",
+  "domain-design-aux-image-config-create-label": "Use newly created auxiliary image created by this project",
+  "domain-design-domain-creation-image-config-off-label": "Do not use a domain creation image",
+  "domain-design-domain-creation-image-config-use-label": "Use an existing domain creation image created outside of this project",
+  "domain-design-domain-creation-image-config-create-label": "Use newly created domain creation image created by this project",
+
   "domain-design-aux-image-title": "Auxiliary Image to Use for the Domain",
   "domain-design-hints-goto-create-aux-image": "Go To Create Auxiliary Image Page",
   "domain-design-goto-create-aux-image-button-label": "Go To Create Auxiliary Image Page",

tools/wdt-config/targets/vz-pv/target.json

@@ -8,6 +8,7 @@
   "validation_method" : "lax",
   "results_output_method" : "json",
   "exclude_domain_bin_contents": true,
+  "credentials_method" : "secrets",
   "wls_credentials_name" : "__weblogic-credentials__",
   "additional_output" : "vz-application.yaml",
   "use_persistent_volume" : true

tools/wdt-config/targets/wko-pv/target.json

@@ -8,6 +8,7 @@
   "validation_method" : "wktui",
   "results_output_method" : "json",
   "exclude_domain_bin_contents": true,
+  "credentials_method" : "secrets",
   "wls_credentials_name" : "__weblogic-credentials__",
   "additional_output" : "wko-domain.yaml",
   "use_persistent_volume" : true

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

@@ -78,6 +78,13 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
       return i18n.t(`domain-design-${labelId}`, payload);
     };
 
+    this.smartLabelMapper = (labelId, payload) => {
+      if (this.isDomainOnPV()) {
+        return i18n.t(`domain-design-${labelId.replace(/^aux-/, 'domain-creation-')}`, payload);
+      }
+      return i18n.t(`domain-design-${labelId}`, payload);
+    };
+
     this.imageLabelMapper = (labelId, payload) => {
       if (this.isDomainOnPV()) {
         return i18n.t(`image-design-${labelId.replace(/^aux-/, 'domain-creation-')}`, payload);
@@ -225,9 +232,9 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
     };
 
     this.auxImageConfigData = [
-      { id: 'offOption', value: 'off', label: this.imageLabelMapper('aux-image-config-off-label')},
-      { id: 'useOption', value: 'use', label: this.imageLabelMapper('aux-image-config-use-label')},
-      { id: 'createOption', value: 'create', label: this.imageLabelMapper('aux-image-config-create-label')}
+      { id: 'offOption', value: 'off', label: this.smartLabelMapper('aux-image-config-off-label')},
+      { id: 'useOption', value: 'use', label: this.smartLabelMapper('aux-image-config-use-label')},
+      { id: 'createOption', value: 'create', label: this.smartLabelMapper('aux-image-config-create-label')}
     ];
 
     this.applyAuxImageConfig = (newValue) => {

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

@@ -5,10 +5,12 @@
  */
 define(['accUtils', 'knockout', 'ojs/ojcorerouter', 'ojs/ojmodulerouter-adapter', 'ojs/ojarraydataprovider',
   'utils/k8s-domain-deployer', 'utils/k8s-domain-status-checker', 'utils/k8s-domain-undeployer', 'utils/i18n',
-  'utils/wdt-preparer', 'ojs/ojarraytreedataprovider', 'models/wkt-project', 'ojs/ojtreeview'],
+  'utils/wdt-preparer', 'utils/aux-image-helper', 'models/wkt-project', 'ojs/ojarraytreedataprovider', 'ojs/ojtreeview'
+],
 function(accUtils, ko, CoreRouter, ModuleRouterAdapter, ArrayDataProvider, k8sDomainDeployer,
-  k8sDomainStatusChecker, k8sDomainUndeployer, i18n, wdtPreparer) {
+  k8sDomainStatusChecker, k8sDomainUndeployer, i18n, wdtPreparer, auxImageHelper, project) {
   function DomainViewModel(args) {
+    this.project = project;
 
     this.connected = () => {
       accUtils.announce('WebLogic Domain page loaded.', 'assertive');
@@ -26,6 +28,13 @@ function(accUtils, ko, CoreRouter, ModuleRouterAdapter, ArrayDataProvider, k8sDo
     this.disableGetDomainStatus = ko.observable(false);
     this.disableUndeployDomain = ko.observable(false);
 
+    this.showPrepareModel = ko.computed(() => {
+      if (this.project.settings.targetDomainLocation.observable() === 'pv') {
+        return auxImageHelper.supportsDomainCreationImages() && this.project.image.useAuxImage.observable();
+      }
+      return true;
+    });
+
     this.prepareModel = () => {
       wdtPreparer.startPrepareModel().then();
     };

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

@@ -7,10 +7,10 @@
 
 define(['accUtils', 'knockout', 'utils/i18n', 'models/wkt-project', 'ojs/ojarraydataprovider',
   'ojs/ojbufferingdataprovider', 'utils/common-utilities', 'utils/dialog-helper', 'utils/view-helper',
-  'utils/wkt-logger', 'utils/url-catalog', 'ojs/ojinputtext', 'ojs/ojlabel', 'ojs/ojbutton', 'ojs/ojformlayout',
-  'ojs/ojradioset', 'ojs/ojswitch', 'ojs/ojselectsingle', 'ojs/ojtable' ],
+  'utils/aux-image-helper', 'utils/wkt-logger', 'utils/url-catalog', 'ojs/ojinputtext', 'ojs/ojlabel', 'ojs/ojbutton',
+  'ojs/ojformlayout', 'ojs/ojradioset', 'ojs/ojswitch', 'ojs/ojselectsingle', 'ojs/ojtable' ],
 function(accUtils, ko, i18n, project, ArrayDataProvider,
-  BufferingDataProvider, utils, dialogHelper, viewHelper) {
+  BufferingDataProvider, utils, dialogHelper, viewHelper, auxImageHelper) {
 
   function ProjectSettingsViewModel() {
 
@@ -185,7 +185,8 @@ function(accUtils, ko, i18n, project, ArrayDataProvider,
     }, this);
 
     this.requiresOracleHome = () => {
-      return this.project.settings.targetDomainLocation.value !== 'pv';
+      return this.project.settings.targetDomainLocation.value !== 'pv' ||
+        auxImageHelper.supportsDomainCreationImages();
     };
 
     this.chooseJavaHome = () => {

webui/src/js/views/domain-page.html

@@ -15,14 +15,16 @@
         </li>
       </template>
     </oj-tab-bar>
-    <oj-button id="prepareModelButton"
-               chroming="callToAction"
-               on-oj-action="[[prepareModel]]"
-               :title="[[anyLabelMapper('model-page-hints-prepareModel')]]">
-            <span>
-              <oj-bind-text value="[[anyLabelMapper('model-page-button-prepareModel')]]"></oj-bind-text>
-            </span>
-    </oj-button>
+    <oj-bind-if test="[[showPrepareModel]]">
+      <oj-button id="prepareModelButton"
+                 chroming="callToAction"
+                 on-oj-action="[[prepareModel]]"
+                 :title="[[anyLabelMapper('model-page-hints-prepareModel')]]">
+              <span>
+                <oj-bind-text value="[[anyLabelMapper('model-page-button-prepareModel')]]"></oj-bind-text>
+              </span>
+      </oj-button>
+    </oj-bind-if>
     <oj-button id="deployDomainButton"
                disabled="[[disableDeployDomain]]"
                chroming="callToAction"