yummy-guide-generic-administrate 0.8.17 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d608084abf8a2102ab3d0f9bd66d10ea97ea18b8011579be71ebd653847eeb
-  data.tar.gz: daa6bfe99585aade3db4b75616409dcf2a6ada952c1d48956d9bfde74267ef81
+  metadata.gz: b53bff1d61f85a0cf761db5b1268073c026170320b44cd8b02f1f8ebdcf42938
+  data.tar.gz: e1e7da598410b265d230ba48a204e604539c9e33e4318027ba0f03152e7083f9
 SHA512:
-  metadata.gz: 6c1d842ac78121155c7486c968036f13a0d5cf6bf9d93081e4fc495416ec1e2d19493019d4aba89f1fbe57a5972c9edefc494a11e94f5c007355c4d166bf20e5
-  data.tar.gz: 762fb6b98172382610b352c46be1b8ed95548d9d667a831db189f1cdeaefffac054e983960e9e8e9568e85bd1ff0733384f432cf57e0b215045e3c20591fe1d9
+  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/lib/yummy_guide/administrate/version.rb

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

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.17
+  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