yummy-guide-generic-administrate 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b8c25b868ffa217ed45c64c2c0b53aa46bdb9d60094c022d9979cdd7a4e013
-  data.tar.gz: 4889ad38b64d46b34ce69f7e5cb4819c53d71a9c13636096dc94a5721e94fa87
+  metadata.gz: a6e8b69f0347b22f47b72cf96c4f99c0c398d58a8f118809735f7bafaee65e20
+  data.tar.gz: 37decc40a9672713935cd76fdea50ff20992e6e35298a8096c1ab7625209060b
 SHA512:
-  metadata.gz: e85e0d5ef1a103b6f72b9544dabc6ec02118bd4c845c2dabffaa47e4b4d66de21cf227277e196ee70c4285aa76721766d9c8a465665c233e7e22a68ba32d9b2a
-  data.tar.gz: 508817a41590cac77f1b1f3ecfbb676784ee6e5655dd1336f2e0216c5700100c9c66f6a36c56830c4f8ee611a0ae117cf2a6ee220b82eb5b77913af54d50e708
+  metadata.gz: b3d6976869de3d91b3affb029c77195053e541513f5f8ebbe4279543dfea132cf2536ec0880d555e2112ea63178ac61140eea4bf43fb3b365f58951e9335aae9
+  data.tar.gz: 81db24d807a65056e6b9ce35c5f5240d30c370b11def34fb2ae6664c7404e850458cd9a6119de8602faf259fcbfe0d42872da16373a0154cdc81c28b0c5da496

data/app/helpers/yummy_guide/administrate/filter_controls_helper.rb

@@ -18,7 +18,9 @@ module YummyGuide
         button_label: "Filter",
         title: "Filter Options",
         submit_label: "Filter",
-        close_label: "Close"
+        close_label: "Close",
+        modal_mount: :inline,
+        modal_content_for: :admin_filter_modals
       )
         dashboard ||= admin_filter_dashboard_from_page(page)
         scope = form.to_s
@@ -47,28 +49,32 @@ module YummyGuide
           form_scope: scope
         )
 
+        form_markup = admin_filter_form(
+          fields: fields,
+          scope: scope,
+          path: path,
+          clear_path: clear_path,
+          method: method,
+          current_values: current_values,
+          hidden_fields: hidden_fields,
+          root_hidden_fields: root_hidden_fields,
+          locals: locals,
+          extra_actions: extra_actions,
+          title: title,
+          submit_label: submit_label,
+          close_label: close_label
+        )
+
+        if admin_filter_body_modal_mount?(modal_mount)
+          modal_id = admin_filter_next_modal_id
+          content_for(modal_content_for, admin_filter_modal_root(modal_id: modal_id, form_markup: form_markup))
+
+          return admin_filter_button_container(button_label: button_label, modal_id: modal_id)
+        end
+
         safe_join([
           content_tag(:div, "", class: "modal_overlay"),
-          content_tag(:div, id: "reserv-filter-options") do
-            safe_join([
-              link_to(button_label, "javascript:void(0)", class: "button"),
-              admin_filter_form(
-                fields: fields,
-                scope: scope,
-                path: path,
-                clear_path: clear_path,
-                method: method,
-                current_values: current_values,
-                hidden_fields: hidden_fields,
-                root_hidden_fields: root_hidden_fields,
-                locals: locals,
-                extra_actions: extra_actions,
-                title: title,
-                submit_label: submit_label,
-                close_label: close_label
-              )
-            ])
-          end
+          admin_filter_button_container(button_label: button_label, form_markup: form_markup)
         ])
       end
 
@@ -138,6 +144,37 @@ module YummyGuide
         end
       end
 
+      def admin_filter_button_container(button_label:, form_markup: nil, modal_id: nil)
+        data = { admin_filter_controls: true }
+        data[:admin_filter_modal_id] = modal_id if modal_id
+
+        content_tag(:div, id: "reserv-filter-options", data: data) do
+          safe_join([
+            link_to(button_label, "javascript:void(0)", class: "button"),
+            form_markup
+          ].compact)
+        end
+      end
+
+      def admin_filter_modal_root(modal_id:, form_markup:)
+        content_tag(:div, id: modal_id, class: "admin-filter-modal-root", data: { admin_filter_modal_root: true }) do
+          safe_join([
+            content_tag(:div, "", class: "modal_overlay"),
+            form_markup
+          ])
+        end
+      end
+
+      def admin_filter_body_modal_mount?(modal_mount)
+        modal_mount.to_s == "body"
+      end
+
+      def admin_filter_next_modal_id
+        @admin_filter_controls_modal_index ||= 0
+        @admin_filter_controls_modal_index += 1
+        "admin-filter-modal-#{@admin_filter_controls_modal_index}"
+      end
+
       def admin_filter_form_header(title:, close_label:)
         content_tag(:div, class: "filter-form__header") do
           safe_join([

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.8.2"
+    VERSION = "0.8.3"
   end
 end

data/spec/yummy_guide/administrate/filter_controls_helper_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
   subject(:helper_host) do
     Class.new do
       include ActionView::Context
+      include ActionView::Helpers::CaptureHelper
       include ActionView::Helpers::FormHelper
       include ActionView::Helpers::FormOptionsHelper
       include ActionView::Helpers::FormTagHelper
@@ -14,6 +15,10 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::UrlHelper
       include YummyGuide::Administrate::FilterControlsHelper
+
+      def initialize
+        @view_flow = ActionView::OutputFlow.new
+      end
     end.new
   end
 
@@ -53,6 +58,34 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
       expect(document.at_css('select[name="search_options[status]"] option[selected]')["value"]).to eq("closed")
     end
 
+    # body mount指定時はフォームをcontent_forへ逃がし、ヘッダー側には起動ボタンだけを残すことを確認する
+    it "renders body-mounted modal markup into content_for" do
+      dashboard = Class.new
+      dashboard.const_set(
+        :FILTER_ATTRIBUTES,
+        {
+          keyword: YummyGuide::Administrate::Filters::Text.with_options(label: "Keyword")
+        }.freeze
+      )
+
+      html = helper_host.admin_filter_controls(
+        dashboard: dashboard,
+        path: "/admin/resources",
+        search_options: { keyword: "tokyo" },
+        modal_mount: :body
+      )
+      controls = fragment(html)
+      modals = fragment(helper_host.content_for(:admin_filter_modals))
+      modal_id = controls.at_css("#reserv-filter-options")["data-admin-filter-modal-id"]
+
+      expect(controls.at_css("#reserv-filter-options > a.button").text).to eq("Filter")
+      expect(controls.at_css("#reserv-filter-options > form")).to be_nil
+      expect(modal_id).to eq("admin-filter-modal-1")
+      expect(modals.at_css("##{modal_id}.admin-filter-modal-root > .modal_overlay")).to be_present
+      expect(modals.at_css("##{modal_id} > form.filter-form")["action"]).to eq("/admin/resources")
+      expect(modals.at_css('input[name="search_options[keyword]"]')["value"]).to eq("tokyo")
+    end
+
     # boolean radio group が未指定・true・falseを横並びで描画し、ラベルと選択状態を反映することを確認する
     it "renders boolean radio group controls with custom labels" do
       dashboard = Class.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yummy-guide-generic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - akatsuki-kk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-05 00:00:00.000000000 Z
+date: 2026-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate