Merge pull request #6676 from CitizenLabDotCo/cleanup-craftjs-and-hom…

…epage-settings Clean up after the homepage builder work
CitizenLabDotCo · Jan 2, 2024 · efbeff5 · efbeff5
2 parents aa527ea + f48808b
commit efbeff5
Show file tree

Hide file tree

Showing 59 changed files with 262 additions and 1,601 deletions.
diff --git a/back/app/controllers/web_api/v1/avatars_controller.rb b/back/app/controllers/web_api/v1/avatars_controller.rb
@@ -33,7 +33,6 @@ def index
       authorize initiative, :show?
       avatars_service.avatars_for_initiative(initiative, users: users, limit: limit)
     when nil
-      users = User.none if !HomePage.first.banner_avatars_enabled && !AppConfiguration.instance.feature_activated?('homepage_builder') # TODO: clean up after migrating homepage craftjs
       avatars_service.some_avatars(users: users, limit: limit)
     end
 

diff --git a/back/app/controllers/web_api/v1/home_pages_controller.rb b/back/app/controllers/web_api/v1/home_pages_controller.rb
diff --git a/back/app/models/admin_publication.rb b/back/app/models/admin_publication.rb
@@ -53,7 +53,6 @@ class AdminPublication < ApplicationRecord
   PUBLICATION_STATUSES = %w[draft published archived]
 
   belongs_to :publication, polymorphic: true, touch: true
-  has_many :pins, inverse_of: :admin_publication, dependent: :destroy
 
   acts_as_nested_set dependent: :destroy, order_column: :ordering, counter_cache: :children_count
   acts_as_list column: :ordering, top_of_list: 0, scope: [:parent_id], add_new_at: :top

diff --git a/back/app/models/home_page.rb b/back/app/models/home_page.rb
diff --git a/back/app/models/pin.rb b/back/app/models/pin.rb
diff --git a/back/app/models/static_page.rb b/back/app/models/static_page.rb
@@ -38,8 +38,6 @@ class StaticPage < ApplicationRecord
   CODES = %w[about terms-and-conditions privacy-policy faq proposals custom].freeze
   enum projects_filter_type: { no_filter: 'no_filter', areas: 'areas', topics: 'topics' }
 
-  has_many :pins, as: :page, inverse_of: :page, dependent: :destroy
-  has_many :pinned_admin_publications, through: :pins, source: :admin_publication
   has_one :nav_bar_item, dependent: :destroy
   has_many :static_page_files, -> { order(:ordering) }, dependent: :destroy
   has_many :text_images, as: :imageable, dependent: :destroy

diff --git a/back/app/policies/home_page_policy.rb b/back/app/policies/home_page_policy.rb
diff --git a/back/app/policies/static_page_policy.rb b/back/app/policies/static_page_policy.rb
@@ -56,7 +56,6 @@ def permitted_attributes
       :bottom_info_section_enabled,
       { bottom_info_section_multiloc: CL2_SUPPORTED_LOCALES },
       :header_bg,
-      { pinned_admin_publication_ids: [] },
       { area_ids: [] },
       { topic_ids: [] },
       { nav_bar_item_title_multiloc: CL2_SUPPORTED_LOCALES }

diff --git a/back/app/serializers/web_api/v1/home_page_serializer.rb b/back/app/serializers/web_api/v1/home_page_serializer.rb
diff --git a/back/app/serializers/web_api/v1/static_page_serializer.rb b/back/app/serializers/web_api/v1/static_page_serializer.rb
@@ -53,8 +53,6 @@ class WebApi::V1::StaticPageSerializer < WebApi::V1::BaseSerializer
     current_navbaritem_title || NavBarItem.new(code: 'custom', static_page: object).title_multiloc_with_fallback
   end
 
-  has_many :pins, serializer: :base
-  has_many :pinned_admin_publications, serializer: :admin_publication
   has_one :nav_bar_item
   has_many :static_page_files, serializer: :file
   has_many :text_images, serializer: :image

diff --git a/back/app/services/project_copy_service.rb b/back/app/services/project_copy_service.rb
@@ -99,7 +99,6 @@ def yml_content_builder_layouts(shift_timestamps: 0)
         'content_buildable_type' => layout.content_buildable_type,
         'code' => layout.code,
         'enabled' => layout.enabled,
-        'craftjs_jsonmultiloc' => map_old_codes(layout.craftjs_jsonmultiloc, layout_images_mapping), # TODO: clean up after fully migrated
         'craftjs_json' => map_codes(layout.craftjs_json, layout_images_mapping),
         'created_at' => shift_timestamp(layout.created_at, shift_timestamps)&.iso8601,
         'updated_at' => shift_timestamp(layout.updated_at, shift_timestamps)&.iso8601
@@ -726,13 +725,6 @@ def shift_timestamp(value, shift_timestamps, leave_blank: @local_copy)
     value && (value + shift_timestamps.days)
   end
 
-  def map_old_codes(craftjs_jsonmultiloc, layout_images_mapping)
-    craftjs_jsonmultiloc.each_value do |craftjs_json|
-      map_codes craftjs_json, layout_images_mapping, ContentBuilder::OldLayoutImageService.new
-    end
-    craftjs_jsonmultiloc
-  end
-
   def map_codes(craftjs_json, layout_images_mapping, layout_service = ContentBuilder::LayoutImageService.new)
     layout_service.image_elements(craftjs_json).each do |props|
       new_image_code = ContentBuilder::LayoutImage.generate_code

diff --git a/back/app/services/side_fx_home_page_service.rb b/back/app/services/side_fx_home_page_service.rb
diff --git a/back/config/routes.rb b/back/config/routes.rb
@@ -233,8 +233,6 @@
         get :as_xlsx, on: :collection, action: 'index_xlsx'
       end
 
-      resource :home_page, only: %i[show update]
-
       resources :experiments, only: %i[index create]
 
       resources :handwritten_ideas, only: %i[create]