spina-admin-journal 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6bcd6816e32f3ea9345061c96fb045e2ad56b4e0784dc52fa553aa57a17fac5
-  data.tar.gz: 83dc5d60bb02ecd87b9559db4923f81b97848842bb66c04f734cbb708c3159d6
+  metadata.gz: 699af672ff6d7d01b9d16ac482555eaf067ad7368d2a9149cd5e530da9f484aa
+  data.tar.gz: a4fbf7727835537e5f71df2c35b01d3b848764e6a75e2ffeac993e0852bf214d
 SHA512:
-  metadata.gz: 94b6fa30869ad9a702b057d7dce487b8a522f9798d5d5d2897f554e19a75a9136760201b1a13d652a9e51f15aefbdf6b2cdd7bf0df3d73ae884f024cc193a37c
-  data.tar.gz: f4acc58dcebdb7c13864cc99086376e516095658de37dcbb720127d2d65bdedb37b5dc658116b99f2a5d1f9152b17d0369ce52d3d5e6e674cf12ec5a7d0936b1
+  metadata.gz: 2a580ab0bf04617189936fc7ea06b9c08e4941a685474fdfd5a896589de7a797f0db602de90d85d95f0f06849b21da71414fdb4d8952abed3d6cda320bc8b6dc
+  data.tar.gz: 78454dba6fb8c595ee4d31e894dbc17f2217adad8960de4009fd7c373f30502ea8133e32bb985c17fc7dde9b5fea5cef6ecadd620254519f74b9be604ef2169a

data/app/controllers/spina/admin/journal/authors_controller.rb

@@ -46,6 +46,20 @@ module Spina
           end
         end
 
+        def sort
+          ActiveRecord::Base.transaction do
+            sort_params.each do |id, new_pos|
+              # ignore uniqueness validation for now
+              Authorship.find(id.to_i).update_attribute(:position, new_pos.to_i) # rubocop:disable Rails/SkipsModelValidations
+            end
+            # do validations after reordering is complete
+            validate_sort_order
+          end
+          render json: { success: true, message: t('.sort_success') }
+        rescue ActiveRecord::RecordInvalid
+          render json: { success: false, message: t('.sort_error') }
+        end
+
         private
 
         def author_params
@@ -65,6 +79,10 @@ module Spina
           new_params
         end
 
+        def sort_params
+          params.require(:admin_journal_authorships).require(:list).permit!
+        end
+
         def set_breadcrumb
           add_breadcrumb Author.model_name.human(count: :many), admin_journal_authors_path
         end
@@ -77,6 +95,12 @@ module Spina
           @author = Author.find(params[:id])
           add_breadcrumb @author.primary_affiliation.name
         end
+
+        def validate_sort_order
+          Authorship.where(article_id: params[:article_id]).each do |authorship|
+            raise ActiveRecord::RecordInvalid if authorship.invalid?
+          end
+        end
       end
     end
   end

data/app/models/spina/admin/journal/authorship.rb

@@ -13,6 +13,12 @@ module Spina
         # @!attribute [rw] author_name
         #   @return [ActiveRecord::Relation] the associated affiliation of an author of the article
         belongs_to :affiliation
+        # @!attribute [rw] position
+        #   @return [Integer] used to order the affiliations for each article
+
+        validates :position, presence: true, uniqueness: { scope: :article_id }
+
+        scope :sorted_within_article, -> { order(position: :asc) }
       end
     end
   end

data/app/views/spina/admin/journal/affiliations/_affiliation.html.haml

@@ -1,4 +1,4 @@
-%tr
+%tr{ data: { id: affiliation.id } }
   %td= affiliation.name
   %td= affiliation.institution.name
   %td= affiliation.articles.count

data/app/views/spina/admin/journal/articles/_form_authors.html.haml

@@ -1,10 +1,15 @@
+.sort-message
 .table-container
   %table.table
     %thead
       %tr
+        %th= ::Spina::Admin::Journal::Affiliation.human_attribute_name :position
         %th= ::Spina::Admin::Journal::Affiliation.human_attribute_name :name
         %th= ::Spina::Admin::Journal::Affiliation.human_attribute_name :institution
         %th= t '.number_of_articles'
         %th
-    %tbody
-      = render @article.affiliations.any? ? @article.affiliations : 'empty_list', message: t('.no_authors')
+    %tbody.html5sortable{ data: { id: @article.id, sorted_collection: 'admin_journal_authorships', sort_url: !@article.id.nil? && sort_admin_journal_authors_url(@article) } }
+      - if @article.authorships.any?
+        = render @article.authorships.sorted_within_article
+      - else
+        = render 'empty_list', message: t('.no_authors')

data/app/views/spina/admin/journal/authorships/_authorship.html.haml

@@ -0,0 +1,9 @@
+%tr{ data: { id: authorship.id } }
+  %td.position-display= authorship.position
+  %td= authorship.affiliation.name
+  %td= authorship.affiliation.institution.name
+  %td= authorship.affiliation.articles.count
+  %td.nowrap.align-right
+    = link_to edit_admin_journal_author_path(authorship.affiliation.author.id), class: 'button button-link' do
+      = icon 'pencil-outline'
+      = t '.view'

data/config/locales/en.yml

@@ -100,6 +100,9 @@ en:
             saved: Author saved.
           destroy:
             deleted: Author deleted.
+          sort:
+            sort_success: Sorted successfully!
+            sort_error: There was an error when sorting. Check the server logs for more information.
           form:
             save: Save author
           form_details:
@@ -145,12 +148,15 @@ en:
       spina/admin/journal/article:
         one: Article
         other: Articles
+      spina/admin/journal/authorship:
+        one: Authorship
+        other: Authorships
+      spina/admin/journal/affiliation:
+        one: Affiliation
+        other: Affiliations
       spina/admin/journal/author:
         one: Author
         other: Authors
-      spina/admin/journal/author_name:
-        one: Author name
-        other: Author names
       spina/admin/journal/institution:
         one: Institution
         other: Institutions
@@ -169,8 +175,9 @@ en:
         title: Title
         url: URL
         doi: DOI
+      spina/admin/journal/authorship:
+        position: Position
       spina/admin/journal/author:
-      spina/admin/journal/author_name:
       spina/admin/journal/institution:
         name: Institution Name
 

data/config/routes.rb

@@ -13,9 +13,11 @@ Spina::Engine.routes.draw do
       resources :articles, except: %i[show] do
         patch 'sort/:issue_id' => 'articles#sort', as: :sort, on: :collection
       end
+      resources :authors, except: %i[show] do
+        patch 'sort/:article_id' => 'authors#sort', as: :sort, on: :collection
+      end
 
       resources :institutions, except: %i[show]
-      resources :authors, except: %i[show]
     end
   end
 end

data/db/migrate/20210512122931_add_position_to_spina_admin_journal_authorships.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPositionToSpinaAdminJournalAuthorships < ActiveRecord::Migration[6.1] # :nodoc:
+  def change
+    add_column :spina_admin_journal_authorships, :position, :integer, null: false, default: 0
+  end
+end

data/lib/spina/admin/journal/version.rb

@@ -3,7 +3,7 @@
 module Spina
   module Admin
     module Journal
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-journal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Louis Van Steene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -318,6 +318,7 @@ files:
 - app/views/spina/admin/journal/authors/edit.html.haml
 - app/views/spina/admin/journal/authors/index.html.haml
 - app/views/spina/admin/journal/authors/new.html.haml
+- app/views/spina/admin/journal/authorships/_authorship.html.haml
 - app/views/spina/admin/journal/institutions/_form.html.haml
 - app/views/spina/admin/journal/institutions/_form_details.html.haml
 - app/views/spina/admin/journal/institutions/_form_view_affiliations.html.haml
@@ -357,6 +358,7 @@ files:
 - db/migrate/20210424123450_add_json_attributes_to_spina_admin_journal_journals.rb
 - db/migrate/20210424123521_add_json_attributes_to_spina_admin_journal_issues.rb
 - db/migrate/20210424123555_add_json_attributes_to_spina_admin_journal_articles.rb
+- db/migrate/20210512122931_add_position_to_spina_admin_journal_authorships.rb
 - lib/spina/admin/journal.rb
 - lib/spina/admin/journal/engine.rb
 - lib/spina/admin/journal/version.rb