yummy-guide-generic-administrate 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8906e8c09072b22eebdaeaa49b0fb57a395aa30693bf6f9986ebc3c0687e254d
-  data.tar.gz: 802a739018ffc6e269a688a459464e17e213c6d6ee195d7aacd6e396aa74f97a
+  metadata.gz: 19e487e3834d936ad510df92a00a47f99447a31efd61145fd31798b5a44cbaec
+  data.tar.gz: ec73a8e829f7533ac79ebe3d4cca687b0d519c6e048940e2978b3ad25d44f0cc
 SHA512:
-  metadata.gz: b37b6a8dfbe765ab42af40cc6c2db86a7f568c049af2a6c3a47d3ef5871bacb2351896b15b9f1368ad446a97f6d9e1a3eab44cbd1d045b1ab2efd68a2fbfbb31
-  data.tar.gz: 84255b48f37a7b0926e74228cd24b1ff0d5080f7c7dedc89b7b7ecedf86eff3a871299bbd002882eefe9ad3f0b4800ea3b706eae7ddd39806ca11d2317fecdf0
+  metadata.gz: 9d3da1b8ec25f8a3b0e4c01ef625f35a9e2d369c8a2656cb98f0813ec6ffe6343c375cfa91d42038c4d3527eafb3b61cdff8446cb508124a68c585a80fd5f834
+  data.tar.gz: d590ff5f0b427417f86a5951bdb514ab16ee27659ddccbfd22b84737a4f34ce7b78964ae5dc4bd10b4ba075df6363c634f87f274b2489945589fb1df44100561

data/README.md

@@ -355,13 +355,14 @@ dashboard の `FILTER_PATH` / `FILTER_CLEAR_PATH` より優先されます。
     ) %>
 ```
 
-標準 Field は `Text`, `Select`, `Checkbox`, `RadioGroup`, `CheckboxGroup`,
-`DateRange`, `DatetimeRange`, `DatetimeLocalRange`, `Custom` です。
+標準 Field は `Text`, `Select`, `Checkbox`, `RadioGroup`, `BooleanRadioGroup`,
+`CheckboxGroup`, `DateRange`, `DatetimeRange`, `DatetimeLocalRange`, `Custom` です。
 主な option は次のとおりです。
 
 - 共通: `label`, `default`, `if`, `class`, `id`, `placeholder`, `inputmode`, `pattern`
 - 選択系: `collection` または `options`, `select_options`
 - checkbox: `checked_value`, `unchecked_value`
+- boolean radio group: `unspecified_label`, `true_label`, `false_label`
 - checkbox group: `group`
 - range: `from`, `to`, `from_default`, `to_default`, `css_class`
 
@@ -379,6 +380,12 @@ FILTER_ATTRIBUTES = {
     label: "Status",
     collection: ->(_view, locals) { locals[:status_collection] },
     select_options: { include_blank: true }
+  ),
+  visible: YummyGuide::Administrate::Filters::BooleanRadioGroup.with_options(
+    label: "Visible",
+    unspecified_label: "-",
+    true_label: "Visible",
+    false_label: "Hidden"
   )
 }.freeze
 ```
@@ -409,6 +416,10 @@ FILTER_ATTRIBUTES = {
 </tr>
 ```
 
+`filter_form.js` を読み込んでいる場合、`data-behavior="filter-field-clear"` を持つ
+button は同じ `tr` 内の input / select / textarea / checkbox / radio / datetime
+filter だけをクリアします。
+
 複数画面で再利用する filter 型は `YummyGuide::Administrate::Filters::Base` を継承して作ります。
 単一 input なら `input` を実装し、行全体を制御したい場合は `row` または `input_cell` を上書きします。
 

data/app/assets/javascripts/yummy_guide_administrate/filter_form.js

@@ -43,6 +43,12 @@
       });
     });
 
+    formEl.querySelectorAll('[data-behavior="filter-field-clear"]').forEach(function(buttonEl) {
+      buttonEl.addEventListener("click", function(event) {
+        clearFilterField(formEl, event);
+      });
+    });
+
     formEl.querySelectorAll('[data-behavior="checkbox-group-select-all"]').forEach(function(buttonEl) {
       buttonEl.addEventListener("click", function() {
         setCheckboxGroupState(formEl, buttonEl.dataset.target, true);
@@ -58,6 +64,19 @@
     syncDatetimeFilterFields(formEl);
   }
 
+  function clearFilterField(formEl, event) {
+    event.preventDefault();
+
+    var rowEl = event.currentTarget.closest("tr");
+    if (!rowEl) return;
+
+    clearTextControls(rowEl);
+    clearChoiceControls(rowEl);
+    clearSelectControls(rowEl);
+    clearDatetimeFilters(rowEl);
+    syncDatetimeFilterFields(formEl);
+  }
+
   function clearFormFields(formEl) {
     formEl.querySelectorAll("input, select, textarea").forEach(function(fieldEl) {
       if (fieldEl.disabled || fieldEl.type === "hidden" || fieldEl.type === "submit") {
@@ -86,6 +105,57 @@
     syncDatetimeFilterFields(formEl);
   }
 
+  function clearTextControls(rowEl) {
+    rowEl.querySelectorAll("input, textarea").forEach(function(inputEl) {
+      var inputType = (inputEl.getAttribute("type") || "").toLowerCase();
+
+      if (inputType === "checkbox" || inputType === "radio") return;
+      if (inputType === "hidden" && inputEl.dataset.datetimePart !== "combined") return;
+
+      inputEl.value = "";
+      inputEl.setAttribute("value", "");
+    });
+  }
+
+  function clearChoiceControls(rowEl) {
+    rowEl.querySelectorAll('input[type="checkbox"], input[type="radio"]').forEach(function(inputEl) {
+      inputEl.checked = false;
+    });
+  }
+
+  function clearSelectControls(rowEl) {
+    rowEl.querySelectorAll("select").forEach(function(selectEl) {
+      if (selectEl.querySelector('option[value=""]')) {
+        selectEl.value = "";
+      } else if (selectEl.querySelector('option[value="all"]')) {
+        selectEl.value = "all";
+      } else {
+        selectEl.selectedIndex = -1;
+      }
+    });
+  }
+
+  function clearDatetimeFilters(rowEl) {
+    rowEl.querySelectorAll("[data-datetime-filter]").forEach(function(groupEl) {
+      var combinedEl = groupEl.querySelector('[data-datetime-part="combined"]');
+      var dateEl = groupEl.querySelector('[data-datetime-part="date"]');
+
+      if (combinedEl) {
+        combinedEl.value = "";
+        combinedEl.setAttribute("value", "");
+      }
+
+      if (dateEl) {
+        dateEl.value = "";
+        dateEl.setAttribute("value", "");
+      }
+
+      clearDatetimeTimeParts(groupEl);
+      syncDatetimeTimeDisabledState(groupEl);
+      syncBlankMinuteOptionState(groupEl);
+    });
+  }
+
   function setCheckboxGroupState(formEl, groupName, checked) {
     if (!groupName) return;
 
@@ -216,4 +286,3 @@
 
   document.addEventListener("turbo:load", initializeFromDocument);
 })();
-

data/lib/yummy_guide/administrate/filters.rb

@@ -152,6 +152,39 @@ module YummyGuide
         end
       end
 
+      class BooleanRadioGroup < Base
+        protected
+
+        def input_cell(view_context, _form, scope, current_values, locals)
+          selected = current_value(current_values).to_s
+          controls = boolean_options(view_context, locals).map do |label, value|
+            value_string = value.to_s
+            id = "#{scope}_#{name}_#{value_string.presence || "unspecified"}".parameterize(separator: "_")
+
+            view_context.content_tag(:label, style: "display: inline-flex; align-items: center; gap: 6px;") do
+              view_context.safe_join([
+                view_context.radio_button_tag("#{scope}[#{name}]", value, selected == value_string, id: id),
+                view_context.content_tag(:span, label)
+              ])
+            end
+          end
+
+          view_context.content_tag(:td) do
+            view_context.content_tag(:div, view_context.safe_join(controls), style: "display: flex; align-items: center; gap: 12px; flex-wrap: wrap;")
+          end
+        end
+
+        private
+
+        def boolean_options(view_context, locals)
+          [
+            [evaluate_option(options.fetch(:unspecified_label, "Unspecified"), view_context, locals), ""],
+            [evaluate_option(options.fetch(:true_label, "true"), view_context, locals), "true"],
+            [evaluate_option(options.fetch(:false_label, "false"), view_context, locals), "false"]
+          ]
+        end
+      end
+
       class CheckboxGroup < Base
         protected
 

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.6.0"
+    VERSION = "0.6.2"
   end
 end

data/spec/yummy_guide/administrate/filter_controls_helper_spec.rb

@@ -49,6 +49,38 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
       expect(document.at_css('select[name="search_options[status]"] option[selected]')["value"]).to eq("closed")
     end
 
+    # boolean radio group が未指定・true・falseを横並びで描画し、ラベルと選択状態を反映することを確認する
+    it "renders boolean radio group controls with custom labels" do
+      dashboard = Class.new
+      dashboard.const_set(
+        :FILTER_ATTRIBUTES,
+        {
+          visible: YummyGuide::Administrate::Filters::BooleanRadioGroup.with_options(
+            label: "Visible",
+            unspecified_label: "-",
+            true_label: "Visible",
+            false_label: "Hidden"
+          )
+        }.freeze
+      )
+
+      html = helper_host.admin_filter_controls(
+        dashboard: dashboard,
+        path: "/admin/resources",
+        search_options: { visible: "false" }
+      )
+      document = fragment(html)
+
+      wrapper = document.at_css('input[name="search_options[visible]"]').ancestors("div").first
+
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value=""]')).to be_present
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value="true"]')).to be_present
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value="false"]')).to be_present
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value="false"]')["checked"]).to eq("checked")
+      expect(wrapper["style"]).to include("display: flex")
+      expect(document.text).to include("-", "Visible", "Hidden")
+    end
+
     # dashboard に定義した FILTER_PATH をフィルター送信先として利用できることを確認する
     it "uses dashboard filter path when no explicit path is passed" 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.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - akatsuki-kk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-25 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate