Merge pull request #724 from noesya/clean/issue-710

Nettoyage de données (featured image, summary, journal)

app/controllers/admin/research/journals/volumes_controller.rb

@@ -58,7 +58,7 @@ class Admin::Research::Journals::VolumesController < Admin::Research::Journals::
   def volume_params
     params.require(:research_journal_volume)
           .permit(
-            :title, :slug, :number, :keywords, :published, :published_at, :meta_description, :text,
+            :title, :slug, :number, :keywords, :published, :published_at, :meta_description, :summary, :text,
             :featured_image, :featured_image_infos, :featured_image_delete, :featured_image_alt, :featured_image_credit
           )
           .merge(university_id: current_university.id)

app/controllers/admin/research/journals_controller.rb

@@ -53,7 +53,7 @@ class Admin::Research::JournalsController < Admin::Research::ApplicationControll
 
   def journal_params
     params.require(:research_journal)
-          .permit(:title, :meta_description, :issn, :access_token, :repository)
+          .permit(:title, :meta_description, :summary, :issn)
           .merge(university_id: current_university.id)
   end
 end

app/models/communication/website/category.rb

@@ -111,6 +111,13 @@ class Communication::Website::Category < ApplicationRecord
     (ancestors.map(&:slug) << slug).join('-')
   end
 
+  def best_featured_image_source(fallback: true)
+    return self if featured_image.attached?
+    best_source = parent&.best_featured_image_source(fallback: false)
+    best_source ||= self if fallback
+    best_source
+  end
+
   protected
 
   def last_ordered_element

app/models/communication/website/page.rb

@@ -116,10 +116,10 @@ class Communication::Website::Page < ApplicationRecord
     "#{title}"
   end
 
-  def best_featured_image
+  def best_featured_image_source(fallback: true)
     # we don't want to fallback on homepage featured_image
-    return featured_image if featured_image.attached? || is_home? || parent&.is_home?
-    parent&.best_featured_image
+    return self if featured_image.attached? || is_home? || parent&.is_home?
+    parent&.best_featured_image_source
   end
 
   def best_bodyclass

app/models/concerns/with_featured_image.rb

@@ -8,8 +8,20 @@ module WithFeaturedImage
   end
 
   # Can be overwrite to get featured_image from associated objects (ex: parents)
-  def best_featured_image(fallback: true)
-    featured_image
+  def best_featured_image_source(fallback: true)
+    self
+  end
+
+  def best_featured_image
+    best_featured_image_source.featured_image
+  end
+
+  def best_featured_image_alt
+    best_featured_image_source.featured_image_alt
+  end
+
+  def best_featured_image_credit
+    best_featured_image_source.featured_image_credit
   end
 
   def add_unsplash_image(id)

app/models/education/program.rb

@@ -126,11 +126,11 @@ class Education::Program < ApplicationRecord
     "#{name}"
   end
 
-  def best_featured_image(fallback: true)
-    return featured_image if featured_image.attached?
-    best_image = parent&.best_featured_image(fallback: false)
-    best_image ||= featured_image if fallback
-    best_image
+  def best_featured_image_source(fallback: true)
+    return self if featured_image.attached?
+    best_source = parent&.best_featured_image_source(fallback: false)
+    best_source ||= self if fallback
+    best_source
   end
 
   def git_path(website)

app/models/research/journal.rb

@@ -3,10 +3,9 @@
 # Table name: research_journals
 #
 #  id               :uuid             not null, primary key
-#  access_token     :string
 #  issn             :string
 #  meta_description :text
-#  repository       :string
+#  summary          :text
 #  title            :string
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null

app/models/research/journal/volume.rb

@@ -11,6 +11,7 @@
 #  published             :boolean          default(FALSE)
 #  published_at          :datetime
 #  slug                  :string
+#  summary               :text
 #  text                  :text
 #  title                 :string
 #  created_at            :datetime         not null

app/views/admin/application/featured_image/_show.html.erb

-<% if about.featured_image.attached? %>
+<% if about.best_featured_image.attached? %>
   <div class="card flex-fill w-100">
     <div class="card-header">
       <h2 class="card-title mb-0 h5">
         <%= about.class.human_attribute_name :featured_image %>
+        <% unless about.featured_image.attached? %>
+          (<%= t('admin.inheritance.sentence_without_link').downcase %>)
+        <% end %>
       </h2>
     </div>
     <div class="card-body">
-      <% image = about.featured_image.variable? ? about.featured_image.variant(resize: '600')
-                                                : about.featured_image %>
+      <% image = about.best_featured_image.variable?  ? about.best_featured_image.variant(resize: '600')
+                                                      : about.best_featured_image %>
       <%= image_tag image, class: 'img-fluid mb-2' %>
-      <% if about.featured_image_credit %>
+      <% if about.best_featured_image_alt %>
         <p class="mb-0">
-          <%= about.featured_image_alt %>
+          <%= about.best_featured_image_alt %>
         </p>
       <% end %>
-      <% if about.featured_image_credit %>
-        <p class="small mb-0">
-          <%= about.featured_image_credit.html_safe %>
-        </p>
+      <% if about.best_featured_image_credit %>
+        <div class="small mb-0">
+          <%= sanitize about.best_featured_image_credit %>
+        </div>
       <% end %>
     </div>
   </div>

app/views/admin/application/featured_image/_static.html.erb

+<%
+best_featured_image = @about.best_featured_image
+if best_featured_image&.attached?
+%>
+image:
+  id: "<%= best_featured_image.blob.id %>"
+  alt: "<%= @about.best_featured_image_alt %>"
+  credit: >
+    <%= prepare_html_for_static @about.best_featured_image_credit, @about.university %>
+<% end %>

app/views/admin/communication/unsplash/_static.html.erb

-<%
-featured_image = @about&.best_featured_image || @about.featured_image
-if featured_image.attached?
-%>
-image:
-  id: "<%= featured_image.blob.id %>"
-  alt: "<%= @about.featured_image_alt %>"
-  credit: >
-    <%= prepare_html_for_static @about.featured_image_credit, @about.university %>
-<% end %>

app/views/admin/communication/websites/categories/static.html.erb

@@ -12,7 +12,7 @@ children:
 <% end %>
 <% end %>
 position: <%= @about.position %>
-<%= render 'admin/communication/unsplash/static' %>
+<%= render 'admin/application/featured_image/static' %>
 <%= render 'admin/application/meta_description/static' %>
 <%= render 'admin/application/summary/static' %>
 <%= render 'admin/communication/blocks/static', about: @about %>

app/views/admin/communication/websites/pages/static.html.erb

@@ -13,7 +13,7 @@ has:
 <% end %>
 position: <%= @about.position %>
 bodyclass: <%= @about.best_bodyclass %>
-<%= render 'admin/communication/unsplash/static' %>
+<%= render 'admin/application/featured_image/static' %>
 <% if @about.children.published.any? %>
 children:
 <% @about.children.published.ordered.each do |child| %>

app/views/admin/communication/websites/posts/static.html.erb

@@ -16,7 +16,7 @@ categories:
   - "<%= category.slug_with_ancestors_slugs %>"
   <% end %>
 <% end %>
-<%= render 'admin/communication/unsplash/static' %>
+<%= render 'admin/application/featured_image/static' %>
 <%= render 'admin/application/meta_description/static' %>
 <%= render 'admin/application/summary/static' %>
 <%= render 'admin/communication/blocks/static', about: @about %>

app/views/admin/education/programs/static.html.erb

@@ -27,7 +27,7 @@ parent:
     <%= @about.parent.name %>
   url: <%= @about.parent.current_permalink_in_website(@website)&.path %>
 <% end %>
-<%= render 'admin/communication/unsplash/static' %>
+<%= render 'admin/application/featured_image/static' %>
 related_category: "<%= @website.categories.find_by(program_id: @about.id)&.slug_with_ancestors_slugs %>"
 diplomas: "<%= @about.diploma&.slug %>"
 teachers:

app/views/admin/research/journals/_form.html.erb

@@ -7,6 +7,7 @@
       <div class="card flex-fill w-100">
         <div class="card-body">
           <%= f.input :title %>
+          <%= render 'admin/application/summary/form', f: f, about: journal %>
           <%= f.input :issn %>
         </div>
       </div>

app/views/admin/research/journals/show.html.erb

@@ -11,6 +11,7 @@
   <% if @journal.issn %><%= Research::Journal.human_attribute_name('issn') %> <%= @journal.issn %><% end %>
 <% end %>
 
+<%= render 'admin/application/summary/show', about: @journal %>
 <div class="card mt-5">
   <div class="card-header">
     <div class="float-end">

app/views/admin/research/journals/static.html.erb

@@ -4,4 +4,5 @@ title: >
 issn: >
   <%= @about.issn %>
 <%= render 'admin/application/meta_description/static' %>
+<%= render 'admin/application/summary/static' %>
 ---

app/views/admin/research/journals/volumes/_form.html.erb

@@ -10,6 +10,7 @@
         </div>
         <div class="card-body">
           <%= f.input :title %>
+          <%= render 'admin/application/summary/form', f: f, about: volume %>
           <%= f.input :text, as: :summernote %>
         </div>
       </div>

app/views/admin/research/journals/volumes/show.html.erb

@@ -2,6 +2,7 @@
 
 <div class="row">
   <div class="col-md-9">
+    <%= render 'admin/application/summary/show', about: @volume %>
     <div class="card flex-fill w-100">
       <div class="card-header">
         <h2 class="card-title mb-0 h5"><%= t('content') %></h2>