Add: published_on date for projects and default sort ordering by published_on date

sysadm · sysadm · commit 158f8dd19a50 · 2025-12-25T09:38:19.000+01:00
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
@@ -95,7 +95,7 @@ def set_technologies
     def project_params
       params.require(:project).permit(
         :collage, :collage_cache, :project_id, :screenshot_id, :row_position, :shortlink, :title, :description,
-        :row_tech_position, :project_technology_id, :keywords, :content, :livelink, :publish,
+        :row_tech_position, :project_technology_id, :keywords, :content, :livelink, :publish, :published_on,
         technology_ids: [],
         technologies_attributes: %i[id title technology_group_id],
         screenshots_attributes: %i[id file file_cache project_id position _destroy]
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -10,10 +10,13 @@ def index
   end
 
   def portfolio
-    @projects = Project.published.rank(:position).includes(:translations, :screenshots,
-                                                           { technologies_projects: :technology },
-                                                           { technologies: :translations },
-                                                           :technologies).page(params[:page]).per(10)
+    @projects = Project.published
+                       .includes(:translations, :screenshots,
+                                 { technologies_projects: :technology },
+                                 { technologies: :translations },
+                                 :technologies)
+                       .order(Arel.sql('COALESCE(projects.published_on, projects.created_at) DESC'))
+                       .page(params[:page]).per(10)
   end
 
   def team
diff --git a/app/views/admin/projects/_form.html.slim b/app/views/admin/projects/_form.html.slim
@@ -4,6 +4,7 @@
     = f.input :title, label: t('activerecord.project.title'), label_html: { class: 'label' }
     = f.input :content, label: t('activerecord.project.content'), label_html: { class: 'label' }, as: :ckeditor, input_html: { ckeditor: { toolbar: 'mini' } }
     p= f.input :livelink, as: :url, label: t('activerecord.project.livelink'), label_html: { class: 'label' }, placeholder: 'https://webgate.pro'
+    = f.input :published_on, as: :string, label: t('activerecord.project.published_on'), label_html: { class: 'label' }, input_html: { type: 'date' }
     .label= t(:publish)
     - @project.collage.to_s.empty? ? disabled = true : disabled = false
     = f.input :publish, label: t('activerecord.project.publish'), disabled: disabled
diff --git a/app/views/home/portfolio.html.slim b/app/views/home/portfolio.html.slim
@@ -16,10 +16,17 @@
               = link_to project.title, project.livelink, class: 'work_link', target: '_blank', rel: 'nofollow'
               - full_html = HtmlTranslationNormalizer.call(project.content.to_s)
               - full_id = "project_full_#{project.id}"
-              p.project-content-tooltip data-full-id="##{full_id}"
-                = truncate_plain_text(full_html, length: 270)
-              .project_full_content id=full_id
-                = full_html.html_safe
+              - plain_full = ActionView::Base.full_sanitizer.sanitize(full_html.to_s)
+              - plain_full = CGI.unescapeHTML(plain_full.to_s).tr("\u00A0", ' ').gsub('&nbsp;', ' ').gsub(/\s+/, ' ').strip
+              - show_full_tooltip = plain_full.length > 270
+              - truncated_plain = truncate(plain_full, length: 270, omission: '...')
+              - if show_full_tooltip
+                p.project-content-tooltip data-full-id="##{full_id}"
+                  = truncated_plain
+                .project_full_content id=full_id
+                  = full_html.html_safe
+              - else
+                p = truncated_plain
               .work_info
                 p
                   em = t(:used_technologies)
@@ -31,6 +38,9 @@
                         = link_to tech.title, tech_link(tech), data: { title: tech.title, desc: tech.description }, class: 'tooltipstered', rel: 'nofollow', target: '_blank'
                       - unless tech == project.technologies.last
                         |,&nbsp;
+                - if project.published_on
+                  p
+                    = "#{t(:year)} #{project.published_on.strftime('%Y')}"
       = paginate @projects
 
 javascript:
diff --git a/config/locales/carriervawe.en.yml b/config/locales/carriervawe.en.yml
@@ -10,4 +10,5 @@ en:
       mime_types_processing_error: "Failed to process file with MIME::Types, maybe not valid content-type? Original Error: %{e}"
       mini_magick_processing_error: "Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: %{e}"
       min_size_error: "File size should be greater than %{min_size}"
-      max_size_error: "File size should be less than %{max_size}"
+      max_size_error: "File size should be less than %{max_size}"
+  year: ""
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -42,6 +42,7 @@ de:
       content: Inhalt
       livelink: Live-Link
       publish: Veröffentlichen
+      published_on: Veröffentlichungsdatum
       title: Titel
     subcategory:
       altlink: Alternativlink
@@ -192,7 +193,7 @@ de:
   to_top: Nach oben
   use_our_form_or_call: per E-Mail, über das Kontaktformular auf der Website oder
     rufen Sie einfach an.
-  used_technologies: 'Verwendete Technologien:'
+  used_technologies: 'Technologien:'
   user: Benutzer
   users: Benutzer
   views:
@@ -234,3 +235,4 @@ de:
     technology_group: Technologiegruppe
     user: Benutzer
     users: Benutzer
+  year: "Jahr:"
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -43,6 +43,7 @@ en:
       content: Content
       livelink: Live link
       publish: Publish
+      published_on: Publication date
       title: Title
     subcategory:
       altlink: Altlink
@@ -229,3 +230,4 @@ en:
     technology_group: technology group
     user: user
     users: Users
+  year: "Year:"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -43,6 +43,7 @@ fr:
       content: Contenu
       livelink: Lien en direct
       publish: Publier
+      published_on: Date de publication
       title: Titre
     subcategory:
       altlink: Lien alternatif
@@ -165,7 +166,7 @@ fr:
   three_chars_minimum: Minimum 3 caractères
   to_top: en haut
   use_our_form_or_call: Vous pouvez utiliser l'email, notre formulaire de contact ou simplement appeler.
-  used_technologies: 'Technologies utilisées:'
+  used_technologies: 'Technologies:'
   user: Utilisateur
   users: Utilisateurs
   views:
@@ -208,3 +209,4 @@ fr:
     technology_group: groupe technologique
     user: utilisateur
     users: Utilisateurs
+  year: "Année:"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -42,6 +42,7 @@ pl:
       content: Treść
       livelink: Link na żywo
       publish: Publikować
+      published_on: Data publikacji
       title: Tytuł
     subcategory:
       altlink: Alternatywny link
@@ -231,3 +232,4 @@ pl:
     technology_group: grupa technologii
     user: użytkownik
     users: Użytkownicy
+  year: "Rok:"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -42,6 +42,7 @@ ru:
       content: Содержимое
       livelink: Ссылка на проект
       publish: Опубликован
+      published_on: Дата публикации
       title: Название
     subcategory:
       altlink: Альтернативный линк
@@ -185,7 +186,7 @@ ru:
   three_chars_minimum: Минимум 3 символа
   to_top: наверх
   use_our_form_or_call: с помощью электронной почты, контактной формы или просто позвоните.
-  used_technologies: 'Используемые технологии:'
+  used_technologies: 'Технологии:'
   user: Пользователь
   users: Пользователи
   views:
@@ -227,3 +228,4 @@ ru:
     technology_group: группа(у) технологий
     user: пользователь
     users: Пользователи
+  year: "Год:"
diff --git a/config/locales/ua.yml b/config/locales/ua.yml
@@ -42,6 +42,7 @@ ua:
       content: Зміст
       livelink: Посилання на проект
       publish: Опубліковано
+      published_on: Дата публікації
       title: Назва
     subcategory:
       altlink: Альтернативне посилання
@@ -185,7 +186,7 @@ ua:
   to_top: нагору
   use_our_form_or_call: за допомогою електронної пошти, контактної форми або просто
     зателефонуйте.
-  used_technologies: 'Використані технології:'
+  used_technologies: 'Технології:'
   user: Користувач
   users: Користувачі
   views:
@@ -228,3 +229,4 @@ ua:
     technology_group: група(у) технологій
     user: користувач
     users: Користувачі
+  year: "Рік:"
diff --git a/db/migrate/20251225000000_add_published_on_to_projects.rb b/db/migrate/20251225000000_add_published_on_to_projects.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddPublishedOnToProjects < ActiveRecord::Migration[7.0]
+  def change
+    add_column :projects, :published_on, :date
+    add_index :projects, :published_on
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_07_24_115304) do
+ActiveRecord::Schema[7.0].define(version: 2025_12_25_000000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -161,6 +161,8 @@
     t.boolean "publish", default: false
     t.integer "position"
     t.string "collage"
+    t.date "published_on"
+    t.index ["published_on"], name: "index_projects_on_published_on"
   end
 
   create_table "projects_technologies", id: false, force: :cascade do |t|
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
@@ -1,4 +1,8 @@
+require 'rails_helper'
+
 describe HomeController, type: :controller do
+  include ActiveSupport::Testing::TimeHelpers
+
   describe "GET 'index'" do
     it 'returns http success' do
       get :index
@@ -10,4 +14,44 @@
       expect(response).to render_template('index')
     end
   end
+
+  describe "GET 'portfolio'" do
+    it 'orders projects by published_on (fallback created_at) descending' do
+      collage = Rack::Test::UploadedFile.new(Rails.root.join('app/assets/images/body.jpg').to_s)
+
+      p3 = travel_to(Time.zone.parse('2024-01-01 10:00:00')) do
+        I18n.with_locale(:en) do
+          Project.create!(
+            title: 'P3', content: 'C3', livelink: 'http://test.webgate.pro', publish: true,
+            collage:
+          )
+        end
+      end
+
+      p2 = travel_to(Time.zone.parse('2025-12-24 10:00:00')) do
+        I18n.with_locale(:en) do
+          Project.create!(
+            title: 'P2', content: 'C2', livelink: 'http://test.webgate.pro', publish: true,
+            collage:
+          )
+        end
+      end
+
+      p1 = travel_to(Time.zone.parse('2025-12-20 10:00:00')) do
+        I18n.with_locale(:en) do
+          Project.create!(
+            title: 'P1', content: 'C1', livelink: 'http://test.webgate.pro', publish: true,
+            published_on: Date.new(2025, 12, 25),
+            collage:
+          )
+        end
+      end
+
+      I18n.locale = :en
+      get :portfolio, params: { locale: 'en' }
+
+      ids = assigns(:projects).map(&:id)
+      expect(ids).to eq([p1.id, p2.id, p3.id])
+    end
+  end
 end
