card-mod-search 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f466b9b265c08d5b1e99d2b892e3290174ccd7c3e146a504cab50b2ac4dabf
-  data.tar.gz: 838eae48c264ac53afbb5816a4e088876124d423b056a2202e85c1545cd96311
+  metadata.gz: d4e0888157c8ae7db22a9ac094ed705e61cb6df0cc971aac5910304d1feba587
+  data.tar.gz: f442615afe24128dcd1506df6d8d99989ebfa915f3be4785e5a456a0de05bcbd
 SHA512:
-  metadata.gz: f699229ccbccdbcd0891e1d1c6666af0315b4b6ae5832e17d21901872f920b00334342854c5c0b4328ebc1b41760932f43f271c22e271fc180874eb8527b84e2
-  data.tar.gz: 825293130a65bd6d4d23068d5ba97c29ba0fdc14945b777a483dab9af0b944a250c16ab9f7a8b0e9bf27f0c518180507fca50c6106f8b6a6a21ccb2ac76418fe
+  metadata.gz: a4712a996ebe145ac011e05f3528b015de3f45d2575d443c14716df8f2a09623534b057336be5122b45188d05b3fce01b4065364348371023e8a86a6a4c78a45
+  data.tar.gz: bdaf29e1e625c1132c3bd2d02a0e58af2d447ee709b3483c802f9ae92c4362193c9533c894d8ca298d49524f384d065d4d55e13e53fbb27afb10c77dd58d4418

data/assets/script/autocomplete.js.coffee

@@ -2,8 +2,8 @@ decko.slot.ready (slot) ->
   slot.find('._autocomplete').each (_i) ->
     decko.initAutoCardPlete($(this))
 
-  slot.find('._select2autocomplete').each (_i) ->
-    decko.select2Autocomplete.init $(this)
+#  slot.find('._select2autocomplete').each (_i) ->
+#    decko.select2Autocomplete.init $(this)
 
 decko.initAutoCardPlete = (input) ->
   optionsCard = input.data 'options-card'

data/config/admin.yml

@@ -0,0 +1,6 @@
+settings:
+  - script
+
+cardtypes:
+  organize:
+    - search_type

data/data/files/mod_search_script_asset_output/file.js

@@ -1,4 +1,4 @@
 // autocomplete.js.coffee
-(function(){decko.slot.ready(function(e){return e.find("._autocomplete").each(function(){return decko.initAutoCardPlete($(this))}),e.find("._select2autocomplete").each(function(){return decko.select2Autocomplete.init($(this))})}),decko.initAutoCardPlete=function(e){var t,n;if(t=e.data("options-card"))return n=t+".json?view=name_match",e.autocomplete({source:decko.slot.path(n)})},decko.select2Autocomplete={init:function(e,t,n){var o;return o=$.extend({},this._defaults(e),t),n&&$.extend(o.ajax,n),e.select2(o)},_defaults:function(e){return{multiple:!1,width:"100%!important",minimumInputLength:0,maximumSelectionSize:1,placeholder:e.attr("placeholder"),escapeMarkup:function(e){return e},ajax:{delay:200,cache:!0,url:decko.path(":search.json"),processResults:function(e){return{results:e}},data:function(e){return{query:{keyword:e.term},view:"complete"}}}}}}}).call(this);
+(function(){decko.slot.ready(function(e){return e.find("._autocomplete").each(function(){return decko.initAutoCardPlete($(this))})}),decko.initAutoCardPlete=function(e){var t,n;if(t=e.data("options-card"))return n=t+".json?view=name_match",e.autocomplete({source:decko.slot.path(n)})},decko.select2Autocomplete={init:function(e,t,n){var o;return o=$.extend({},this._defaults(e),t),n&&$.extend(o.ajax,n),e.select2(o)},_defaults:function(e){return{multiple:!1,width:"100%!important",minimumInputLength:0,maximumSelectionSize:1,placeholder:e.attr("placeholder"),escapeMarkup:function(e){return e},ajax:{delay:200,cache:!0,url:decko.path(":search.json"),processResults:function(e){return{results:e}},data:function(e){return{query:{keyword:e.term},view:"complete"}}}}}}}).call(this);
 // search_box.js.coffee
 (function(){$(window).ready(function(){var t,o;return o=$("._search-box"),t=new decko.searchBox(o),o.data("searchBox",t),t.init()}),decko.searchBox=function(){function t(t){this.box=t,this.sourcepath=this.box.data("completepath"),this.originalpath=this.sourcepath,this.config={source:this.sourcepath,select:this.select}}return t.prototype.init=function(){return this.box.autocomplete(this.config,{html:!0})},t.prototype.select=function(t,o){var e;if(e=o.item.url)return window.location=e},t.prototype.form=function(){return this.box.closest("form")},t.prototype.keyword=function(){return this.keywordBox().val()},t.prototype.keywordBox=function(){return this.form().find("#query_keyword")},t}()}).call(this);

data/set/abstract/0_search/views.rb

@@ -44,11 +44,11 @@ format :json do
 
   # TODO: design better autocomplete API
   view :name_complete, cache: :never do
-    complete_search limit: AUTOCOMPLETE_LIMIT
+    format_json_search { complete_search limit: AUTOCOMPLETE_LIMIT }
   end
 
   view :name_match, cache: :never do
-    complete_or_match_search limit: AUTOCOMPLETE_LIMIT
+    format_json_search { complete_or_match_search limit: AUTOCOMPLETE_LIMIT }
   end
 
   def complete_or_match_search limit: AUTOCOMPLETE_LIMIT, start_only: false,
@@ -68,9 +68,13 @@ format :json do
   end
 
   def match_search limit: AUTOCOMPLETE_LIMIT, not_names: [], additional_cql: {}
+    return [] unless term_param.present?
+
     card.search name_cql(limit).merge(match_cql(not_names)).merge(additional_cql)
   end
 
+  private
+
   def name_cql limit
     { limit: limit, sort_by: "name", return: "name" }
   end
@@ -84,6 +88,14 @@ format :json do
     cql[:name] = ["not in"] + not_names if not_names.any?
     cql
   end
+
+  def format_json_search
+    results = yield
+    return results if item_view_options.dig(:view)&.to_sym == :name
+    results.map do |item_card|
+      nest_item item_card
+    end.to_json
+  end
 end
 
 format :data do
@@ -95,7 +107,7 @@ format :data do
 end
 
 format :csv do
-  view :core, :core, mod: All::Csv::CsvFormat
+  view :body, :body, mod: All::Csv::CsvFormat
 end
 
 format :html do

data/set/self/recent.rb

@@ -6,6 +6,11 @@ view :title do
   super()
 end
 
+# FIXME: this should not be a CQL search card
+def cql_content
+  {}
+end
+
 def recent_acts
   limiting_scan do
     Act.joins(ar_actions: :ar_card).distinct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-search
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.107.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.107.0
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: card-mod-help
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 description: ''
 email:
 - info@decko.org
@@ -80,6 +80,7 @@ files:
 - assets/script/autocomplete.js.coffee
 - assets/script/search_box.js.coffee
 - assets/style/search.scss
+- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/files/mod_search_script_asset_output/file.js
@@ -138,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: search