Merge pull request #70 from oracle/release-2.4.11

Release 2.4.11

Author: moreaut

assembly/pom.xml

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

build-electron.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021, 2023, Oracle and/or its affiliates.
+# Copyright 2021, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 do_docker_pull() {
@@ -148,8 +148,7 @@ then
   esac
 fi
 
-# Legally, the thing we ship must be openjdk
-NEW_JAVA_BIN="$(run/get_java --openjdk)"
+NEW_JAVA_BIN="$(run/get_java)"
 if [ -n "$NEW_JAVA_BIN" ]
 then
   PATH="$NEW_JAVA_BIN$pathsep$PATH"

build-tools/pom.xml

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

electron/app/js/settings-editor.js

@@ -47,6 +47,7 @@ const SettingsEditor = (() => {
       }
     }
     const otherList = [];
+    preferences.value('roles.restrictContentBasedOnRoles', true);
     for (var key in data) {
       if (key === 'proxy') {
         preferences.value('networking.proxy', data[key]);
@@ -66,6 +67,9 @@ const SettingsEditor = (() => {
       else if (key === 'console.readTimeoutMillis') {
         preferences.value('networking.readTimeoutMillis', data[key]);
       }
+      else if (key === 'console.restrictContentBasedOnRoles') {
+        preferences.value('roles.restrictContentBasedOnRoles', data[key]);
+      }
       else if (key === 'console.disableHostnameVerification') {
         preferences.value('networking.disableHostnameVerification', data[key]);
       }
@@ -92,6 +96,9 @@ const SettingsEditor = (() => {
     addValue(data, 'console.connectTimeoutMillis', preferences.value('networking.connectTimeoutMillis'));
     addValue(data, 'console.readTimeoutMillis', preferences.value('networking.readTimeoutMillis'));
     addValue(data, 'console.disableHostnameVerification', preferences.value('networking.disableHostnameVerification'));
+    if (preferences.value('roles.restrictContentBasedOnRoles') !== true) {
+      data['console.restrictContentBasedOnRoles'] = false;
+    }
     const otherList = preferences.preferences?.other?.list;
     for (var pair of otherList) {
       data[pair.substring(0, pair.indexOf('='))]= pair.substring(pair.indexOf('=') + 1);
@@ -238,6 +245,35 @@ const SettingsEditor = (() => {
               ]
             }
           },
+          {
+            id: 'roles',
+            label: `${I18NUtils.get('wrc-electron.menus.settings.section.roles.label')}`,
+            icon: 'preferences',
+            form: {
+              groups: [
+                {
+                  'fields': [
+                    {
+                      label: `${I18NUtils.get('wrc-electron.menus.settings.restrict-content.label')}`,
+                      help: `${I18NUtils.get('wrc-electron.menus.settings.restrict-content.help')}`,
+                      key: 'restrictContentBasedOnRoles',
+                      type: 'radio',
+                      options: [
+                        {label: `${I18NUtils.get('wrc-electron.menus.preferences.yes')}`, value: true},
+                        {label: `${I18NUtils.get('wrc-electron.menus.preferences.no')}`, value: false}
+                      ]
+                    },
+                    {
+                      type: 'button',
+                      key: 'save',
+                      buttonLabel: `${I18NUtils.get('wrc-electron.common.save')}`,
+                      hideLabel: 'true'
+                    }
+                  ]
+                }
+              ]
+            }
+          },
           {
             id: 'other',
             label: `${I18NUtils.get('wrc-electron.menus.settings.section.other-list.label')}`,