Extract show/hide of EE banners from ee_manager_visible

Allow hiding the admin page separately from banners

Author: oliverguenther

app/models/enterprise_token.rb

@@ -46,7 +46,7 @@ def active?
     end
 
     def hide_banners?
-      !OpenProject::Configuration.ee_manager_visible?
+      OpenProject::Configuration.ee_hide_banners?
     end
 
     def banner_type_for(feature:)

config/constants/settings/definition.rb

@@ -409,10 +409,14 @@ class Definition
         allowed: %w[standard bim]
       },
       ee_manager_visible: {
-        description: "Show or hide the Enterprise configuration page and enterprise banners",
+        description: "Show the Enterprise configuration page",
         default: true,
         writable: false
       },
+      ee_hide_banners: {
+        description: "Hide the Enterprise enterprise banners",
+        default: false
+      },
       enable_internal_assets_server: {
         description: "Serve assets through the Rails internal asset server",
         default: false,

docs/installation-and-operations/configuration/environment/README.md

@@ -186,6 +186,7 @@ OPENPROJECT_DROP__OLD__SESSIONS__ON__LOGIN (default=false) Destroy all sessions
 OPENPROJECT_DROP__OLD__SESSIONS__ON__LOGOUT (default=true) Destroy all sessions for current_user on logout
 OPENPROJECT_EDITION (default="standard") OpenProject edition mode
 OPENPROJECT_EE__MANAGER__VISIBLE (default=true) Show or hide the Enterprise configuration page and enterprise banners
+OPENPROJECT_EE__HIDE__BANNERS (default=false) Hide the Enterprise enterprise banners
 OPENPROJECT_EMAIL__DELIVERY__CONFIGURATION (default="inapp")
 OPENPROJECT_EMAIL__DELIVERY__METHOD (default=nil) Email delivery method
 OPENPROJECT_EMAIL__LOGIN (default=false) Use email as login

spec/models/enterprise_token_spec.rb

@@ -32,13 +32,13 @@
 
 RSpec.describe EnterpriseToken do
   let(:object) { OpenProject::Token.new domain: Setting.host_name }
-  let(:ee_manager_visible) { true }
+  let(:ee_hide_banners) { true }
 
   subject { described_class.new(encoded_token: "foo") }
 
   before do
     RequestStore.delete :current_ee_token
-    allow(OpenProject::Configuration).to receive(:ee_manager_visible?).and_return(ee_manager_visible)
+    allow(OpenProject::Configuration).to receive(:ee_hide_banners?).and_return(ee_hide_banners)
   end
 
   describe ".active?" do
@@ -71,18 +71,18 @@
 
   describe ".hide_banners?" do
     context "when ee manager is visible" do
-      let(:ee_manager_visible) { true }
+      let(:ee_hide_banners) { true }
 
       it "returns true" do
-        expect(described_class).not_to be_hide_banners
+        expect(described_class).to be_hide_banners
       end
     end
 
     context "when ee manager is not visible" do
-      let(:ee_manager_visible) { false }
+      let(:ee_hide_banners) { false }
 
       it "returns false" do
-        expect(described_class).to be_hide_banners
+        expect(described_class).not_to be_hide_banners
       end
     end
   end
@@ -221,10 +221,10 @@
     end
   end
 
-  describe "Configuration file has `ee_manager_visible` set to false" do
+  describe "Configuration file has `ee_hide_banners` set to false" do
     it "does not show banners promoting EE" do
-      allow(OpenProject::Configuration).to receive(:ee_manager_visible?).and_return(false)
-      expect(described_class).to be_hide_banners
+      allow(OpenProject::Configuration).to receive(:ee_hide_banners?).and_return(false)
+      expect(described_class).not_to be_hide_banners
     end
   end
 end