Merge branch 'main' into ssl-enhancement

Author: jshum2479

THIRD_PARTY_LICENSES.txt

@@ -1011,6 +1011,34 @@ DEALINGS IN THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 
+Ace (Ajax.org Cloud9 Editor) 1.4.13
+
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ajax.org B.V. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
 
 Third Party Development Code Dependencies
 =========================================
@@ -3443,5 +3471,3 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 --------------------------------------------------------------------------------
-
-

documentation/1.0/content/release notes/_index.md

@@ -25,3 +25,5 @@ pre = "<b> </b>"
     error: Application auto-updater failed: ENOENT: no such file or directory, open '/opt/WebLogic Kubernetes Toolkit UI/resources/app-update.yml'
     error: Error: ENOENT: no such file or directory, open '/opt/WebLogic Kubernetes Toolkit UI/resources/app-update.yml'
   ```
+
+- The application is limited to working with archive files whose size is less than 2 GB.

documentation/staging/content/release notes/_index.md

@@ -31,3 +31,5 @@ pre = "<b> </b>"
     error: Application auto-updater failed: ENOENT: no such file or directory, open '/opt/WebLogic Kubernetes Toolkit UI/resources/app-update.yml'
     error: Error: ENOENT: no such file or directory, open '/opt/WebLogic Kubernetes Toolkit UI/resources/app-update.yml'
   ```
+
+- The application is limited to working with archive files whose size is less than 2 GB.

electron/app/js/appUpdater.js

@@ -11,13 +11,17 @@ const i18n = require('./i18next.config');
 const { getLogger } = require('./wktLogging');
 const errorUtils = require('./errorUtils');
 const { sendToWindow } = require('./windowUtils');
+const osUtils = require('./osUtils');
 
 let _isDevMode;
+let _supportsAutoUpdate;
 let _downloadWindow;
 let _installType;
 
+/* global process */
 function initializeAutoUpdater(logger, isDevMode) {
   _isDevMode = isDevMode;
+  _supportsAutoUpdate = !(osUtils.isLinux() && !process.env.APPIMAGE);
   autoUpdater.logger = logger;
   autoUpdater.autoDownload = false;
   autoUpdater.autoInstallOnAppQuit = true;
@@ -44,7 +48,7 @@ function registerAutoUpdateListeners() {
 // if the application is current with the latest version, or an error occurs, the Promise resolves to null.
 // if notifyOnFailures is true, dialogs are displayed when no result is provided.
 async function getUpdateInformation(notifyOnFailures) {
-  if (!_isDevMode) {
+  if (!_isDevMode && _supportsAutoUpdate) {
     try {
       const checkResult = await autoUpdater.checkForUpdates();
       const releaseName = checkResult.updateInfo.releaseName;
@@ -79,8 +83,13 @@ async function getUpdateInformation(notifyOnFailures) {
     // Only show the prompt if the user used the menu to trigger checkForUpdates()
     // If triggered on startup, no need to display...
     //
-    dialog.showErrorBox(i18n.t('auto-updater-disabled-dev-mode-title'),
-      i18n.t('auto-updater-disabled-dev-mode-message'));
+    if (_isDevMode) {
+      dialog.showErrorBox(i18n.t('auto-updater-disabled-dev-mode-title'),
+        i18n.t('auto-updater-disabled-dev-mode-message'));
+    } else {
+      dialog.showErrorBox(i18n.t('auto-updater-disabled-unsupported-title'),
+        i18n.t('auto-updater-disabled-unsupported-message'));
+    }
   }
 
   return null;

electron/app/js/imageBuilderUtils.js

@@ -79,7 +79,11 @@ async function doLogin(imageBuilderExe, options) {
 
   if (options.host) {
     args.push(options.host);
+  } else {
+    // podman does not always default to docker hub when logging in without a host.
+    args.push('docker.io');
   }
+
   if (options.username) {
     args.push('-u', options.username);
   }

electron/app/js/kubectlUtils.js

@@ -199,7 +199,8 @@ async function getOperatorLogs(kubectlExe, operatorNamespace, options) {
 }
 
 async function getOperatorVersionFromDomainConfigMap(kubectlExe, domainNamespace, options) {
-  const args = [ 'get', 'configmap', 'weblogic-scripts-cm', '-n', domainNamespace, '-o', 'jsonpath={.metadata.labels.weblogic\\.operatorVersion}'];
+  const args = [ 'get', 'configmap', 'weblogic-scripts-cm', '-n', domainNamespace, '-o',
+    'jsonpath={.metadata.labels.weblogic\\.operatorVersion}'];
 
   const httpsProxyUrl = getHttpsProxyUrl();
   const bypassProxyHosts = getBypassProxyHosts();

electron/app/js/promptUtils.js

@@ -117,7 +117,6 @@ async function showAboutDialog(wktApp, parentWindow) {
   const MIN_HEIGHT = 120;  // needs to be smaller than content height
 
   return new Promise((resolve, reject) => {
-
     let promptWindow = new BrowserWindow({
       width: WIDTH,
       height: HEIGHT,
@@ -131,9 +130,6 @@ async function showAboutDialog(wktApp, parentWindow) {
       skipTaskbar: true,
       alwaysOnTop: false,
       useContentSize: true,
-      modal: Boolean(parentWindow),  // false causes problems with app menu appearing
-      autoHideMenuBar: true,
-      menuBarVisible: false,
       webPreferences: {
         nodeIntegration: false,
         contextIsolation: true,
@@ -142,10 +138,7 @@ async function showAboutDialog(wktApp, parentWindow) {
         preload: preloadFile
       },
     });
-
-    // hide app menu for various platforms
-    promptWindow.setMenu(null);
-    promptWindow.removeMenu();
+    // hide app menu for Windows and Linux
     promptWindow.setMenuBarVisibility(false);
 
     const getOptionsListener = event => {

electron/app/js/wdtArchive.js

@@ -23,6 +23,12 @@ function getEntryTypes() {
       extensions: ['ear', 'war'],
       pathPrefix: 'wlsdeploy/applications/'
     },
+    'applicationDeploymentPlan': {
+      name: i18n.t('wdt-archiveType-applicationDeploymentPlan'),
+      subtype: 'file',
+      extensions: ['xml'],
+      pathPrefix: 'wlsdeploy/applications/'
+    },
     'atpWallet': {
       name: i18n.t('wdt-archiveType-atpWallet'),
       subtype: 'file',
@@ -40,6 +46,16 @@ function getEntryTypes() {
       subtype: 'emptyDir',
       pathPrefix: 'wlsdeploy/coherence/'
     },
+    'customFile': {
+      name: i18n.t('wdt-archiveType-customFile'),
+      subtype: 'file',
+      pathPrefix: 'wlsdeploy/custom/'
+    },
+    'customDirectory': {
+      name: i18n.t('wdt-archiveType-customDirectory'),
+      subtype: 'dir',
+      pathPrefix: 'wlsdeploy/custom/'
+    },
     'domainBin': {
       name: i18n.t('wdt-archiveType-domainBin'),
       subtype: 'file',

electron/app/js/wktWindow.js

@@ -922,8 +922,28 @@ async function chooseFromFileSystem(targetWindow, options, joinListChar) {
 }
 
 async function executeAppQuit() {
-  for (const window of BrowserWindow.getAllWindows()) {
-    sendToWindow(window, 'start-app-quit');
+  const windows = BrowserWindow.getAllWindows();
+  getLogger().debug('Quit called with %d window(s) open', windows.length);
+  if (windows.length > 0) {
+    for (const window of windows) {
+      // Only send the start-app-quit message to full-fledged project windows.
+      // Any other windows aren't listening for the start-app-quit message
+      // and therefore, will never respond with window-app-close message.
+      //
+      if (Object.prototype.hasOwnProperty.call(window,'isReady')) {
+        getLogger().debug('sending start-app-quit to window id %d', window.id);
+        sendToWindow(window, 'start-app-quit');
+      } else {
+        getLogger().debug('skipping start-app-close message for window id %d', window.id);
+        window.close();
+      }
+    }
+  } else {
+    // If Quit is called with no open windows, just quit.  This handles the case where,
+    // on MacOS, the About Window is the last window open.  It is a special dialog window
+    // that is not included in the BrowserWindow.getAllWindows()...
+    //
+    app.quit();
   }
 }
 
@@ -1047,18 +1067,6 @@ async function promptUserForOkOrCancelAnswer(targetWindow, title, message) {
   });
 }
 
-function getCheckForAppUpdatesMenuItem() {
-  let checkForAppUpdatesMenuItem;
-  const menu = Menu.getApplicationMenu();
-  if (menu) {
-    const helpMenu = menu.items.find(item => item.id === 'help');
-    if (helpMenu && helpMenu.submenu) {
-      checkForAppUpdatesMenuItem = helpMenu.submenu.items.find(item => item.id === 'checkForAppUpdates');
-    }
-  }
-  return checkForAppUpdatesMenuItem;
-}
-
 // Arguments added here should be passed to the browser's window.process.argv array.
 function _getAdditionalArguments() {
   let extraArgs = [];
@@ -1081,7 +1089,6 @@ module.exports = {
   closeWindow,
   createNetworkWindow,
   createWindow,
-  getCheckForAppUpdatesMenuItem,
   initialize,
   isSingleWindow,
   setTitleFileName,

electron/app/locales/en/electron.json

@@ -104,6 +104,8 @@
   "auto-updater-install-question": "Update the application now or on exit?",
   "auto-updater-disabled-dev-mode-title": "Auto-Updater Disabled",
   "auto-updater-disabled-dev-mode-message": "Auto-Updater is disabled when running in development mode.",
+  "auto-updater-disabled-unsupported-title": "Auto-Updater Not Supported",
+  "auto-updater-disabled-unsupported-message": "Auto-Updater is not supported on Linux when not running from the AppImage executable.",
 
   "dialog-chooseArchiveFile": "Select an Archive File",
   "dialog-chooseModelFile": "Select a Model File",
@@ -329,8 +331,11 @@
   "wdt-archiveType-opssWallet": "OPSS Wallet",
   "wdt-archiveType-applicationFile": "Application File",
   "wdt-archiveType-applicationDir": "Application Directory",
+  "wdt-archiveType-applicationDeploymentPlan": "Application Deployment Plan",
   "wdt-archiveType-classpathLibrary": "Classpath Library",
   "wdt-archiveType-coherenceStore": "Coherence Store Directory",
+  "wdt-archiveType-customFile": "Custom File",
+  "wdt-archiveType-customDirectory": "Custom Directory",
   "wdt-archiveType-domainBin": "Domain Script",
   "wdt-archiveType-domainLibrary": "Domain Library",
   "wdt-archiveType-nodeManagerFile": "Node Manager File",