Move global banner text to top bar (#3049)

The current banner isn't shown on all pages, and it's currently
impossible to view the global banner and project-specific banners at the
same time. This PR moves the global banner to the middle of the top bar,
leaving the original banner as a project-specific feature. A future PR
will extend the project-specific banner to all project pages.

<img width="2834" height="194" alt="image"
src="https://github.com/user-attachments/assets/5719b342-5474-4829-ae76-1e5bd4be6658"
/>

Author: williamjallen

app/Http/Controllers/SubProjectController.php

@@ -141,9 +141,6 @@ public function apiViewSubProjects(): JsonResponse
         $response['showcalendar'] = 1;
 
         $banners = [];
-        if (config('cdash.global_banner') !== null && strlen(config('cdash.global_banner')) > 0) {
-            $banners[] = config('cdash.global_banner');
-        }
         if ($this->project->Banner !== null && strlen($this->project->Banner) > 0) {
             $banners[] = $this->project->Banner;
         }

app/cdash/public/api/v1/index.php

@@ -51,9 +51,6 @@
 $response['showcalendar'] = 1;
 
 $banners = [];
-if (config('cdash.global_banner') !== null && strlen(config('cdash.global_banner')) > 0) {
-    $banners[] = config('cdash.global_banner');
-}
 if ($Project->Banner !== null && strlen($Project->Banner) > 0) {
     $banners[] = $Project->Banner;
 }

app/cdash/tests/CMakeLists.txt

@@ -156,6 +156,8 @@ add_feature_test(/Feature/SlowPageTest)
 
 add_feature_test(/Feature/GitHubWebhook)
 
+add_feature_test(/Feature/GlobalBannerTest)
+
 add_legacy_unit_test(/CDash/Lib/Repository/GitHub)
 set_tests_properties(/CDash/Lib/Repository/GitHub PROPERTIES
     DEPENDS /CDash/XmlHandler/UpdateHandler

config/cdash.php

@@ -86,6 +86,7 @@
     'require_full_email_when_adding_user' => env('REQUIRE_FULL_EMAIL_WHEN_ADDING_USER', false),
     // Whether or not project administrators can invite users
     'project_admin_registration_form_enabled' => env('PROJECT_ADMIN_REGISTRATION_FORM_ENABLED', true),
+    // Text displayed at the top of all pages.  Limited to 40 characters.
     'global_banner' => env('GLOBAL_BANNER'),
     // Whether or not "normal" username+password authentication is enabled
     'username_password_authentication_enabled' => env('USERNAME_PASSWORD_AUTHENTICATION_ENABLED', true),

phpstan-baseline.neon

@@ -2400,12 +2400,6 @@ parameters:
 			count: 2
 			path: app/Http/Controllers/SubProjectController.php
 
-		-
-			message: '#^Parameter \#1 \$string of function strlen expects string, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/Http/Controllers/SubProjectController.php
-
 		-
 			message: '#^Parameter \#1 \$string of function strlen expects string, string\|false given\.$#'
 			identifier: argument.type
@@ -17163,12 +17157,6 @@ parameters:
 			count: 6
 			path: app/cdash/public/api/v1/index.php
 
-		-
-			message: '#^Parameter \#1 \$string of function strlen expects string, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/cdash/public/api/v1/index.php
-
 		-
 			message: '#^Parameter \#1 \$string of function strlen expects string, string\|false given\.$#'
 			identifier: argument.type

resources/views/components/header.blade.php

@@ -1,4 +1,6 @@
 @php
+use Illuminate\Support\Str;
+
 if (isset($project)) {
     $logoid = $project->ImageId;
 }
@@ -12,13 +14,21 @@
 
 <div id="header">
     <div id="headertop">
-        <div id="topmenu">
-            <a class="cdash-link" href="{{ url('/projects') }}">All Dashboards</a>
-            @if(Auth::check())
-                <a class="cdash-link" href="{{ url('/user') }}">My CDash</a>
+        <div id="topmenu" style="display: flex; justify-content: space-between;">
+            <span>
+                <a class="cdash-link" href="{{ url('/projects') }}">All Dashboards</a>
+                @if(Auth::check())
+                    <a class="cdash-link" href="{{ url('/user') }}">My CDash</a>
+                @endif
+            </span>
+
+            @if(config('cdash.global_banner') !== null && strlen(config('cdash.global_banner')) > 0)
+                <span id="global-banner" style="color: #2ee84a;">
+                    {{ Str::limit(config('cdash.global_banner'), 40) }}
+                </span>
             @endif
 
-            <span style="float: right;">
+            <span>
                 @if(Auth::check())
                     <a class="cdash-link" href="{{ url('/logout') }}">Logout</a>
                 @else

tests/Feature/GlobalBannerTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Support\Str;
+use Tests\TestCase;
+
+class GlobalBannerTest extends TestCase
+{
+    public function testGlobalBannerAppearsWhenSet(): void
+    {
+        $bannerText = Str::uuid()->toString();
+
+        $this->get('/login')->assertDontSee($bannerText);
+
+        config(['cdash.global_banner' => $bannerText]);
+
+        $this->get('/login')->assertSee($bannerText);
+    }
+
+    public function testLongGlobalBannerGetsTruncated(): void
+    {
+        $bannerText = 'AAAABBBBCCCCDDDDEEEEFFFFGGGGHHHHIIIIJJJJKKKKLLLLMMMMM';
+
+        config(['cdash.global_banner' => $bannerText]);
+
+        $this->get('/login')->assertSee('AAAABBBBCCCCDDDDEEEEFFFFGGGGHHHHIIIIJJJJ...');
+    }
+}