updating quickstart and removing hard-coded WebLogic Remote Console version compatibility number (#162)

Author: robertpatrick

electron/app/js/ipcRendererPreload.js

@@ -12,13 +12,15 @@ const fsUtils = require('./fsUtils');
 const WktApp = require('./wktApp');
 const osUtils = require('./osUtils');
 const i18n = require('./i18next.webui.config');
-const { compareVersions } = require('./versionUtils');
+const { compareVersions, getMinorVersionCompatibilityVersionString } = require('./versionUtils');
+const { wlRemoteConsoleFrontendVersion } = require('../webui.json');
 
 const wktApp = new WktApp();
 
 const exeMode = osUtils.getArgv('--wktMode');
 const language = osUtils.getArgv('--lang');
 const mainModule = osUtils.getArgv('--mainModule');
+const wrcFrontendCompatibilityVersion = getMinorVersionCompatibilityVersionString(wlRemoteConsoleFrontendVersion);
 
 i18n.changeLanguage(language).then();
 
@@ -279,7 +281,8 @@ contextBridge.exposeInMainWorld(
     'utils': {
       generateUuid: () => uuid.v4(),
       compareVersions: (version, otherVersion) => compareVersions(version, otherVersion),
-      mainModule: mainModule
+      mainModule: mainModule,
+      wrcFrontendCompatibilityVersion: wrcFrontendCompatibilityVersion,
     }
   }
 );

electron/app/js/versionUtils.js

@@ -49,6 +49,19 @@ function compareVersions(version, minimumVersion) {
   return result;
 }
 
+function getMinorVersionCompatibilityVersionString(version) {
+  let result = version;
+  if (version) {
+    const components = result.split('.', 3);
+    if (components[2]) {
+      components[2] = 'x';
+    }
+    result = components.join('.');
+  }
+  return result;
+}
+
 module.exports = {
   compareVersions,
+  getMinorVersionCompatibilityVersionString,
 };

electron/app/locales/en/webui.json

@@ -35,8 +35,7 @@ const openSSLUtils = require('./js/openSSLUtils');
 const osUtils = require('./js/osUtils');
 const { initializeAutoUpdater, registerAutoUpdateListeners, installUpdates, getUpdateInformation } = require('./js/appUpdater');
 const { startWebLogicRemoteConsoleBackend, getDefaultDirectoryForOpenDialog, setWebLogicRemoteConsoleHomeAndStart,
-  getDefaultWebLogicRemoteConsoleHome, getWebLogicRemoteConsoleBackendPort
-} = require('./js/wlRemoteConsoleUtils');
+  getDefaultWebLogicRemoteConsoleHome, getWebLogicRemoteConsoleBackendPort } = require('./js/wlRemoteConsoleUtils');
 const { getVerrazzanoReleaseVersions, isVerrazzanoInstalled, installVerrazzanoPlatformOperator,
   verifyVerrazzanoPlatformOperatorInstall, installVerrazzano, verifyVerrazzanoInstallStatus } = require('./js/vzInstaller');
 const { deployApplication, deployComponents, deployProject, getComponentNamesByNamespace, getSecretNamesByNamespace,

electron/app/main.js

@@ -298,7 +298,6 @@ function (project, accUtils, utils, ko, i18n, screenUtils, BufferingDataProvider
       const existingClusterNames = this.project.k8sDomain.clusters.observable()
         .filter(item => item.name !== cluster.name).map(item => { return item.name; });
 
-      console.log(`existingClusterNames = ${existingClusterNames}`);
       const options = { cluster: cluster, existingNames: existingClusterNames, isDomainInPV: this.isDomainInPV() };
 
       dialogHelper.promptDialog('cluster-edit-dialog', options).then(result => {

webui/src/css/images/model-code-view.png

@@ -221,7 +221,6 @@ function(i18n, accUtils, ko, ArrayDataProvider, BufferingDataProvider, project,
         await k8sHelper.getServicesDetailsForNamespace(kubectlExe, kubectlOptions, namespace, errTitle, errPrefix);
       if (results) {
         const servicesList = {};
-        console.log('results.items is a ' + typeof(results.items));
         for (const item of results.items) {
           servicesList[item.metadata.name] = { ports: item.spec.ports };
         }

webui/src/css/images/model-design-view.png

@@ -16,6 +16,7 @@ function(accUtils, i18n, ko, project, urlCatalog, viewHelper, wktLogger, ViewMod
     this.dataProvider = {};
     this.disableStartButton = ko.observable(false);
     this.wrcBackendTriggerChange = false;
+    this.wrcFrontendCompatibilityVersion = window.api.utils.wrcFrontendCompatibilityVersion;
 
     this.connected = () => {
       accUtils.announce('Model design view loaded.', 'assertive');
@@ -239,7 +240,8 @@ function(accUtils, i18n, ko, project, urlCatalog, viewHelper, wktLogger, ViewMod
       this.project.wdtModel.internal.wlRemoteConsolePort(undefined);
     };
 
-    const wrcInitialText = this.labelMapper('wrc-install-description');
+    const wrcInitialText = this.labelMapper('wrc-install-description',
+      { wrcVersion: this.wrcFrontendCompatibilityVersion });
     const wrcInstallLocation = '<a href=' +
       urlCatalog.getUrl('model', 'weblogicRemoteConsoleLatestRelease') + '>' +
       this.labelMapper('wrc-link-text') + '</a>';