Merge pull request #13645 from dmarcoux/issue-13574

Consistently name news accross the UI

Author: Dany Marcoux

src/api/app/components/status_message_component.html.haml

@@ -9,11 +9,11 @@
         #{time_ago_in_words(@status_message.created_at)} ago
       - if policy(@status_message).update? && policy(@status_message).destroy?
         .float-end
-          = link_to(edit_status_message_path(@status_message), title: 'Edit status message', class: 'mr-2') do
+          = link_to(edit_status_message_path(@status_message), title: 'Edit news item', class: 'mr-2') do
             %i.fas.fa-edit.text-secondary
-          = link_to('#', title: 'Delete status message', data: { toggle: 'modal',
-                                                                 target: '#delete-status-message-modal',
-                                                                 action: status_message_path(@status_message) }) do
+          = link_to('#', title: 'Delete news item', data: { toggle: 'modal',
+                                                       target: '#delete-news-item-modal',
+                                                       action: status_message_path(@status_message) }) do
 
             %i.fas.fa-times-circle.text-danger
       .mt-2.mb-0

src/api/app/controllers/webui/status_messages_controller.rb

@@ -27,9 +27,9 @@ def create
     status_message = authorize StatusMessage.new(status_message_params)
 
     if status_message.save
-      flash[:success] = 'Status message was successfully created.'
+      flash[:success] = 'News item was successfully created.'
     else
-      flash[:error] = "Could not create status message: #{status_message.errors.full_messages.to_sentence}"
+      flash[:error] = "Could not create news item: #{status_message.errors.full_messages.to_sentence}"
     end
 
     redirect_to(action: 'index')
@@ -39,9 +39,9 @@ def update
     status_message = authorize StatusMessage.find(params[:id])
 
     if status_message.update(status_message_params)
-      flash[:success] = 'Status message was successfully updated.'
+      flash[:success] = 'News item was successfully updated.'
     else
-      flash[:error] = "Could not update status message: #{status_message.errors.full_messages.to_sentence}"
+      flash[:error] = "Could not update news item: #{status_message.errors.full_messages.to_sentence}"
     end
 
     redirect_to(action: 'index')
@@ -51,9 +51,9 @@ def destroy
     status_message = authorize StatusMessage.find(params[:id])
 
     if status_message.destroy
-      flash[:success] = 'Status message was successfully deleted.'
+      flash[:success] = 'News item was successfully deleted.'
     else
-      flash[:error] = "Could not delete status message: #{status_message.errors.full_messages.to_sentence}"
+      flash[:error] = "Could not delete news item: #{status_message.errors.full_messages.to_sentence}"
     end
 
     redirect_back_or_to({ action: 'index' })

src/api/app/views/webui/main/_status_messages.html.haml

@@ -15,10 +15,10 @@
     .card-footer
       = link_to(new_status_message_path, class: 'nav-link') do
         %i.fas.fa-plus-circle.text-primary
-        Create Status Message
+        Create News Item
 
 - if status_message_policy.destroy?
-  = render DeleteConfirmationDialogComponent.new(modal_id: 'delete-status-message-modal',
+  = render DeleteConfirmationDialogComponent.new(modal_id: 'delete-news-item-modal',
                                                  method: :delete,
-                                                 options: { modal_title: 'Do you want to remove this status message?',
-                                                            confirmation_text: 'Please confirm the deletion of this status message' })
+                                                 options: { modal_title: 'Do you want to remove this news item?',
+                                                            confirmation_text: 'Please confirm the deletion of this news item' })

src/api/app/views/webui/status_messages/edit.html.haml

@@ -1,4 +1,4 @@
-- @pagetitle = 'Edit Status Message'
+- @pagetitle = 'Edit News Item'
 
 .row
   .col

src/api/app/views/webui/status_messages/index.html.haml

@@ -32,11 +32,11 @@
         = page_entries_info @status_messages, entry_name: 'news'
 
     .pt-4
-      = link_to(new_status_message_path, title: 'Create News') do
+      = link_to(new_status_message_path, title: 'Create News Item') do
         %i.fas.fa-plus-circle.text-primary
-        Create News
+        Create News Item
 
-= render DeleteConfirmationDialogComponent.new(modal_id: 'delete-status-message-modal',
+= render DeleteConfirmationDialogComponent.new(modal_id: 'delete-news-item-modal',
                                                 method: :delete,
-                                                options: { modal_title: 'Do you want to remove this status message?',
-                                                          confirmation_text: 'Please confirm the deletion of this status message' })
+                                                options: { modal_title: 'Do you want to remove this news item?',
+                                                          confirmation_text: 'Please confirm the deletion of this news item' })

src/api/app/views/webui/status_messages/new.html.haml

@@ -1,4 +1,4 @@
-- @pagetitle = 'Create Status Message'
+- @pagetitle = 'Create News Item'
 .row
   .col
     .card

src/api/spec/controllers/webui/status_messages_controller_spec.rb

@@ -11,7 +11,7 @@
   describe 'POST create' do
     it { is_expected.to use_after_action(:verify_authorized) }
 
-    it 'create a status message' do
+    it 'create a news item' do
       login(admin_user)
 
       post :create, params: { status_message: { message: 'Some message', severity: 'green' } }
@@ -27,13 +27,13 @@
         post :create, params: { status_message: { message: 'Some message' } }
       end.not_to change(StatusMessage, :count)
       expect(response).to redirect_to(status_messages_path)
-      expect(flash[:error]).to eq("Could not create status message: Severity can't be blank")
+      expect(flash[:error]).to eq("Could not create news item: Severity can't be blank")
 
       expect do
         post :create, params: { status_message: { severity: 'green' } }
       end.not_to change(StatusMessage, :count)
       expect(response).to redirect_to(status_messages_path)
-      expect(flash[:error]).to eq("Could not create status message: Message can't be blank")
+      expect(flash[:error]).to eq("Could not create news item: Message can't be blank")
     end
 
     context 'non-admin users' do
@@ -57,7 +57,7 @@
         post :create, params: { status_message: { severity: 'green' } }
       end
 
-      it { expect(flash[:error]).to eq("Could not create status message: Message can't be blank") }
+      it { expect(flash[:error]).to eq("Could not create news item: Message can't be blank") }
     end
 
     context 'empty severity' do
@@ -66,7 +66,7 @@
         post :create, params: { status_message: { message: 'Some message' } }
       end
 
-      it { expect(flash[:error]).to eq("Could not create status message: Severity can't be blank") }
+      it { expect(flash[:error]).to eq("Could not create news item: Severity can't be blank") }
     end
 
     context 'that fails at saving the message' do
@@ -117,7 +117,7 @@
 
     it { is_expected.to use_after_action(:verify_authorized) }
 
-    context 'when the status message is not yet acknowledged' do
+    context 'when the news item is not yet acknowledged' do
       before do
         allow(RabbitmqBus).to receive(:send_to_bus)
         login(admin_user)
@@ -141,7 +141,7 @@
       end
     end
 
-    context 'when the status message is already acknowledged' do
+    context 'when the news item is already acknowledged' do
       before do
         allow(RabbitmqBus).to receive(:send_to_bus)
         login(admin_user)