Sonar cleanup

Author: robertpatrick

electron/app/js/helmUtils.js

@@ -212,7 +212,7 @@ function getHelmEnv(httpsProxyUrl, bypassProxyHosts, helmOptions) {
     env['NO_PROXY'] = bypassProxyHosts;
   }
   env['PATH'] = process.env.PATH;
-  if (helmOptions && helmOptions.extraPathDirectories &&
+  if (helmOptions?.extraPathDirectories &&
     Array.isArray(helmOptions.extraPathDirectories) && helmOptions.extraPathDirectories.length > 0) {
     const extraPathDirectories = helmOptions.extraPathDirectories.join(path.delimiter);
     getLogger().debug('extraPathDirectories = %s', extraPathDirectories);

electron/app/js/imageBuilderUtils.js

@@ -202,7 +202,7 @@ function getDockerEnv(httpsProxyUrl, bypassProxyHosts, imageBuilderOptions) {
     env['no_proxy'] = bypassProxyHosts;
   }
 
-  if (imageBuilderOptions && imageBuilderOptions.extraEnvironmentVariables) {
+  if (imageBuilderOptions?.extraEnvironmentVariables) {
     const extraEnvironmentVariables =
       osUtils.removeProtectedEnvironmentVariables(imageBuilderOptions.extraEnvironmentVariables);
     env = Object.assign(env, extraEnvironmentVariables);

electron/app/js/kubectlUtils.js

@@ -764,7 +764,7 @@ function getKubectlEnvironment(options, httpsProxyUrl, bypassProxyHosts) {
     env['PROGRAMDATA'] = process.env.PROGRAMDATA;
   }
 
-  if (options && options.extraEnvironmentVariables) {
+  if (options?.extraEnvironmentVariables) {
     const extraEnvironmentVariables =
       osUtils.removeProtectedEnvironmentVariables(options.extraEnvironmentVariables);
     env = Object.assign(env, extraEnvironmentVariables);
@@ -774,10 +774,7 @@ function getKubectlEnvironment(options, httpsProxyUrl, bypassProxyHosts) {
 
 function getOperatorImageTag(operatorDeployment) {
   let imageTag;
-  if (operatorDeployment.spec
-    && operatorDeployment.spec.template
-    && operatorDeployment.spec.template.spec
-    && operatorDeployment.spec.template.spec.containers) {
+  if (operatorDeployment.spec?.template?.spec?.containers) {
     const containers = operatorDeployment.spec.template.spec.containers;
 
     for (const container of containers) {
@@ -886,7 +883,7 @@ async function isVerrazzanoInstalled(kubectlExe, options) {
         result.name = vzObject.metadata?.name;
 
         let statusVersion = vzObject.status?.version;
-        if (statusVersion && statusVersion.startsWith('v')) {
+        if (statusVersion?.startsWith('v')) {
           statusVersion = statusVersion.slice(1);
         }
         result.version = statusVersion;

electron/app/js/modelArchive.js

@@ -364,7 +364,7 @@ async function _removePathFromArchive(archiveFile, zip, zipPath) {
     try {
       if (zip.file(zipPath)) {
         zip.remove(zipPath);
-      } else if (zipPath && zipPath.endsWith('/')) {
+      } else if (zipPath?.endsWith('/')) {
         // Remove the trailing slash so the target folder is also removed, not just its contents...
         zip.remove(zipPath.slice(0, -1));
       }

electron/app/js/prompt/about.js

@@ -59,7 +59,7 @@ function promptRegister() {
 window.addEventListener('error', error => {
   if (promptId) {
     const text = error.message ? error.message : error;
-    promptError('An error has occurred on the about window: \n' + text);
+    promptError('An error has occurred on the about window: \n' + JSON.stringify(text));
   }
 });
 

electron/app/js/prompt/credential-passphrase.js

@@ -69,7 +69,7 @@ function promptRegister() {
 window.addEventListener('error', error => {
   if (promptId) {
     const text = error.message ? error.message : error;
-    promptError('An error has occurred on the prompt window: \n' + text);
+    promptError('An error has occurred on the prompt window: \n' + JSON.stringify(text));
   }
 });
 

electron/app/js/wktLogging.js

@@ -66,7 +66,7 @@ function logRendererMessage(windowId, level, message, ...args) {
 }
 
 function getDefaultLogDirectory(wktMode) {
-  if (wktMode && wktMode.isExecutableMode()) {
+  if (wktMode?.isExecutableMode()) {
     return _getDefaultLogDir();
   }
   return process.cwd();

electron/app/js/wktTools.js

@@ -68,7 +68,7 @@ function isWitErrorExitCode(exitCode) {
 
 async function isWdtVersionCompatible(minimumVersion) {
   const wdtVersionFileName = path.join(getWdtDirectory(), 'VERSION.txt');
-  const versionRegex = /^WebLogic Deploy Tooling (?<version>[\d]+.[\d]+.[\d]+(-SNAPSHOT)?)$/;
+  const versionRegex = /^WebLogic Deploy Tooling (?<version>\d+.\d+.\d+(-SNAPSHOT)?)$/;
   const result = {
     isSuccess: true
   };

electron/app/main.js

@@ -225,7 +225,7 @@ class Main {
           };
 
           // This should never be null by the time it gets to this point but check anyway...
-          if (this._appUpdatePromise) {
+          if (this._appUpdatePromise !== null) {
             this._appUpdatePromise.then(updateResult => {
               if (updateResult) {
                 startupInformation.update = updateResult;

electron/build/notarize.js

@@ -26,7 +26,7 @@ function findPackageJsonPath() {
 function getAppId(context) {
   // Try to get the appId from the packager
   const config = context.packager.info._configuration;
-  if (config && config.appId) {
+  if (config?.appId) {
     console.log('Found appId in packager');
     return config.appId;
   }
@@ -47,7 +47,7 @@ function getAppId(context) {
   if (packageJsonFilePath) {
     try {
       const packageJson = require(packageJsonFilePath);
-      if (packageJson['build'] && packageJson['build']['appId']) {
+      if (packageJson['build']?.['appId']) {
         console.log('Found appId in %s', packageJsonFilePath);
         return packageJson['build']['appId'];
       }