Jprusek/cells refactor/addresses/fields

app/assets/config/folio_manifest.js

@@ -12,5 +12,6 @@
 
 //= link folio/input/date_time/svg-sprite.svg
 //= link folio/input/date_time/input-background-ico.svg
+//= link folio_svg_sprite.svg
 
 //= link_tree ../images

app/assets/javascripts/folio/console/base.js

@@ -88,7 +88,7 @@
 //= require folio/console/ui/tabs_component
 //= require folio/console/ui/turbo_frame_with_loader_component
 
-//= require folio/console/addresses/fields/fields
+//= require folio/console/addresses/fields_component
 //= require folio/console/atoms/layout_switch/layout_switch
 //= require folio/console/atoms/locale_switch/locale_switch
 //= require folio/console/atoms/previews/error_component

app/assets/stylesheets/folio/console/atoms/previews/base.sass

@@ -77,7 +77,12 @@
         top: 15px
 
   .ui-sortable-helper
-    display: none !important
+    z-index: 9999 !important
+    opacity: 0.8
+    -webkit-transform: translate3d(0, 0, 0)
+    transform: translate3d(0, 0, 0)
+    -webkit-backface-visibility: hidden
+    backface-visibility: hidden
 
   &__locale
     position: relative

app/cells/folio/console/addresses/fields_cell.rb → app/components/folio/console/addresses/fields_component.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
-class Folio::Console::Addresses::FieldsCell < Folio::ConsoleCell
+class Folio::Console::Addresses::FieldsComponent < Folio::Console::ApplicationComponent
   include ActionView::Helpers::FormOptionsHelper
+  include Folio::Cell::HtmlSafeFieldsFor
+
+  attr_reader :model, :options
+
+  def initialize(model:, **options)
+    @model = model
+    @options = options
+  end
 
   def cols
     options[:cols] || [

app/cells/folio/console/addresses/show_for_model_cell.rb → app/components/folio/console/addresses/show_for_model_component.rb

@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
-class Folio::Console::Addresses::ShowForModelCell < Folio::ConsoleCell
+class Folio::Console::Addresses::ShowForModelComponent < Folio::Console::ApplicationComponent
   include ShowFor::Helper
 
+  attr_reader :model, :options
+
+  def initialize(model:, **options)
+    @model = model
+    @options = options
+  end
+
   def cols
     [
       [Folio::Address::Primary, model.primary_address],

app/lib/folio/cell/html_safe_fields_for.rb

@@ -9,7 +9,9 @@ def html_safe_fields_for(f, key, build: false, &block)
     end
 
     f.simple_fields_for key, obj do |subfields|
-      (yield subfields).html_safe
+      result = yield subfields
+      # In Cells, result is a String. In ViewComponents, it might be something else
+      result.respond_to?(:html_safe) ? result.html_safe : result
     end
   end
 end

app/views/folio/console/users/_form.slim

@@ -56,7 +56,7 @@
     - if ::Rails.application.config.folio_users_use_address
       .row
         .col-lg-8
-          == cell('folio/console/addresses/fields', f)
+          == render(Folio::Console::Addresses::FieldsComponent.new(model: f))
 
     - if File.exist?(Rails.root.join("app/views/folio/console/users/_additional_form_fields.slim"))
       = render partial: "folio/console/users/additional_form_fields",

app/views/folio/console/users/show.slim

@@ -8,6 +8,6 @@
 = render partial: "folio/console/users/show_middle"
 
 - if ::Rails.application.config.folio_users_use_address
-  == cell('folio/console/addresses/show_for_model', @user)
+  == render(Folio::Console::Addresses::ShowForModelComponent.new(model: @user))
 
 = render partial: "folio/console/users/show_bottom"

test/components/folio/console/addresses/fields_component_test.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Folio::Console::Addresses::FieldsComponentTest < Folio::Console::ComponentTest
+  def test_render
+    with_controller_class(Folio::Console::UsersController) do
+      user = create(:folio_user)
+
+      vc_test_controller.view_context.simple_form_for(user, url: "/") do |f|
+        render_inline(Folio::Console::Addresses::FieldsComponent.new(model: f))
+      end
+
+      assert_selector(".f-c-addresses-fields")
+    end
+  end
+end

test/cells/folio/console/addresses/show_for_model_cell_test.rb → test/components/folio/console/addresses/show_for_model_component_test.rb

@@ -2,19 +2,20 @@
 
 require "test_helper"
 
-class Folio::Console::Addresses::ShowForModelCellTest < Folio::Console::CellTest
+class Folio::Console::Addresses::ShowForModelComponentTest < Folio::Console::ComponentTest
   test "show" do
     user = create(:folio_user)
-    html = cell("folio/console/addresses/show_for_model", user).(:show)
-    assert html.has_css?(".f-c-addresses-show-for-model")
+    render_inline(Folio::Console::Addresses::ShowForModelComponent.new(model: user))
+    assert_selector(".f-c-addresses-show-for-model")
 
     user.create_primary_address!(name: "Mr. Ipsum",
                                  address_line_1: "Foo bar",
                                  address_line_2: "1",
                                  city: "Prague",
                                  zip: "111 11",
                                  country_code: "CZ")
-    html = cell("folio/console/addresses/show_for_model", user).(:show)
-    assert html.has_css?(".f-c-addresses-show-for-model")
+    render_inline(Folio::Console::Addresses::ShowForModelComponent.new(model: user))
+
+    assert_selector(".f-c-addresses-show-for-model")
   end
 end