Merge pull request #71 from oracle/release-2.4.12

Release 2.4.12

Author: TheFrogPad

THIRD_PARTY_LICENSES.txt

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.11</version>
+    <version>2.4.12</version>
   </parent>
 
   <packaging>pom</packaging>

assembly/pom.xml

@@ -6,13 +6,13 @@
 
   <groupId>com.oracle.weblogic.console-backend</groupId>
   <artifactId>build-tools</artifactId>
-  <version>2.4.11</version>
+  <version>2.4.12</version>
   <name>Build Tools</name>
 
   <parent>
       <groupId>com.oracle.weblogic</groupId>
       <artifactId>console-backend</artifactId>
-      <version>2.4.11</version>
+      <version>2.4.12</version>
   </parent>
 
   <properties>

build-tools/pom.xml

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  * @ignore
  */
@@ -107,30 +107,36 @@ const AutoPrefs = (() => {
         const filepath = AutoPrefs.getPath(userDataPath);
         if (fs.existsSync(filepath)) {
           try {
-            const props = JSON.parse(fs.readFileSync(filepath));
-            // Update all the other _fields with values from the
-            // file just read.
-            AutoPrefs.set(props);
-            // See if auto-prefs.json contained a projects field
-            if (typeof props.projects !== 'undefined') {
-              // It did, so use it to do a UserProjects.putAll()
-              UserProjects.putAll(props.projects);
-              // Use UserProjects.write() to write out the
-              // in-memory projects.
-              UserProjects.write(userDataPath);
-            }
-            // See if auto-prefs.json contained a preferences field
-            if (typeof props.preferences !== 'undefined') {
-              // It did, so use it to do a UserPrefs.putAll()
-              UserPrefs.putAll(props.preferences);
-              // Use UserPrefs.write() to write out the
-              // in-memory preferences.
-              UserPrefs.write(userDataPath);
+            const fileContents = fs.readFileSync(filepath);
+
+            if (fileContents !== this.previousContents) {
+              const props = JSON.parse(fileContents);
+              // Update all the other _fields with values from the
+              // file just read.
+              AutoPrefs.set(props);
+              // See if auto-prefs.json contained a projects field
+              if (typeof props.projects !== 'undefined') {
+                // It did, so use it to do a UserProjects.putAll()
+                UserProjects.putAll(props.projects);
+                // Use UserProjects.write() to write out the
+                // in-memory projects.
+                UserProjects.write(userDataPath);
+              }
+              // See if auto-prefs.json contained a preferences field
+              if (typeof props.preferences !== 'undefined') {
+                // It did, so use it to do a UserPrefs.putAll()
+                UserPrefs.putAll(props.preferences);
+                // Use UserPrefs.write() to write out the
+                // in-memory preferences.
+                UserPrefs.write(userDataPath);
+              }
+              // The auto-prefs.json field could have contained a
+              // projects or preferences field, which will not be
+              // in the _fields. Write out the updated _fields.
+              AutoPrefs.write(userDataPath);
+
+              this.previousContents = fileContents;
             }
-            // The auto-prefs.json field could have contained a
-            // projects or preferences field, which will not be
-            // in the _fields. Write out the updated _fields.
-            AutoPrefs.write(userDataPath);
           }
           catch(err) {
             log('error', err);

electron/app/js/auto-prefs-json.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  * @ignore
  */
@@ -50,8 +50,13 @@ const AppConfig = (() => {
     read: () => {
       if (fs.existsSync(AppConfig.getPath())) {
         try {
-          const settings = JSON.parse(fs.readFileSync(AppConfig.getPath()).toString());
-          AppConfig.set(settings);
+          const content = fs.readFileSync(AppConfig.getPath()).toString();
+
+          if (content !== this.previousContent) {
+            this.previousContent = content;
+            const settings = JSON.parse(content);
+            AppConfig.set(settings);
+          }
         }
         catch(err) {
           log('error', err);

electron/app/js/config-json.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  * @ignore
  */
@@ -12,6 +12,7 @@ const OSUtils = require('./os-utils');
 const I18NUtils = require('./i18n-utils');
 const ElectronPreferences = require('electron-preferences');
 const SettingsEditor = require('./settings-editor');
+const fs = require('fs');
 
 /**
  * See {@link https://stackabuse.com/javascripts-immediately-invoked-function-expressions/}
@@ -20,6 +21,8 @@ const SettingsEditor = require('./settings-editor');
 const UserPrefs = (() => {
   let preferences;
 
+  const dataStore = 'user-prefs.json';
+  
   function osBasedHelp() {
     if (OSUtils.isMacOS())
       return I18NUtils.get('wrc-electron.menus.preferences.section.credential-storage.confirmation.apple.help');
@@ -32,7 +35,7 @@ const UserPrefs = (() => {
   // along with useful JSDoc comments :-).
   return {
     getPath: (userDataPath) => { 
-      return `${userDataPath}/user-prefs.json`;
+      return `${userDataPath}/${dataStore}`;
     },
     get: (key) => {
       if (!preferences) {
@@ -46,6 +49,7 @@ const UserPrefs = (() => {
       SettingsEditor.destroy(preferences);
       // We need to create a fresh one to re-initialize various
       // objects for show()
+      this.previousContent = null;
       UserPrefs.init();
       preferences.show();
     },
@@ -152,10 +156,19 @@ const UserPrefs = (() => {
           }
         ]
       };
+  
       preferences = new ElectronPreferences(preferencesTemplate);
     },
     read: (userDataPath) => {
-      UserPrefs.init();
+      // Ensure that there are file content changes instead of relying on file metadata (e.g. fstat)
+      // Workaround for https://github.com/paulmillr/chokidar/issues/1345
+      const data = fs.readFileSync(UserPrefs.getPath(userDataPath), { encoding: 'utf8', flag: 'r' });
+
+      if (data != this.previousContent) {        
+        UserPrefs.init();
+
+        this.previousContent = data;
+      }
     }
   };
 

electron/app/js/user-prefs-json.js

@@ -47,6 +47,10 @@ const AppWindow = require('./js/window-management');
 const instDir = path.dirname(app.getPath('exe'));
 const { homepage, productName, version, copyright } = require(`${instDir}/package.json`);
 
+if (OSUtils.isMacOS()) {
+  app.disableHardwareAcceleration();
+}
+
 let feedURL;
 
 // The documentation says to not use setFeedURL(), though it seems to work.