yummy-guide-generic-administrate 0.8.16 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea5c7cfc5273ba6a7f6cf59dacded8b77c7ce8c728859b689ddd8e504b6e4fc
-  data.tar.gz: e39d3ae5f41ca38513f96e5160ca2ac8949dac0faebee99cebb63e6e8645b66d
+  metadata.gz: b53bff1d61f85a0cf761db5b1268073c026170320b44cd8b02f1f8ebdcf42938
+  data.tar.gz: e1e7da598410b265d230ba48a204e604539c9e33e4318027ba0f03152e7083f9
 SHA512:
-  metadata.gz: 07caa0d706ce90f07bfed3d380c1e3ab7a8b527e2285bb856b66e19c6a4a5334ff700c38df3a9e22d45cdaaf78edb2acf3cbaf271c8097d223e1f822c1d1cca9
-  data.tar.gz: bdbebfc1293d49c7bbd12d495d478edb3295e3b2a8a4b193594d1883a63c57c0fbb5f611d569d9ac9c5740e814245c30252af2c8e1ee51a83b61243091d4339e
+  metadata.gz: 973806241c05cb384995d1ce293af242adda092846ff9c0d94790bed8c4e04f82e7d418dbce3b1fa29843ab56d6e3c022c72d695da8f7fe3aff95806c7615f7c
+  data.tar.gz: b02c11686425c3ca4c120e7d286a076595ec3074f640252918d8278b5bbaa4d6dd58167482c23afe400dcc54617c905103c988cbf23876ebd3f08b56d4f5e2e7

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

@@ -79,12 +79,21 @@
 
   function clearFormFields(formEl) {
     formEl.querySelectorAll("input, select, textarea").forEach(function(fieldEl) {
-      if (fieldEl.disabled || fieldEl.type === "hidden" || fieldEl.type === "submit") {
+      if (fieldEl.disabled || fieldEl.type === "submit") {
         return;
       }
 
-      if (fieldEl.tagName === "SELECT") {
+      // フォーム全体のhidden（hidden_fields / root_hidden_fields等）は保持し、フィルター行内のhiddenのみクリアする
+      if (fieldEl.type === "hidden") {
+        if (!fieldEl.closest(".filter_table")) return;
+
         fieldEl.value = "";
+        fieldEl.setAttribute("value", "");
+        return;
+      }
+
+      if (fieldEl.tagName === "SELECT") {
+        resetSelectControl(fieldEl);
         return;
       }
 
@@ -123,15 +132,18 @@
   }
 
   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;
-      }
-    });
+    rowEl.querySelectorAll("select").forEach(resetSelectControl);
+  }
+
+  // 空の選択肢がないselect（例: ["All months", "all"]始まり）でも未選択表示にならないよう、"all"を優先して選択する
+  function resetSelectControl(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) {

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

@@ -140,7 +140,12 @@ module YummyGuide
             end,
             content_tag(:div, class: "filter-form__actions") do
               safe_join([
-                link_to("Clear", clear_path, class: "button button--outline-primary", data: { behavior: "filter-form-clear-link" }),
+                button_tag(
+                  "Clear",
+                  type: "button",
+                  class: "button button--outline-primary",
+                  data: { behavior: "filter-form-clear" }
+                ),
                 Array(extra_actions),
                 f.submit(submit_label, class: "submit_filter")
               ].flatten)

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.8.16"
+    VERSION = "0.8.18"
   end
 end

data/spec/yummy_guide/administrate/filter_controls_helper_spec.rb

@@ -60,6 +60,11 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
       expect(clear_button.at_css("span.filter-control-icon.filter-control-icon--eraser[data-filter-icon='eraser'][aria-hidden='true']")).to be_present
       expect(document.at_css('input[name="search_options[keyword]"]')["value"]).to eq("tokyo")
       expect(document.at_css('select[name="search_options[status]"] option[selected]')["value"]).to eq("closed")
+
+      form_clear_button = document.at_css('.filter-form__actions button[data-behavior="filter-form-clear"]')
+      expect(form_clear_button).to be_present
+      expect(form_clear_button["type"]).to eq("button")
+      expect(document.at_css('.filter-form__actions a[data-behavior="filter-form-clear-link"]')).to be_nil
     end
 
     # body mount指定時はフォームをcontent_forへ逃がし、ヘッダー側には起動ボタンだけを残すことを確認する

data/spec/yummy_guide/administrate/filter_form_asset_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe "filter form assets" do
+  let(:javascript_source) do
+    File.read(File.expand_path("../../../app/assets/javascripts/yummy_guide_administrate/filter_form.js", __dir__))
+  end
+
+  let(:clear_form_fields_source) do
+    javascript_source[/function clearFormFields\(formEl\) \{.*?\n  \}\n/m]
+  end
+
+  # フォーム全体のClearでフィルター行内のhidden値（Location等）もクリアし、フォーム全体のhiddenは保持することを静的に確認する
+  it "clears hidden fields inside filter rows only" do
+    expect(clear_form_fields_source).not_to be_nil
+    expect(clear_form_fields_source).not_to include('fieldEl.type === "hidden" || fieldEl.type === "submit"')
+    expect(clear_form_fields_source).to include('if (!fieldEl.closest(".filter_table")) return;')
+  end
+
+  # フォーム全体のClearでも行単位のClearと同じく、空の選択肢がないselectは"all"を選択することを静的に確認する
+  it "resets selects the same way as the per-row clear" do
+    expect(clear_form_fields_source).to include("resetSelectControl(fieldEl);")
+    expect(javascript_source).to include('rowEl.querySelectorAll("select").forEach(resetSelectControl);')
+    expect(javascript_source).to include('selectEl.value = "all";')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummy-guide-generic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.8.16
+  version: 0.8.18
 platform: ruby
 authors:
 - akatsuki-kk
@@ -158,6 +158,7 @@ files:
 - spec/yummy_guide/administrate/fields/version_item_field_spec.rb
 - spec/yummy_guide/administrate/fields/version_whodunnit_field_spec.rb
 - spec/yummy_guide/administrate/filter_controls_helper_spec.rb
+- spec/yummy_guide/administrate/filter_form_asset_spec.rb
 - spec/yummy_guide/administrate/filter_form_helper_spec.rb
 - spec/yummy_guide/administrate/filters_spec.rb
 - spec/yummy_guide/administrate/number_input_helper_spec.rb