Merge pull request #702 from noesya/refactor_menus

Refactor menus

Author: pabois

app/models/communication/website/menu/item.rb

@@ -36,7 +36,6 @@ class Communication::Website::Menu::Item < ApplicationRecord
   include Sanitizable
   include WithTree
   include WithPosition
-  include WithTargets
 
   attr_accessor :skip_publication_callback
 
@@ -53,22 +52,11 @@ class Communication::Website::Menu::Item < ApplicationRecord
     blank: 0,
     url: 10,
     page: 20,
-    programs: 30,
     program: 31,
-    diplomas: 32,
     diploma: 33,
-    posts: 40,
     category: 41,
     post: 42,
-    organizations: 45,
-    persons: 50,
-    administrators: 51,
-    authors: 52,
-    researchers: 53,
-    teachers: 54,
-    volumes: 60,
     volume: 61,
-    papers: 62,
     paper: 63
   }, _prefix: :kind
 
@@ -79,25 +67,14 @@ class Communication::Website::Menu::Item < ApplicationRecord
 
   def self.icon_for(kind)
     icons = {
-      'administrators' => Icon::UNIVERSITY_PERSON_ADMINISTRATORS,
-      'authors' => Icon::UNIVERSITY_PERSON,
       'blank' => 'font',
       'diploma' => Icon::EDUCATION_DIPLOMA,
-      'diplomas' => Icon::EDUCATION_DIPLOMA,
-      'posts' => Icon::COMMUNICATION_WEBSITE_POST,
       'post' => Icon::COMMUNICATION_WEBSITE_POST,
       'category' => Icon::COMMUNICATION_WEBSITE_POST,
       'page' => Icon::COMMUNICATION_WEBSITE_PAGE,
       'program' => Icon::EDUCATION_PROGRAM,
-      'programs' => Icon::EDUCATION_PROGRAM,
       'paper' => Icon::RESEARCH_LABORATORY,
-      'papers' => Icon::RESEARCH_LABORATORY,
-      'volumes' => Icon::RESEARCH_LABORATORY,
       'volume' => Icon::RESEARCH_LABORATORY,
-      'researchers' => Icon::RESEARCH_RESEARCHER,
-      'organizations' => Icon::UNIVERSITY_ORGANIZATION,
-      'persons' => Icon::UNIVERSITY_PERSON,
-      'teachers' => Icon::EDUCATION_TEACHER,
       'url' => 'globe',
     }
     "fas fa-#{icons[kind]}" if icons.has_key? kind
@@ -108,17 +85,17 @@ def to_s
   end
 
   def static_target
-    target = nil
-    active = website.send "menu_item_kind_#{kind}?"
-    return nil unless active
-    # Les méthodes target_for_ sont définies dans le concern WithTarget
-    method = "target_for_#{kind}"
-    # Le true sert à examiner les méthodes protected
-    target = respond_to?(method, true)  ? send(method)
-                                        : about&.path
-    return nil if target.nil?
-    target.end_with?('/') ? target
-                          : "#{target}/"
+    test_kind_method = "menu_item_kind_#{kind}?"
+    return nil if website.respond_to?(test_kind_method) && !website.public_send(test_kind_method)
+
+    case kind
+    when "blank"
+      ''
+    when "url"
+      url
+    else
+      about.new_permalink_in_website(website).computed_path
+    end
   end
 
   def list_of_other_items

app/models/communication/website/menu/item/with_targets.rb

@@ -12,23 +12,11 @@ module Communication::Website::WithMenus
 
   def menu_item_kinds
     Communication::Website::Menu::Item.kinds.reject do |key, value|
-      active = send "menu_item_kind_#{key}?"
-      !active
+      method_name = "menu_item_kind_#{key}?"
+      respond_to?(method_name) && !public_send(method_name)
     end
   end
 
-  def menu_item_kind_blank?
-    true
-  end
-
-  def menu_item_kind_url?
-    true
-  end
-
-  def menu_item_kind_page?
-    pages.any?
-  end
-
   def menu_item_kind_programs?
     has_education_programs?
   end
@@ -45,37 +33,10 @@ def menu_item_kind_diplomas?
     has_education_diplomas?
   end
 
-  def menu_item_kind_posts?
-    has_communication_posts?
-  end
-
-  def menu_item_kind_category?
-    has_communication_categories?
-  end
-
-  def menu_item_kind_post?
-    has_communication_posts?
-  end
-
-  def menu_item_kind_organizations?
-    # TODO: has_organization takes a looong time when having a lot of blocks.
-    # when we have a direct relation between website & organizations re-adjust this test.
-    # has_organizations?
-    true
-  end
-
-  def menu_item_kind_persons?
-    has_persons?
-  end
-
   def menu_item_kind_administrators?
     has_administrators?
   end
 
-  def menu_item_kind_authors?
-    has_authors?
-  end
-
   def menu_item_kind_researchers?
     has_researchers?
   end

app/models/communication/website/with_menus.rb

@@ -0,0 +1,24 @@
+class SetAboutFromMenuItemKind < ActiveRecord::Migration[7.0]
+  def change
+    mapping = {
+      '30' => Communication::Website::Page::EducationProgram,
+      '32' => Communication::Website::Page::EducationDiploma,
+      '40' => Communication::Website::Page::CommunicationPost,
+      '45' => Communication::Website::Page::Organization,
+      '50' => Communication::Website::Page::Person,
+      '51' => Communication::Website::Page::Administrator,
+      '52' => Communication::Website::Page::Author,
+      '53' => Communication::Website::Page::Researcher,
+      '54' => Communication::Website::Page::Teacher,
+      '60' => Communication::Website::Page::ResearchVolume,
+      '62' => Communication::Website::Page::ResearchPaper
+    }
+
+    kinds = mapping.keys.map(&:to_i)
+    Communication::Website::Menu::Item.includes(:website).where(kind: kinds).find_each do |menu_item|
+      page_class = mapping[menu_item.kind_before_type_cast.to_s]
+      about = menu_item.website.special_page(page_class)
+      menu_item.update(about: about, kind: :page)
+    end
+  end
+end