Merge branch 'vz-uptake' into 'main'

making changes to Verrazzano to align with operator changes

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

Author: robertpatrick

webui/src/js/utils/aux-image-helper.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Copyright (c) 2023, Oracle and/or its affiliates.
- * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+ * Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 'use strict';
 
@@ -14,7 +14,7 @@ define(['models/wkt-project', 'utils/wkt-logger'],
           if (project.settings.wdtTargetType.value === 'wko') {
             return this.wkoVersion41OrHigher();
           } else {
-            return this.v8oVersion162OrHigher();
+            return this.v8oVersion161OrHigher();
           }
         }
         return false;
@@ -30,10 +30,10 @@ define(['models/wkt-project', 'utils/wkt-logger'],
         return result;
       };
 
-      this.v8oVersion162OrHigher = () => {
+      this.v8oVersion161OrHigher = () => {
         let result = true;
         if (project.vzInstall.actualInstalledVersion.hasValue() &&
-          window.api.utils.compareVersions(project.vzInstall.actualInstalledVersion.value, '1.6.2') < 0) {
+          window.api.utils.compareVersions(project.vzInstall.actualInstalledVersion.value, '1.6.1') < 0) {
           result = false;
         }
         return result;

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

@@ -59,6 +59,10 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
     this.project = project;
     this.i18n = i18n;
 
+    this.getWkoInstalledVersion = () => {
+      wkoInstalledVersionChecker.startOperatorInstallVersionCheck().then();
+    };
+
     this.projectHasModel = () => {
       return auxImageHelper.projectHasModel();
     };
@@ -86,13 +90,6 @@ 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);
@@ -119,10 +116,6 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
       return false;
     }, this);
 
-    this.getWkoInstalledVersion = () => {
-      wkoInstalledVersionChecker.startOperatorInstallVersionCheck().then();
-    };
-
     this.mainCreateImageSwitchHelp = ko.computed(() => {
       if (this.project.image.useAuxImage.value || this.isDomainOnPV()) {
         return this.imageLabelMapper('create-image-aux-help');
@@ -210,11 +203,8 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
     });
 
     this.creatingPvc = ko.computed(() => {
-      if (this.usingDomainCreationImage() && this.project.k8sDomain.createPvc.observable()) {
-        return true;
-      }
-      return false;
-    });
+      return !!(this.usingDomainCreationImage() && this.project.k8sDomain.createPvc.observable());
+    }, this);
 
     this.pvcNameHelpText = ko.computed(() => {
       if (this.creatingPvc()) {
@@ -271,7 +261,11 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
     this.auxImageConfig = ko.observable(this.computeAuxImageConfig());
 
     this.getAuxImageDecision = ko.computed(() => {
-      return this.smartLabelMapper(`aux-image-config-${this.auxImageConfig()}-label`);
+      let imageTag = `aux-image-config-${this.auxImageConfig()}-label`;
+      if (this.isDomainOnPV()) {
+        imageTag = imageTag.replace(/^aux-/, 'domain-creation-');
+      }
+      return this.labelMapper(imageTag);
     });
 
     this.integerConverter = new ojConverterNumber.IntlNumberConverter({
@@ -294,14 +288,14 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
         { key: 'WLS', label: i18n.t('image-design-wls-domain-type-label') },
         { key: 'RestrictedJRF', label: i18n.t('image-design-restricted-jrf-domain-type-label') },
       ];
-    });
+    }, this);
 
     this.wdtDomainTypesDP = ko.computed(() => {
       if (this.usingDomainCreationImage()) {
         return new ArrayDataProvider(this.wdtDomainTypes(), { keyAttributes: 'value' });
       }
       return new ArrayDataProvider(this.wdtDomainTypes(), { keyAttributes: 'key' });
-    });
+    }, this);
 
     this.showRcuSwitch = ko.computed(() => {
       if (this.usingDomainCreationImage()) {