Merge pull request #3561 from alphagov/remove-global-bar

Remove global bar component
alphagov · Feb 24, 2025 · ffa7fba · ffa7fba
2 parents 5d370fe + fb7fdd7
commit ffa7fba
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 681 deletions.
diff --git a/Gemfile b/Gemfile
@@ -38,6 +38,5 @@ group :test do
   gem "mocha", require: false
   gem "shoulda-context"
   gem "simplecov"
-  gem "timecop"
   gem "webmock"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -591,7 +591,6 @@ GEM
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
-    timecop (0.9.10)
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -645,7 +644,6 @@ DEPENDENCIES
   simplecov
   sprockets-rails
   terser
-  timecop
   webmock
 
 RUBY VERSION

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -16,12 +16,10 @@
 //= require govuk_publishing_components/components/cookie-banner
 //= require govuk_publishing_components/components/cross-service-header
 //= require govuk_publishing_components/components/feedback
+//= require govuk_publishing_components/components/global-banner
 //= require govuk_publishing_components/components/layout-header
 //= require govuk_publishing_components/components/layout-super-navigation-header
 //= require govuk_publishing_components/components/skip-link
 //= require govuk_publishing_components/components/search-with-autocomplete
 
-//= require modules/global-bar
-
-//= require global-bar-init
 //= require surveys
diff --git a/app/assets/javascripts/global-bar-init.js b/app/assets/javascripts/global-bar-init.js
diff --git a/app/assets/javascripts/libs/GlobalBarHelper.js b/app/assets/javascripts/libs/GlobalBarHelper.js
diff --git a/app/assets/javascripts/modules/global-bar.js b/app/assets/javascripts/modules/global-bar.js
diff --git a/app/assets/javascripts/surveys.js b/app/assets/javascripts/surveys.js
@@ -88,11 +88,6 @@
       if (userSurveys.canShowAnySurvey()) {
         var activeSurvey = userSurveys.getActiveSurvey(userSurveys.defaultSurvey, userSurveys.smallSurveys)
         if (activeSurvey !== undefined) {
-          // Hide global bar if one is showing
-          var globalBar = document.getElementById('global-bar')
-          if (globalBar) {
-            globalBar.style.display = 'none'
-          }
           userSurveys.displaySurvey(activeSurvey)
         }
       }
@@ -434,8 +429,7 @@
       }
       var notificationIds = [
         '.emergency-banner',
-        '#taxonomy-survey',
-        '#global-bar' // Currently about Coronavirus
+        '#taxonomy-survey'
       ]
       var count = 0
       for (var i = 0; i < notificationIds.length; i++) {

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -24,12 +24,12 @@
 @import "govuk_publishing_components/components/cross-service-header";
 @import "govuk_publishing_components/components/feedback";
 @import "govuk_publishing_components/components/emergency-banner";
+@import "govuk_publishing_components/components/global-banner";
 @import "govuk_publishing_components/components/layout-footer";
 @import "govuk_publishing_components/components/layout-for-public";
 @import "govuk_publishing_components/components/layout-header";
 @import "govuk_publishing_components/components/layout-super-navigation-header";
 
-@import "components/global-bar";
 @import "components/survey";
 
 @import "helpers/draft";
diff --git a/app/assets/stylesheets/components/_global-bar.scss b/app/assets/stylesheets/components/_global-bar.scss
diff --git a/app/helpers/timed_update_helper.rb b/app/helpers/timed_update_helper.rb