Reorder social media worldwide org

app/controllers/admin/contacts_controller.rb

@@ -1,4 +1,5 @@
 class Admin::ContactsController < Admin::BaseController
+  include OrderableItemsConcern
   before_action :find_contactable
   before_action :find_contact, only: %i[edit update destroy confirm_destroy]
   before_action :destroy_blank_contact_numbers, only: %i[create update]
@@ -82,13 +83,8 @@ def extract_show_on_home_page_param
     @show_on_home_page = params[:contact].delete(:show_on_home_page)
   end
 
-  def extract_items_from_ordering_params
-    item_ordering = params[:ordering] || {}
-    item_ordering.permit!.to_h
-      .map { |item_id, ordering| [Contact.find_by(id: item_id), ordering.to_i] }
-      .sort_by { |_, ordering| ordering }
-      .map { |item, _| item }
-      .compact
+  def fetch_ordered_items
+    @ordered_items = extract_items_from_ordering_params(Contact)
   end
 
   def find_contactable

app/controllers/admin/editionable_social_media_accounts_controller.rb

@@ -1,4 +1,5 @@
 class Admin::EditionableSocialMediaAccountsController < Admin::BaseController
+  include OrderableItemsConcern
   before_action :find_edition
   before_action :find_social_media_account, only: %i[confirm_destroy destroy edit update]
 
@@ -46,6 +47,15 @@ def update
     end
   end
 
+  def reorder
+    if request.put?
+      update_ordering
+      redirect_to admin_edition_social_media_accounts_path(@edition), notice: "Social media accounts reordered"
+    else
+      @reorderable_social_media_accounts = @edition.social_media_accounts.order(:ordering)
+    end
+  end
+
 private
 
   def find_edition
@@ -62,8 +72,20 @@ def social_media_account_params
       :social_media_service_id,
       :title,
       :url,
+      :ordering,
     ).merge(
       socialable: @edition,
     )
   end
+
+  def fetch_ordered_items
+    @ordered_items = extract_items_from_ordering_params(SocialMediaAccount)
+  end
+
+  def update_ordering
+    ordered_accounts = fetch_ordered_items
+    ordered_accounts.each_with_index do |account, index|
+      account.update_order(index + 1)
+    end
+  end
 end

app/controllers/admin/home_page_list_controller.rb

@@ -7,7 +7,7 @@ def is_home_page_list_controller_for(list_name, opts)
     redirect_proc = opts[:redirect_to]
     home_page_list_controller_methods = Module.new do
       define_method(:reorder_for_home_page) do
-        reordered_items = extract_items_from_ordering_params
+        reordered_items = fetch_ordered_items
         home_page_list_container.__send__(:"reorder_#{plural_name}_on_home_page!", reordered_items)
         publish_container_to_publishing_api
         redirect_to redirect_proc.call(home_page_list_container, home_page_list_item), notice: %(#{plural_name.titleize} on home page reordered successfully)

app/controllers/admin/worldwide_offices_controller.rb

@@ -1,4 +1,5 @@
 class Admin::WorldwideOfficesController < Admin::BaseController
+  include OrderableItemsConcern
   before_action :find_worldwide_organisation
   before_action :find_worldwide_office, only: %i[edit update confirm_destroy destroy]
   extend Admin::HomePageListController
@@ -94,13 +95,8 @@ def handle_show_on_home_page_param
     end
   end
 
-  def extract_items_from_ordering_params
-    item_ordering = params[:ordering] || {}
-    item_ordering.permit!.to_h
-      .map { |item_id, ordering| [WorldwideOffice.find_by(id: item_id), ordering.to_i] }
-      .sort_by { |_, ordering| ordering }
-      .map { |item, _| item }
-      .compact
+  def fetch_ordered_items
+    @ordered_items = extract_items_from_ordering_params(WorldwideOffice)
   end
 
   def extract_show_on_home_page_param

app/controllers/concerns/orderable_items_concern.rb

@@ -0,0 +1,12 @@
+module OrderableItemsConcern
+  extend ActiveSupport::Concern
+
+  def extract_items_from_ordering_params(model_class)
+    item_ordering = params[:ordering] || {}
+    item_ordering.permit!.to_h
+      .map { |item_id, ordering| [model_class.find_by(id: item_id), ordering.to_i] }
+      .sort_by { |_, ordering| ordering }
+      .map { |item, _| item }
+      .compact
+  end
+end

app/models/social_media_account.rb

@@ -24,4 +24,9 @@ def service_name
   def display_name
     title.presence || service_name
   end
+
+  def update_order(new_order)
+    self.ordering = new_order
+    save!
+  end
 end

app/presenters/editionable_social_media_accounts_index_presenter.rb

@@ -8,7 +8,7 @@ def initialize(edition)
   end
 
   def social_media_accounts
-    edition.social_media_accounts.map do |social_media_account|
+    order_social_media_accounts.map do |social_media_account|
       {
         title: social_media_account.service_name,
         rows: social_media_account_rows(social_media_account),
@@ -17,6 +17,10 @@ def social_media_accounts
     end
   end
 
+  def order_social_media_accounts
+    @edition.social_media_accounts.order(:ordering)
+  end
+
 private
 
   def social_media_account_rows(social_media_account)

app/presenters/publishing_api/worldwide_organisation_presenter.rb

@@ -151,7 +151,7 @@ def secondary_role_person
     def social_media_links
       return [] unless item.social_media_accounts.any?
 
-      item.social_media_accounts.map do |social_media_account|
+      item.social_media_accounts.order(:ordering).map do |social_media_account|
         {
           href: social_media_account.url,
           service_type: social_media_account.service_name.parameterize,

app/views/admin/editionable_social_media_accounts/index.html.erb

@@ -18,11 +18,22 @@
       <%= link_to "Add new social media account", new_admin_edition_social_media_account_path(@edition), class: "govuk-link govuk-link--no-visited-state" %>
     </p>
 
-    <%= render "govuk_publishing_components/components/heading", {
-      text: "Social media accounts",
-      font_size: "l",
-      margin_bottom: 3,
-    } %>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <%= render "govuk_publishing_components/components/heading", {
+        text: "Social media accounts",
+        font_size: "l",
+        margin_bottom: 3,
+      } %>
+    </div>
+    <% if @edition.social_media_accounts.many? %>
+      <div class="govuk-grid-column-one-third">
+        <p class="govuk-body govuk-!-text-align-right">
+          <%= link_to("Reorder", reorder_admin_edition_social_media_accounts_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
+        </p>
+      </div>
+    <% end %>
+  </div>
 
     <% if @edition.social_media_accounts.any? %>
       <% @editionable_social_media_accounts_index_presenter.social_media_accounts.each do |social_media_account| %>

app/views/admin/editionable_social_media_accounts/reorder.html.erb

@@ -0,0 +1,26 @@
+<% content_for :page_title, "Reorder social media accounts" %>
+<% content_for :title, "Reorder social media accounts" %>
+<% content_for :title_margin_bottom, 6 %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-full">
+    <%= form_with url: reorder_admin_edition_social_media_accounts_path(@edition), method: :put do %>
+      <%= render "govuk_publishing_components/components/reorderable_list", {
+        items: @reorderable_social_media_accounts.map do |account|
+          {
+            id: account.id,
+            title: account.title,
+          }
+        end,
+      } %>
+
+      <div class="govuk-button-group govuk-!-margin-bottom-6">
+        <%= render "govuk_publishing_components/components/button", {
+          text: "Update order",
+        } %>
+
+        <%= link_to("Cancel", admin_edition_social_media_accounts_path(@edition), class: "govuk-link govuk-link--no-visited-state") %>
+      </div>
+    <% end %>
+  </div>
+</div>

config/routes.rb

@@ -250,6 +250,10 @@ def redirect(path, options = { prefix: Whitehall.router_prefix })
         resources :lead_images, controller: "edition_lead_images", only: %i[update]
         resources :social_media_accounts, only: %i[create destroy edit index new update], controller: "editionable_social_media_accounts" do
           get :confirm_destroy, on: :member
+          collection do
+            get :reorder
+            put :reorder
+          end
         end
       end
 

db/migrate/20250108102234_add_ordering_to_social_media_accounts.rb

@@ -0,0 +1,5 @@
+class AddOrderingToSocialMediaAccounts < ActiveRecord::Migration[7.1]
+  def change
+    add_column :social_media_accounts, :ordering, :integer
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_01_06_160308) do
+ActiveRecord::Schema[7.1].define(version: 2025_01_08_102234) do
   create_table "assets", charset: "utf8mb3", force: :cascade do |t|
     t.string "asset_manager_id", null: false
     t.string "variant", null: false
@@ -1006,6 +1006,7 @@
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
     t.string "socialable_type"
+    t.integer "ordering"
     t.index ["social_media_service_id"], name: "index_social_media_accounts_on_social_media_service_id"
     t.index ["socialable_id"], name: "index_social_media_accounts_on_organisation_id"
   end

test/functional/admin/editionable_social_media_accounts_controller_test.rb

@@ -146,4 +146,27 @@ class Admin::EditionableSocialMediaAccountsControllerTest < ActionController::Te
     assert_response :redirect
     assert_empty @edition.social_media_accounts
   end
+
+  view_test "GET :reorder displays the reorderable social media accounts" do
+    get :reorder, params: { edition_id: @edition }
+
+    assert_response :success
+    assert_select ".gem-c-reorderable-list__item", count: @edition.social_media_accounts.count
+  end
+
+  test "PUT :reorder updates the ordering of social media accounts" do
+    social_media_account1 = create(:social_media_account, socialable: @edition, ordering: 1)
+    social_media_account2 = create(:social_media_account, socialable: @edition, ordering: 2)
+
+    put :reorder,
+        params: { edition_id: @edition,
+                  ordering: {
+                    social_media_account2.id.to_s => "1",
+                    social_media_account1.id.to_s => "2",
+                  } }
+
+    assert_response :redirect
+    reordered_accounts = @edition.reload.social_media_accounts.where(id: [social_media_account1.id, social_media_account2.id]).order(:ordering)
+    assert_equal [social_media_account2, social_media_account1], reordered_accounts
+  end
 end