working around Jet build issues with newer Javascript syntax

Author: robertpatrick

webui/src/js/utils/vz-application-resource-generator.js

@@ -18,27 +18,27 @@ define(['models/wkt-project', 'utils/vz-helper', 'js-yaml', 'utils/i18n', 'utils
         let appSpec = this._generateApplicationSpec(isMultiCluster);
 
         if (isMultiCluster) {
+          const template = Object.assign({}, appSpec)
           appSpec = {
             apiVersion: this._getMultiClusterApplicationApiVersion(),
             kind: 'MultiClusterApplicationConfiguration',
             metadata: { },
             spec: {
-              template: {
-                ...appSpec
-              },
+              template,
               placement: {
                 clusters: []
               },
             },
           };
+
           this._setNameAndNamespace(appSpec.metadata);
 
           for (const clusterName of this.project.vzApplication.placementClusters.value) {
             appSpec.spec.placement.clusters.push({ name: clusterName });
           }
 
           if (this.project.vzApplication.secrets.value.length > 0) {
-            appSpec.spec.secrets = [...this.project.vzApplication.secrets.value];
+            appSpec.spec.secrets = [ ...this.project.vzApplication.secrets.value ];
           }
         }
         return jsYaml.dump(appSpec).split('\n');
@@ -140,7 +140,7 @@ define(['models/wkt-project', 'utils/vz-helper', 'js-yaml', 'utils/i18n', 'utils
               }
               if (Array.isArray(ingressTraitRule.paths) && ingressTraitRule.paths.length > 0) {
                 rule.paths = ingressTraitRule.paths.map(path => {
-                  const newPath = { ...path };
+                  const newPath = Object.assign({}, path);
                   delete newPath.uid;
                   return newPath;
                 });

webui/src/js/utils/vz-component-configmap-generator.js

@@ -22,8 +22,8 @@ define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'utils/vz-
           return [];
         }
 
-        this.configMapComponentName = k8sDomainConfigMap.metadata?.name;
-        this.configMapComponentNamespace = k8sDomainConfigMap.metadata?.namespace;
+        this.configMapComponentName = k8sDomainConfigMap.metadata ? k8sDomainConfigMap.metadata.name : '<UNKNOWN>';
+        this.configMapComponentNamespace = k8sDomainConfigMap.metadata ? k8sDomainConfigMap.metadata.namespace : '<UNKNOWN>';
         const component = {
           apiVersion: this._getApiVersion(),
           kind: 'Component',

webui/src/js/utils/vz-install-status-checker.js

@@ -87,24 +87,27 @@ function(VzActionsBase, project, wktConsole, i18n, projectIo, dialogHelper) {
           tag: project.vzInstall.versionTag.value,
           profile: project.vzInstall.installationProfile.value,
         };
-        const status = await window.api.ipc.invoke('verify-verrazzano-install-status', kubectlExe, kubectlOptions, vzOptions);
+        const statusResult = await window.api.ipc.invoke('verify-verrazzano-install-status', kubectlExe, kubectlOptions, vzOptions);
         dialogHelper.closeBusyDialog();
-        if (status.isSuccess) {
-          if (status.isComplete) {
-            this.project.vzInstall.actualInstalledVersion.value = status.version;
+        if (statusResult.isSuccess) {
+          if (statusResult.isComplete) {
+            this.project.vzInstall.actualInstalledVersion.value = statusResult.version;
             const title = i18n.t('vz-install-status-checker-status-complete-title');
             const message = i18n.t('vz-install-status-checker-status-complete-message', { name: vzOptions.name });
             await window.api.ipc.invoke('show-info-message', title, message);
           } else {
+            const message = statusResult.payload ? statusResult.payload.message : '<no message>';
+            const status = statusResult.payload ? statusResult.payload.status : '<no status>';
+
             const title = i18n.t('vz-install-status-checker-status-incomplete-title');
-            const message = i18n.t('vz-install-status-checker-status-incomplete-message',
-              { name: vzOptions.name, message: status.payload?.message, status: status.payload?.status });
-            await window.api.ipc.invoke('show-info-message', title, message);
+            const errMessage = i18n.t('vz-install-status-checker-status-incomplete-message',
+              { name: vzOptions.name, message, status });
+            await window.api.ipc.invoke('show-info-message', title, errMessage);
           }
         } else {
           const title = i18n.t('vz-install-status-checker-status-failed-title');
           const message = i18n.t('vz-install-status-checker-status-failed-error-message',
-            { name: vzOptions.name, error: status.reason });
+            { name: vzOptions.name, error: statusResult.reason });
           await window.api.ipc.invoke('show-error-message', title, message);
           return Promise.resolve(false);
         }

webui/src/js/viewModels/vz-application-design-view.js

@@ -484,7 +484,7 @@ function (project, accUtils, utils, ko, i18n, BufferingDataProvider, ArrayDataPr
 
       const observableArray = this.componentObservable(component, 'ingressTraitRules');
       const rule = observableArray()[rowContext.item.index];
-      const ruleOptions = {...rule};
+      const ruleOptions = { ...rule };
 
       dialogHelper.promptDialog('vz-ingress-trait-rule-edit-dialog', ruleOptions).then(result => {
         if (result?.rule) {