feat: Enhancing further separate publication page

app/admin/news_article.rb

@@ -6,7 +6,7 @@
 
   decorate_with NewsArticleDecorator
 
-  permit_params :title, :content, :publication_date,
+  permit_params :title, :content, :publication_date, :is_insight,
                 :created_by_id, :updated_by_id,
                 :image, :keywords_string, tpi_sector_ids: []
 
@@ -30,6 +30,7 @@
           row :image do |t|
             image_tag(url_for(t.image)) if t.image.present?
           end
+          row :is_insight
           row :updated_at
           row :updated_by
           row :created_at
@@ -43,6 +44,7 @@
   index do
     column 'Title', :title_link
     column :publication_date
+    column :is_insight
 
     actions
   end
@@ -54,6 +56,7 @@
     column(:sectors) { |l| l.tpi_sectors.map(&:name).join(Rails.application.config.csv_options[:entity_sep]) }
     column :keywords, &:keywords_csv
     column :publication_date
+    column :is_insight
   end
 
   form html: {'data-controller' => 'check-modified'} do |f|
@@ -67,6 +70,7 @@
                                collection: TPISector.order(:name), input_html: {multiple: true}
       f.input :keywords_string, label: 'Keywords', hint: t('hint.tag'), as: :tags, collection: Keyword.pluck(:name)
       f.input :image, as: :file, input_html: {accept: 'image/*'}
+      f.input :is_insight
     end
 
     f.actions

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}

app/assets/stylesheets/tpi/_publications.scss

@@ -257,6 +257,16 @@ $max-lines: 3;
       margin-bottom: 22px;
     }
   }
+
+  &__content-type {
+    color: $grey-dark;
+    margin-top: 10px;
+    font-size: $size-7;
+    border: 1px solid rgba($grey-dark, 0.5);
+    padding-left: $size-7;
+    padding-right: $size-7;
+    display: inline-block;
+  }
 }
 
 .publications__grid {

app/models/bank_assessment_indicator.rb

@@ -9,6 +9,7 @@
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  comment        :text
+#  is_placeholder :boolean          default(FALSE)
 #
 class BankAssessmentIndicator < ApplicationRecord
   INDICATOR_TYPES = %w[area sub_area indicator sub_indicator].freeze

app/models/news_article.rb

@@ -10,6 +10,7 @@
 #  updated_by_id    :bigint
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
+#  is_insight       :boolean          default(FALSE)
 #
 
 class NewsArticle < ApplicationRecord
@@ -23,6 +24,8 @@ class NewsArticle < ApplicationRecord
   has_and_belongs_to_many :tpi_sectors
 
   scope :published, -> { where('publication_date <= ?', DateTime.now) }
+  scope :insights, -> { where(is_insight: true) }
+  scope :not_insights, -> { where(is_insight: false) }
 
   validates_presence_of :title, :content, :publication_date
 

app/models/publication.rb

@@ -14,6 +14,7 @@
 #  updated_at        :datetime         not null
 #  author            :string
 #  slug              :text             not null
+#  summary           :text
 #
 
 class Publication < ApplicationRecord

app/services/queries/tpi/news_publications_query.rb

@@ -7,7 +7,7 @@ class NewsPublicationsQuery
       attr_accessor :tags, :sectors, :types
 
       def call
-        (publications + news).uniq.sort_by(&:publication_date).reverse!
+        (publications + news + insights).uniq.sort_by(&:publication_date).reverse!
       end
 
       private
@@ -21,7 +21,13 @@ def publications
       def news
         return NewsArticle.none if types.present? && !types.include?('News')
 
-        filter_scope(NewsArticle.published)
+        filter_scope(NewsArticle.published.not_insights)
+      end
+
+      def insights
+        return NewsArticle.none if types.present? && !types.include?('Insights')
+
+        filter_scope(NewsArticle.published.insights)
       end
 
       def filter_scope(scope)

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 %>
@@ -25,6 +29,13 @@
           <% end %>
         </p>
       </div>
+      <div class="publication__content-type">
+        <% if publication.is_a?(NewsArticle) %>
+          <%= publication.is_insight? ? 'Insights' : 'News' %>
+        <% else %>
+          Publications
+        <% end %>
+      </div>
       <% if publication.keywords.any? || publication.tpi_sectors.any? %>
         <div class="publication__tags">
           <% publication.tags_and_sectors.each do |tag| %>

app/views/tpi/publications/index.html.erb

@@ -8,7 +8,7 @@
     </button>
   </div>
   <%= react_component("Filters", {
-    types: %w[Publications News],
+    types: %w[Publications News Insights],
     tags: @tags,
     sectors: @sectors,
     resultsSize: @publications_and_articles_count

app/views/tpi/publications/show.html.erb

@@ -9,7 +9,7 @@
 
       <div class="pages__content__flex">
         <% if @publication.image.present? %>
-          <div class="pages__image"><%= image_tag(@publication.image) %></div>
+          <div class="pages__image" style="margin-bottom: 0;"><%= image_tag(@publication.image) %></div>
         <% end %>
         <div class="pages__description">
           <p><%= @publication.short_description %></p>
@@ -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>

db/migrate/20231023101859_add_is_insight_to_news_articles.rb

@@ -0,0 +1,5 @@
+class AddIsInsightToNewsArticles < ActiveRecord::Migration[6.1]
+  def change
+    add_column :news_articles, :is_insight, :boolean, default: false
+  end
+end

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

db/structure.sql

@@ -1548,7 +1548,8 @@ CREATE TABLE public.news_articles (
     created_by_id bigint,
     updated_by_id bigint,
     created_at timestamp(6) without time zone NOT NULL,
-    updated_at timestamp(6) without time zone NOT NULL
+    updated_at timestamp(6) without time zone NOT NULL,
+    is_insight boolean DEFAULT false
 );
 
 
@@ -1633,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
 );
 
 
@@ -4158,6 +4160,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20230915064402'),
 ('20230920083300'),
 ('20230926075145'),
-('20230927112905');
+('20230927112905'),
+('20231023101859'),
+('20231023120255');
 
 

spec/controllers/admin/news_articles_controller_spec.rb

@@ -36,7 +36,8 @@
         attributes_for(
           :news_article,
           title: 'My amazing title',
-          content: 'Test Content'
+          content: 'Test Content',
+          is_insight: true
         )
       end
 
@@ -48,6 +49,7 @@
         last_news_article_created.tap do |g|
           expect(g.title).to eq(valid_params[:title])
           expect(g.content).to eq(valid_params[:content])
+          expect(g.is_insight).to be_truthy
         end
       end
 

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
 

spec/factories/bank_assessment_indicators.rb

@@ -9,6 +9,7 @@
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  comment        :text
+#  is_placeholder :boolean          default(FALSE)
 #
 FactoryBot.define do
   factory :bank_assessment_indicator, class: BankAssessmentIndicator do

spec/factories/news_articles.rb

@@ -10,6 +10,7 @@
 #  updated_by_id    :bigint
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
+#  is_insight       :boolean          default(FALSE)
 #
 
 FactoryBot.define do
@@ -19,6 +20,7 @@
     tpi_sectors { |a| [a.association(:tpi_sector)] }
     publication_date { '2019-11-29' }
     image { fixture_file_upload(Rails.root.join('spec', 'support', 'fixtures', 'files', 'test.jpg'), 'jpg') }
+    is_insight { false }
 
     association :created_by, factory: :admin_user
     updated_by { created_by }

spec/factories/publications.rb

@@ -14,6 +14,7 @@
 #  updated_at        :datetime         not null
 #  author            :string
 #  slug              :text             not null
+#  summary           :text
 #
 
 FactoryBot.define do
@@ -23,6 +24,7 @@
     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') }
 

spec/models/bank_assessment_indicator_spec.rb

@@ -9,6 +9,7 @@
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  comment        :text
+#  is_placeholder :boolean          default(FALSE)
 #
 require 'rails_helper'
 

spec/models/news_article_spec.rb

@@ -10,6 +10,7 @@
 #  updated_by_id    :bigint
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
+#  is_insight       :boolean          default(FALSE)
 #
 
 require 'rails_helper'

spec/models/publication_spec.rb

@@ -14,6 +14,7 @@
 #  updated_at        :datetime         not null
 #  author            :string
 #  slug              :text             not null
+#  summary           :text
 #
 
 require 'rails_helper'