Drop old announcements feature from WebUI

Announcements functionality has been moved to StatusMessage, so its code is removed. For the moment we drop the WebUI part since the API part is going to be adapted to keep backward compatibility. Co-authored-by: Victor Pereira <vpereira@suse.com>
openSUSE · May 29, 2020 · f2e48e3 · f2e48e3
1 parent f86f173
commit f2e48e3
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 133 deletions.
diff --git a/src/api/app/controllers/webui/announcements_controller.rb b/src/api/app/controllers/webui/announcements_controller.rb
diff --git a/src/api/app/controllers/webui/users/announcements_controller.rb b/src/api/app/controllers/webui/users/announcements_controller.rb
diff --git a/src/api/app/controllers/webui/webui_controller.rb b/src/api/app/controllers/webui/webui_controller.rb
@@ -20,7 +20,6 @@ class Webui::WebuiController < ActionController::Base
   before_action :check_anonymous
   before_action :set_influxdb_additional_tags
   before_action :require_configuration
-  before_action :set_pending_announcement
   before_action :current_announcement
   after_action :clean_cache
 
@@ -312,11 +311,6 @@ def pundit_user
     User.possibly_nobody
   end
 
-  def set_pending_announcement
-    return if Announcement.last.in?(User.possibly_nobody.announcements)
-    @pending_announcement = Announcement.last
-  end
-
   def current_announcement
     @current_announcement = StatusMessage.latest_for_current_user
   end

diff --git a/src/api/app/views/layouts/webui/_announcement.html.haml b/src/api/app/views/layouts/webui/_announcement.html.haml
diff --git a/src/api/app/views/layouts/webui/_footer.html.haml b/src/api/app/views/layouts/webui/_footer.html.haml
@@ -26,8 +26,6 @@
       %li= link_to('API Documentation', apidocs_index_path)
       %li= link_to('OBS Portal', 'http://en.opensuse.org/Portal:Build_service')
       %li= link_to('Reporting a Bug', 'http://openbuildservice.org/support/')
-      - if Announcement.last.present?
-        %li= link_to('Latest Announcement', announcement_path(Announcement.last))
   .col
     %strong.text-uppercase Contact
     %ul

diff --git a/src/api/app/views/layouts/webui/responsive_ux/_footer.html.haml b/src/api/app/views/layouts/webui/responsive_ux/_footer.html.haml
@@ -24,8 +24,6 @@
       %li= link_to('API Documentation', apidocs_index_path)
       %li= link_to('OBS Portal', 'http://en.opensuse.org/Portal:Build_service')
       %li= link_to('Reporting a Bug', 'http://openbuildservice.org/support/')
-      - if Announcement.last.present?
-        %li= link_to('Latest Announcement', announcement_path(Announcement.last))
   .flex-fill
     %strong.text-uppercase Contact
     %ul

diff --git a/src/api/app/views/layouts/webui/webui.html.haml b/src/api/app/views/layouts/webui/webui.html.haml
@@ -53,8 +53,6 @@
             = render partial: 'layouts/webui/personal_navigation'
 
     .container-xxl.sticky-top.flash-and-announcement.text-word-break-all
-      - unless @hide_announcement_notification
-        #announcement= render partial: 'layouts/webui/announcement', locals: { pending_announcement: @pending_announcement }
       = render partial: 'layouts/webui/status_message_announcement', locals: { current_announcement: @current_announcement }
       #flash= render partial: 'layouts/webui/flash', object: flash
     .modal.fade#modal{ tabindex: '-1', role: 'dialog', aria: { labelledby: 'modalLabel', hidden: true } }

diff --git a/src/api/app/views/webui/announcements/_breadcrumb_items.html.haml b/src/api/app/views/webui/announcements/_breadcrumb_items.html.haml
diff --git a/src/api/app/views/webui/announcements/show.html.haml b/src/api/app/views/webui/announcements/show.html.haml
diff --git a/src/api/app/views/webui/users/announcements/create.js.haml b/src/api/app/views/webui/users/announcements/create.js.haml
diff --git a/src/api/config/routes/webui_routes.rb b/src/api/config/routes/webui_routes.rb
@@ -314,8 +314,6 @@
       end
 
       post 'rss_tokens' => :create, controller: 'webui/users/rss_tokens', as: :my_rss_token
-      # To accept announcements as user
-      post 'announcements/:id' => :create, controller: 'webui/users/announcements', as: :my_announcements
       post 'status_messages/:id' => :acknowledge, controller: 'webui/status_messages', as: :acknowledge_status_message
     end
 
@@ -335,8 +333,6 @@
     end
     # Legacy routes end
 
-    resources :announcements, only: :show, controller: 'webui/announcements'
-
     resource :session, only: [:new, :create, :destroy], controller: 'webui/session'
 
     controller 'webui/groups/bs_requests' do

diff --git a/src/api/spec/controllers/webui/users/announcements_controller_spec.rb b/src/api/spec/controllers/webui/users/announcements_controller_spec.rb
diff --git a/src/api/spec/features/beta/webui/announcements_spec.rb b/src/api/spec/features/beta/webui/announcements_spec.rb
diff --git a/src/api/spec/features/webui/announcements_spec.rb b/src/api/spec/features/webui/announcements_spec.rb