feat: Adding summary to Publications

Vizzuality · Oct 23, 2023 · 99948cd · 99948cd
1 parent acc8cf1
commit 99948cd
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/app/admin/publication.rb b/app/admin/publication.rb
@@ -7,7 +7,7 @@
   decorate_with PublicationDecorator
 
   permit_params :title, :author, :author_image, :short_description, :publication_date,
-                :file, :image, :created_by_id, :updated_by_id,
+                :file, :image, :created_by_id, :updated_by_id, :summary,
                 :keywords_string, tpi_sector_ids: []
 
   filter :title
@@ -20,6 +20,7 @@
         attributes_table do
           row :title
           row :short_description
+          row :summary
           row :author
           row :author_image do |p|
             if p.author_image.present?
@@ -63,6 +64,7 @@
       f.input :author
       f.input :author_image, as: :file, hint: preview_file_tag(f.object.author_image), input_html: {accept: 'image/*'}
       f.input :short_description, as: :text
+      f.input :summary, as: :trix, embed_youtube: true
       f.input :publication_date, as: :date_time_picker
       f.input :tpi_sector_ids, label: 'Sectors', as: :select,
                                collection: TPISector.order(:name), input_html: {multiple: true}

diff --git a/app/views/tpi/publications/_list.html.erb b/app/views/tpi/publications/_list.html.erb
@@ -8,7 +8,11 @@
       <div class="content__title-wrapper">
         <div class="content__title">
           <% if publication.is_a?(Publication) %>
-            <%= link_to publication.title, tpi_publication_path(id: publication.slug), class: 'link is-strong' %>
+            <% if publication.summary.present? %>
+              <%= link_to publication.title, tpi_publication_path(id: publication.slug), class: 'link is-strong' %>
+            <% else %>
+              <%= link_to publication.title, tpi_publication_download_file_path(slug: publication.slug), target: '_blank', class: 'link is-strong' %>
+            <% end %>
           <% else %>
             <%= link_to publication.title, show_news_article_tpi_publication_path(id: publication.id), class: "link is-strong" %>
           <% end %>

diff --git a/app/views/tpi/publications/show.html.erb b/app/views/tpi/publications/show.html.erb
@@ -20,6 +20,9 @@
               <% end %>
             </div>
           <% end %>
+          <div class="pages__description">
+            <%= @publication.summary&.html_safe %>
+          </div>
 
           <%= link_to 'Download file', tpi_publication_download_file_path(slug: @publication.slug), target: '_blank', class: 'button is-primary' %>
         </div>

diff --git a/db/migrate/20231023120255_add_summary_to_publications.rb b/db/migrate/20231023120255_add_summary_to_publications.rb
@@ -0,0 +1,5 @@
+class AddSummaryToPublications < ActiveRecord::Migration[6.1]
+  def change
+    add_column :publications, :summary, :text
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
@@ -1634,7 +1634,8 @@ CREATE TABLE public.publications (
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
     author character varying,
-    slug text NOT NULL
+    slug text NOT NULL,
+    summary text
 );
 
 
@@ -4160,6 +4161,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20230920083300'),
 ('20230926075145'),
 ('20230927112905'),
-('20231023101859');
+('20231023101859'),
+('20231023120255');
 
 
diff --git a/db/test-dump.psql b/db/test-dump.psql
diff --git a/spec/controllers/admin/publications_controller_spec.rb b/spec/controllers/admin/publications_controller_spec.rb
@@ -36,7 +36,8 @@
         attributes_for(
           :publication,
           title: 'My amazing title',
-          short_description: 'Test short_description'
+          short_description: 'Test short_description',
+          summary: 'Test summary'
         )
       end
 
@@ -48,6 +49,7 @@
         last_publication_created.tap do |g|
           expect(g.title).to eq(valid_params[:title])
           expect(g.short_description).to eq(valid_params[:short_description])
+          expect(g.summary).to eq(valid_params[:summary])
         end
       end
 

diff --git a/spec/factories/publications.rb b/spec/factories/publications.rb
@@ -22,9 +22,9 @@
     title { 'MyString' }
     author { 'Author' }
     short_description { 'MyText' }
+    summary { 'MyText' }
     publication_date { '2019-12-02' }
     file { fixture_file_upload(Rails.root.join('spec', 'support', 'fixtures', 'files', 'test.pdf'), 'pdf') }
-    is_insight { false }
 
     trait :published do
       publication_date { 20.days.ago }