card-mod-list 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936f29a9dc0812699b8f46d0415fa34e025dabebfdfde79499cdc2e77d4da935
-  data.tar.gz: b0f2e5cdd51a0d5ff536e70bc1aa48d5f048fddbd00d6620adcfb972055d1e96
+  metadata.gz: ac78aa043b64d282fef3947e6a579fbe664bf2ce1096d32ed1ec36680f724ce3
+  data.tar.gz: 5ba568975124684904fb06fe6bd41b01f28e2f30c9828bc6402c94349ed92283
 SHA512:
-  metadata.gz: f0887a41a4bf60c73651fc7f554d7cafbdb2eb4fb1bd98c98a6728d605354370ec6d4f886044a0226199e3ba43eb83440f3675cfa83c46bb9eccaaf40ed4390c
-  data.tar.gz: bb6cdffafe0c79c23fdba644f714ecb3a1e27eda99a04a4bba0d32ca3273723fee30edd354c487bbbdf2848fc7c94d9348b767f246b43c38133fec2e42a94f35
+  metadata.gz: d37b057c5f7939f9f245c9a2b23357ceb28548224883aed065a0186ca0e0a340b8ae372b8fd382d8f2292cffad5cd52914bff093c286939ece0b4ae2b5e36794
+  data.tar.gz: 8ce9586932e255a329493c71455a00ed04aa80d64e0251d71e839c4d36e98a87101b0c1d4880402ab12ecfb9768269eab555d8e662f3cccd2fe9bd35054b6274

data/assets/script/pointer_config.js.coffee

@@ -0,0 +1,78 @@
+$.extend decko.editors.content,
+    'select.pointer-select': ->
+      pointerContent @val()
+    'select.pointer-multiselect': ->
+      pointerContent @val()
+    '.pointer-radio-list': ->
+      pointerContent @find('input:checked').val()
+    '.pointer-list-ul': ->
+      pointerContent @find('input').map( -> $(this).val() )
+    '.pointer-link-list-ul': ->
+      decko.linkListContent @find('.input-group')
+    '._nest-list-ul': ->
+      decko.nestListContent @find('.input-group')
+    '.pointer-checkbox-list': ->
+      pointerContent @find('input:checked').map( -> $(this).val() )
+    '.pointer-select-list': ->
+      pointerContent @find('.pointer-select select').map( -> $(this).val() )
+    '._filtered-list': ->
+      pointerContent @find('._filtered-list-item').map( -> $(this).data('cardName') )
+    '._pointer-list': ->
+      pointerContent @find('._pointer-item').map( -> $(this).val() )
+    '._click-select-editor': ->
+      pointerContent @find('._select-item.selected').map( ->
+        $($(this).find('[data-card-name]')[0]).data('cardName'))
+    '._click-multiselect-editor': ->
+      pointerContent @find('._select-item.selected').map( ->
+        $($(this).find('[data-card-name]')[0]).data('cardName'))
+    # can't find evidence that the following is in use: #efm
+    # '.pointer-mixed': ->
+    #   element = '.pointer-checkbox-sublist input:checked,\
+    #             .pointer-sublist-ul input'
+    #   pointerContent @find(element).map( -> $(this).val() )
+    # must happen after pointer-list-ul, I think
+    '.perm-editor': -> permissionsContent this
+
+$.extend decko.editors.init,
+  ".pointer-list-editor": ->
+    @sortable handle: '.handle', cancel: ''
+    decko.initPointerList @find('input')
+
+  "._filtered-list" : ->
+    @sortable handle: '._handle', cancel: ''
+
+$.extend decko,
+  initPointerList: (input) ->
+    decko.initAutoCardPlete input
+
+  pointerContent: (vals) ->
+    $.makeArray(vals).join "\n"
+
+  linkListContent: (input_groups) ->
+    vals = input_groups.map( ->
+      v = $(this).find('input._reference').val()
+      title = $(this).find('input._title').val()
+      v += "|#{title}" if title.length > 0
+      v
+    )
+    list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
+    $.makeArray(list).join "\n"
+
+  nestListContent: (input_groups) ->
+    vals = input_groups.map( ->
+      v = $(this).find('input._reference').val()
+      options = $(this).find('input._nest-options').val()
+      v += "|#{options}" if options.length > 0
+      v
+    )
+    list = $.map $.makeArray(vals), (v) -> if v then '{{' + v + '}}'
+    $.makeArray(list).join "\n"
+
+pointerContent = (vals) ->
+  decko.pointerContent vals
+
+permissionsContent = (ed) ->
+  return '_left' if ed.find('#inherit').is(':checked')
+  groups = ed.find('.perm-group input:checked').map( -> $(this).val() )
+  indivs = ed.find('.perm-indiv input'        ).map( -> $(this).val() )
+  pointerContent $.makeArray(groups).concat($.makeArray(indivs))

data/assets/script/pointer_list_editor.js.coffee

@@ -0,0 +1,68 @@
+$(window).ready ->
+  # add pointer item when clicking on "add another" button
+  $('body').on 'click', '._pointer-item-add', (event)->
+    decko.addPointerItem this
+    event.preventDefault() # Prevent link from following its href
+
+  # add pointer item when you hit enter in an item
+  $('body').on 'keydown', '.pointer-item-text', (event)->
+    if event.key == 'Enter'
+      decko.addPointerItem this
+      event.preventDefault() # was triggering extra item in unrelated pointer
+
+  # enable/disable add
+  $('body').on 'keyup', '.pointer-item-text', (_event)->
+    decko.updateAddItemButton this
+
+  $('body').on 'click', '.pointer-item-delete', ->
+    item = $(this).closest 'li'
+    list =  item.closest('ul')
+    if list.find('.pointer-li').length > 1
+      item.remove()
+    else
+      item.find('input').val ''
+    decko.updateAddItemButton(list)
+
+decko.slot.ready (slot) ->
+  slot.find('.pointer-list-editor').each ->
+    decko.updateAddItemButton this
+
+$.extend decko,
+  addPointerItem: (el) ->
+    slot = $(el).slot()
+    slot.trigger "decko.slot.destroy"
+    # why is this necessary?
+    # this can have a lot of side effects in a multi-card form.
+
+    newInput = decko.nextPointerInput decko.lastPointerItem(el)
+    newInput.val ''
+
+    slot.trigger "decko.slot.ready"
+    decko.initializeEditors slot
+    # should be (but is not) handled by decko.slot.ready
+    # without this, "add another" was breaking tinymce editors in same slot
+
+    newInput.first().focus()
+    decko.updateAddItemButton el
+    decko.initPointerList newInput
+
+  nextPointerInput: (lastItem)->
+    lastInputs = lastItem.find 'input'
+    all_empty = true
+    for input in lastInputs
+        all_empty  = all_empty and $(input).val() == ''
+    return lastInputs if all_empty
+
+    newItem = lastItem.clone()
+    lastItem.after newItem
+    newItem.attr("data-index", parseInt(lastItem.attr("data-index") + 1))
+    newItem.trigger "decko.item.added"
+    newItem.find 'input'
+
+  lastPointerItem: (el)->
+    $(el).closest('.content-editor').find '.pointer-li:last'
+
+  updateAddItemButton: (el)->
+    button = $(el).closest('.content-editor').find '._pointer-item-add'
+    disabled = decko.lastPointerItem(el).find('input').val() == ''
+    button.prop 'disabled', disabled

data/assets/style/list.scss

@@ -0,0 +1,102 @@
+ul.pointer {
+  margin: 0;
+  padding: 0;
+}
+
+.pointer-list-editor {
+  margin: 0px;
+  padding: 0px;
+  li {
+    list-style: none;
+    white-space: nowrap;
+  }
+
+  .input-group-btn {
+    .btn {
+      border-bottom-width: 1px;
+    }
+  }
+
+  ._pointer-item-add {
+    margin-top: 10px;
+  }
+
+  .input-group-addon.handle {
+    padding-left: 1px;
+    padding-right: 1px;
+
+    .glyphicon-option-vertical.left {
+      margin-right: -7px;
+    }
+    .glyphicon-option-vertical.right {
+      margin-left: -7px;
+    }
+  }
+}
+
+/*---------- ( Link list )-------------*/
+
+.group-text-middle {
+  border-left: none;
+  border-right: none;
+}
+
+.group-text-left {
+  border-right: none;
+}
+
+.group-text-right {
+  border-left: none;
+}
+
+
+/*---------- ( Nest list editor )-------------*/
+
+.input-nest-syntax {
+  background-color: $input-bg;
+  font-weight: 200;
+  font-size: 1.3rem;
+  padding-top: 0.1rem;
+  padding-bottom: 0.1rem;
+}
+
+.nest-form-header .input-group {
+  height: 2rem;
+
+  .input-group-text {
+    visibility: hidden;
+  }
+}
+
+.one-line-pointer-list {
+  div.pointer-item {
+    display: inline-block
+  }
+}
+
+/*-------------------- */
+/*- SEARCH & POINTER - */
+/*-------------------- */
+
+// TODO: use shared class for pointers and searches
+
+div.pointer-list,
+div.search-result-list {
+  list-style: none;
+  padding: 5px 0;
+  margin: 0;
+  .closed-view > .d0-card-frame {
+    margin-bottom: 0;
+  }
+}
+div.pointer-list .pointer-item,
+div.search-result-list .search-result-item {
+  margin: 0;
+}
+.search-result-item.item-link,
+.pointer-item.item-link,
+.search-result-item.item-name,
+.pointer-item.item-name {
+  text-indent: -15px;
+  padding-left: 15px;
+}

data/config/locales/de.yml

@@ -0,0 +1,2 @@
+de:
+  list_invalid_item_type: "%{item} hat einen ungültigen Typ (%{type)). Nur %{allowed_types} sind erlaubt."

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  list_invalid_item_type:
+    "%{item} has an invalid type: %{type}. Allowed types: %{allowed_types}."
+  list_duplicate_items_names:
+    "duplicate item names: %{duplicates}"

data/data/files/mod_list_script_asset_output/file.js

@@ -0,0 +1,4 @@
+// pointer_config.js.coffee
+(function(){var t,n;$.extend(decko.editors.content,{"select.pointer-select":function(){return n(this.val())},"select.pointer-multiselect":function(){return n(this.val())},".pointer-radio-list":function(){return n(this.find("input:checked").val())},".pointer-list-ul":function(){return n(this.find("input").map(function(){return $(this).val()}))},".pointer-link-list-ul":function(){return decko.linkListContent(this.find(".input-group"))},"._nest-list-ul":function(){return decko.nestListContent(this.find(".input-group"))},".pointer-checkbox-list":function(){return n(this.find("input:checked").map(function(){return $(this).val()}))},".pointer-select-list":function(){return n(this.find(".pointer-select select").map(function(){return $(this).val()}))},"._filtered-list":function(){return n(this.find("._filtered-list-item").map(function(){return $(this).data("cardName")}))},"._pointer-list":function(){return n(this.find("._pointer-item").map(function(){return $(this).val()}))},"._click-select-editor":function(){return n(this.find("._select-item.selected").map(function(){return $($(this).find("[data-card-name]")[0]).data("cardName")}))},"._click-multiselect-editor":function(){return n(this.find("._select-item.selected").map(function(){return $($(this).find("[data-card-name]")[0]).data("cardName")}))},".perm-editor":function(){return t(this)}}),$.extend(decko.editors.init,{".pointer-list-editor":function(){return this.sortable({handle:".handle",cancel:""}),decko.initPointerList(this.find("input"))},"._filtered-list":function(){return this.sortable({handle:"._handle",cancel:""})}}),$.extend(decko,{initPointerList:function(t){return decko.initAutoCardPlete(t)},pointerContent:function(t){return $.makeArray(t).join("\n")},linkListContent:function(t){var n,i;return i=t.map(function(){var t,n;return n=$(this).find("input._reference").val(),(t=$(this).find("input._title").val()).length>0&&(n+="|"+t),n}),n=$.map($.makeArray(i),function(t){if(t)return"[["+t+"]]"}),$.makeArray(n).join("\n")},nestListContent:function(t){var n,i;return i=t.map(function(){var t,n;return n=$(this).find("input._reference").val(),(t=$(this).find("input._nest-options").val()).length>0&&(n+="|"+t),n}),n=$.map($.makeArray(i),function(t){if(t)return"{{"+t+"}}"}),$.makeArray(n).join("\n")}}),n=function(t){return decko.pointerContent(t)},t=function(t){var i,e;return t.find("#inherit").is(":checked")?"_left":(i=t.find(".perm-group input:checked").map(function(){return $(this).val()}),e=t.find(".perm-indiv input").map(function(){return $(this).val()}),n($.makeArray(i).concat($.makeArray(e))))}}).call(this);
+// pointer_list_editor.js.coffee
+(function(){$(window).ready(function(){return $("body").on("click","._pointer-item-add",function(t){return decko.addPointerItem(this),t.preventDefault()}),$("body").on("keydown",".pointer-item-text",function(t){if("Enter"===t.key)return decko.addPointerItem(this),t.preventDefault()}),$("body").on("keyup",".pointer-item-text",function(){return decko.updateAddItemButton(this)}),$("body").on("click",".pointer-item-delete",function(){var t,e;return(e=(t=$(this).closest("li")).closest("ul")).find(".pointer-li").length>1?t.remove():t.find("input").val(""),decko.updateAddItemButton(e)})}),decko.slot.ready(function(t){return t.find(".pointer-list-editor").each(function(){return decko.updateAddItemButton(this)})}),$.extend(decko,{addPointerItem:function(t){var e,n;return(n=$(t).slot()).trigger("decko.slot.destroy"),(e=decko.nextPointerInput(decko.lastPointerItem(t))).val(""),n.trigger("decko.slot.ready"),decko.initializeEditors(n),e.first().focus(),decko.updateAddItemButton(t),decko.initPointerList(e)},nextPointerInput:function(t){var e,n,o,i,d,r;for(e=!0,n=0,d=(i=t.find("input")).length;n<d;n++)o=i[n],e=e&&""===$(o).val();return e?i:(r=t.clone(),t.after(r),r.attr("data-index",parseInt(t.attr("data-index")+1)),r.trigger("decko.item.added"),r.find("input"))},lastPointerItem:function(t){return $(t).closest(".content-editor").find(".pointer-li:last")},updateAddItemButton:function(t){var e,n;return e=$(t).closest(".content-editor").find("._pointer-item-add"),n=""===decko.lastPointerItem(t).find("input").val(),e.prop("disabled",n)}})}).call(this);

data/data/real.yml

@@ -0,0 +1,41 @@
+---
+- :name: List
+  :type: :cardtype
+  :codename: list
+  :fields:
+    :description: |-
+      <p>Lists list one or more other cards. [[http://decko.org/:list|more]]</p>
+
+- :name: Pointer
+  :type: :cardtype
+  :codename: pointer
+  :fields:
+    :description: |-
+      <p>Pointers point another card. [[http://decko.org/:pointer|more]]</p>
+
+- :name: Nest list
+  :type: :cardtype
+  :codename: nest_list
+- :name: Link list
+  :type: :cardtype
+  :codename: link_list
+
+- :name: "*content options"
+  :type: :setting
+  :codename: content_options
+
+- :name: "*content option view"
+  :type: :setting
+  :codename: content_option_view
+
+- :name:
+    - :structure
+    - :right
+    - :default
+  :type: :nest_list
+
+- :name:
+    - :all
+    - :content_option_view
+  :type: :phrase
+  :content: smart_label

data/data/test.yml

@@ -0,0 +1,12 @@
+---
+- :name:
+  - friends
+  - :right
+  - :default
+  :type: :list
+- :name:
+  - friends
+  - :right
+  - :content_options
+  :type: :search_type
+  :content: '{"type":"User"}'

data/db/migrate_core_cards/20160804112340_add_pointer_cards.rb

@@ -2,7 +2,7 @@
 
 class AddPointerCards < Cardio::Migration
   def up
-    ensure_card name: "script: pointer config",
+    Card.ensure name: "script: pointer config",
                 type_id: Card::CoffeeScriptID,
                 codename: "script_pointer_config"
   end

data/set/abstract/{01_pointer → 01_list}/events.rb

@@ -10,6 +10,42 @@ event :insert_item_event, :prepare_to_validate, on: :save, when: :item_to_insert
   insert_item index.to_i, item_to_insert
 end
 
+event :validate_item_type, :validate, on: :save, when: :validate_item_type? do
+  ok_types = Array.wrap(ok_item_types).map(&:codename)
+  item_cards.each do |item|
+    next if ok_types.include? item.type_code
+
+    errors.add :content, t(:list_invalid_item_type,
+                           item: item.name,
+                           type: item.type,
+                           allowed_types: ok_types.map(&:cardname).to_sentence)
+  end
+end
+
+event :validate_item_uniqueness, :validate, on: :save, when: :unique_items? do
+  return unless (dupes = duplicate_item_names)&.present?
+
+  errors.add :content, t(:list_duplicate_items_names, duplicates: dupes.to_sentence)
+end
+
+def duplicate_item_names
+  names = item_names
+  names.uniq.select { |n| names.count(n) > 1 }
+end
+
+# for override
+def unique_items?
+  false
+end
+
+def ok_item_types
+  nil
+end
+
+def validate_item_type?
+  ok_item_types.present?
+end
+
 def item_to_insert
   Env.params["insert_item"]
 end

data/set/abstract/01_list/html_views/click_select_input.haml

@@ -0,0 +1,9 @@
+.d-flex.flex-wrap{class:"_click-#{multiselect ? 'multi' : ''}select-editor"}
+  - options_hash = card.options_hash
+  - if options_hash.empty?
+    no options
+  - else
+    - options_hash.each do |option_label, option_name|
+      - checked = option_name == card.first_name
+      ._select-item{class: checked && "selected"}
+        = nest option_name, view: item_view

data/set/abstract/{01_pointer → 01_list}/html_views/list_input.haml

@@ -2,14 +2,12 @@
   - items.each do |item|
     %li.pointer-li.mb-1
       %span.input-group
-        .input-group-prepend.handle
-          %span.input-group-text
-            = icon_tag :reorder
+        %span.input-group-text.handle
+          = icon_tag :reorder
         = text_field_tag "pointer_item", item, class: "pointer-item-text form-control",
                                                "data-options-card": options_card
-        .input-group-append
-          %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
-            = icon_tag :remove
+        %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
+          = icon_tag :remove
 %span.input-group
   %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
     = icon_tag "add"

data/set/abstract/{01_pointer → 01_list}/html_views/list_item.haml

@@ -2,11 +2,9 @@
 
 %li.pointer-li.mb-1
   %span.input-group
-    .input-group-prepend.handle
-      %span.input-group-text
-        = icon_tag :reorder
+    %span.input-group-text.handle
+      = icon_tag :reorder
     = text_field_tag "pointer_item", item, class: "pointer-item-text form-control",
                                              "data-options-card": options_card
-    .input-group-append
-      %button.pointer-item-delete.btn.btn-secondary{:type => "button"}
-        = icon_tag :remove
+    %button.pointer-item-delete.btn.btn-secondary{:type => "button"}
+      = icon_tag :remove

data/set/abstract/{01_pointer → 01_list}/html_views/radio_input.haml

@@ -5,9 +5,9 @@
   - else
     - input_name = "pointer_radio_button-#{card.key}"
     - options_hash.each do |option_label, option_name|
-      - checked = option_name == card.item_name
+      - checked = option_name == card.first_name
       - id = "pointer-radio-#{option_name.to_name.key}"
-      %li.pointer-radio.radio
+      %li.pointer-radio.radio.form-check
         = radio_button_tag input_name, option_name, checked,
-                           id: id, class: "pointer-radio-button #{'_submit-on-change' if submit_on_change}"
+                           id: id, class: "pointer-radio-button form-check-input #{'_submit-on-change' if submit_on_change}"
         = option_label option_label, id

data/set/abstract/{01_pointer → 01_list}/html_views.rb

@@ -3,15 +3,12 @@ format :html do
     standard_pointer_core
   end
 
-  view :item_cores, cache: :never do
-    card.known_item_cards.map do |item|
-      nest item, view: :core
-    end.join "\n"
-  end
-
   def standard_pointer_core
     with_paging do |paging_args|
-      wrap_with :div, standard_pointer_items(paging_args), class: "pointer-list"
+      wrap_with :div,
+                class: "card-list card-list-#{item_view_options[:view]} pointer-list" do
+        standard_pointer_items(paging_args)
+      end
     end
   end
 
@@ -20,8 +17,8 @@ format :html do
   end
 
   view :one_line_content do
-    item_view = implicit_item_view
-    item_view = item_view == "name" ? "name" : "link"
+    item_view = implicit_item_view&.to_sym
+    item_view = item_view == :name ? :name : :link
     wrap_with :div, class: "pointer-list one-line-pointer-list" do
       # limit to first 10 items to optimize
       pointer_items(view: item_view, limit: 10, offset: 0).join ", "
@@ -36,6 +33,10 @@ format :html do
     _render_hidden_content_field + super()
   end
 
+  def hidden_input
+    ""
+  end
+
   def default_input_type
     :list
   end
@@ -57,7 +58,7 @@ format :html do
   end
 
   def autocomplete_input
-    haml :autocomplete_input, item: items_for_input.first, options_card: options_card_name
+    autocomplete_field items_for_input.first, options_card_name
   end
 
   def checkbox_input
@@ -71,34 +72,31 @@ format :html do
   def select_input
     options = { "-- Select --" => "" }.merge card.options_hash
     select_tag("pointer_select-#{unique_id}",
-               options_for_select(options, card.item_name),
+               options_for_select(options, card.first_name),
                class: "pointer-select form-control")
   end
 
-  def multiselect_input
-    select_tag "pointer_multiselect-#{unique_id}",
-               options_for_select(card.options_hash, card.item_names),
-               multiple: true, class: "pointer-multiselect form-control"
+  def bar_select_input
+    raw haml(:click_select_input, item_view: :bar, multiselect: false)
   end
 
-  def add_item_modal_link
-    modal_link "Add Item",
-               size: :large,
-               class: "btn btn-sm btn-outline-secondary _add-item-link",
-               path: { view: :filter_items_modal,
-                       item: implicit_item_view,
-                       filter_card: filter_card.name,
-                       slot_selector: filtered_list_slot_class,
-                       item_selector: "_filtered-list-item",
-                       slot: { hide: [:modal_footer] },
-                       filter: { not_ids: not_ids_value } }
+  def box_select_input
+    raw haml(:click_select_input, item_view: :box, multiselect: false)
   end
 
-  def not_ids_value
-    card.item_ids.map(&:to_s).join(",")
+  def bar_multiselect_input
+    raw haml(:click_select_input, item_view: :bar, multiselect: true)
   end
 
-  def add_item_overlay_link; end
+  def box_multiselect_input
+    raw haml(:click_select_input, item_view: :box, multiselect: true)
+  end
+
+  def multiselect_input
+    select_tag "pointer_multiselect-#{unique_id}",
+               options_for_select(card.options_hash, card.item_names),
+               multiple: true, class: "pointer-multiselect form-control"
+  end
 
   def one_line_content
     if count == 1

data/set/abstract/{01_pointer → 01_list}/options_api.rb

@@ -68,7 +68,9 @@ end
 
 format :html do
   def option_label option_name, id
-    %(<label for="#{id}">#{option_label_text option_name}</label>)
+    wrap_with :label, class: "form-check-label", for: id do
+      option_label_text option_name
+    end
   end
 
   def option_view

data/set/abstract/{01_pointer → 01_list}/other_views.rb

@@ -5,12 +5,6 @@ format do
     20
   end
 
-  def item_links args={}
-    card.item_cards(args).map do |item_card|
-      subformat(item_card).render_link
-    end
-  end
-
   def nest_item_array
     card.item_cards.map do |item|
       nest_item item

data/set/abstract/{01_pointer.rb → 01_list.rb}

@@ -28,6 +28,15 @@ def swap_names old_name, new_name
   end
 end
 
+format :html do
+  view :view_list do
+    %i[bar box closed titled labeled].map do |view|
+      voo.items[:view] = view
+      wrap_with :p, [content_tag(:h3, "#{view} items"), render_content]
+    end
+  end
+end
+
 private
 
 def chunk_class

data/set/abstract/{code_pointer.rb → codename_list.rb}

@@ -1,4 +1,4 @@
-include_set Abstract::Pointer
+include_set Abstract::List
 
 def self.included host_class
   basket[host_class.basket_name] = []

data/set/abstract/delist.rb

@@ -0,0 +1,8 @@
+# remove set members from all lists that reference them upon deletion
+event :delist, :prepare_to_store, on: :delete do
+  referers.each do |referer|
+    next unless referer.is_a? Abstract::List
+    referer.drop_item name
+    subcard referer
+  end
+end

data/set/abstract/{id_pointer.rb → id_list.rb}

@@ -20,6 +20,19 @@ def item_names args={}
   item_ids(args).map(&:cardname).compact
 end
 
-def export_content
+def pod_content
   item_names.join "\n"
 end
+
+def replace_references _old_name, _new_name
+  # noop
+end
+
+# override reference creation so there are no referee_keys
+# (referee_keys can screw things up for these cards when things get renamed)
+def create_references_out
+  referee_ids = item_ids
+  return if referee_ids.empty?
+
+  Reference.mass_insert(referee_ids.map { |rid| [id, rid, "null", "'L'"] })
+end

data/set/abstract/reference_list.rb

@@ -0,0 +1,11 @@
+format do
+  def chunk_list
+    :references
+  end
+end
+
+format :html do
+  def header_field text
+    content_tag :span, text, class: "form-control border-0 control-label"
+  end
+end

data/set/all/supports_content_options.rb

@@ -1,12 +1,4 @@
-basket[:list_input_options] = [
-  "radio",
-  "checkbox",
-  "select",
-  "multiselect",
-  "list",
-  "filtered list",
-  "autocomplete"
-]
+basket[:list_input_options] = %w[radio checkbox select multiselect list autocomplete]
 
 def supports_content_options?
   false

data/set/right/content_option_view.rb

@@ -1,3 +1,5 @@
+assign_type :phrase
+
 format :html do
   def quick_edit
     if card.left.prototype_default_card&.try(:show_content_options?) &&

data/set/right/content_options.rb

@@ -1,3 +1,5 @@
+assign_type :list
+
 def default_limit
   cql_limit = fetch_query.limit if respond_to?(:fetch_query)
   cql_limit || 50

data/set/self/input_options.rb

@@ -1,4 +1,4 @@
-include_set Abstract::Pointer
+include_set Abstract::List
 
 def content
   basket[:list_input_options].to_pointer_content

data/set/type/_reference_list_input_row.haml

@@ -0,0 +1,21 @@
+%div.input-group
+  %span.input-group-text.handle
+    = icon_tag :reorder
+  %span.input-group-text.text-muted.group-text-left.input-nest-syntax
+    = prefix
+  = name_field
+  %span.input-group-text.text-muted.group-text-middle.input-nest-syntax
+    = "|"
+  = options_field
+  %span.input-group-text.text-muted.group-text-end.input-nest-syntax
+    = postfix
+  .input-group-append
+    %span.input-group-text.p-0
+      %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
+        = icon_tag :remove
+  - if show_edit_button
+    .input-group-append.ml-2
+      %span.input-group-text.p-0.border-primary
+        %button.btn.btn-primary._open-nest-editor{ type: "button"}
+          = icon_tag :edit
+

data/set/type/link_list.rb

@@ -1,4 +1,5 @@
 include_set Abstract::Items
+include_set Abstract::ReferenceList
 
 def raw_item_strings content
   reference_chunks(content).map(&:referee_name)
@@ -10,10 +11,12 @@ def item_titles default_to_name=true
   end
 end
 
-format do
-  def chunk_list
-    :references
-  end
+def standardize_item string
+  string.match?(/^\[/) ? string : "[[#{string}]]"
+end
+
+def to_pointer_content
+  map { |item| item.to_s.strip }.join "\n"
 end
 
 format :html do

data/set/type/link_list_input.haml

@@ -0,0 +1,21 @@
+.nest-form-header
+  = haml_partial :reference_list_input_row,
+                 name_field: header_field("Link target"),
+                 options_field: header_field("Link text"),
+                 postfix: "}}",
+                 prefix: "{{",
+                 show_edit_button: false
+%ul{class: ul_classes}
+  - items.each.with_index do |(reference, title), index|
+    %li.pointer-li.mb-2._nest-form{"data-index": index}
+      = haml_partial :reference_list_input_row,
+                     name_field: name_autocomplete_field(reference, "_reference pointer-item-text form-control group-text-middle"),
+                     options_field: text_field_tag("pointer_item_title", title, class: "_title pointer-item-text form-control group-text-middle"),
+                     prefix: "[[",
+                     postfix: "]]",
+                     show_edit_button: false
+
+%span.input-group
+  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
+    = icon_tag "add"
+    add another

data/set/type/list.rb

@@ -1,10 +1 @@
-include_set Abstract::Pointer
-
-format :html do
-  view :view_list do
-    %i[info_bar bar box closed titled labeled].map do |view|
-      voo.items[:view] = view
-      wrap_with :p, [content_tag(:h3, "#{view} items"), render_content]
-    end
-  end
-end
+include_set Abstract::List

data/set/type/nest_list.rb

@@ -1,4 +1,5 @@
 include_set Abstract::Items
+include_set Abstract::ReferenceList
 
 def raw_item_strings content
   reference_chunks(content).map(&:referee_raw_name)
@@ -12,12 +13,6 @@ def items_content array
   standardized_items(array).join "\n"
 end
 
-format do
-  def chunk_list
-    :references
-  end
-end
-
 format :html do
   def input_type
     :nest_list

data/set/type/nest_list_input.haml

@@ -0,0 +1,21 @@
+.nest-form-header
+  = haml_partial :reference_list_input_row,
+                 name_field: header_field("Name"),
+                 options_field: header_field("Options"),
+                 postfix: "}}",
+                 prefix: "{{",
+                 show_edit_button: false
+%ul{class: ul_classes}
+  - items.each.with_index do |(reference, title), index|
+    %li.pointer-li.mb-2._nest-form{"data-index": index}
+      = haml_partial :reference_list_input_row,
+                     name_field: name_autocomplete_field(reference, "_reference pointer-item-text form-control group-text-middle"),
+                     options_field: text_field_tag("pointer_item_title", title, class: "_title _nest-options pointer-item-text form-control group-text-middle"),
+                     prefix: "{{",
+                     postfix: "}}",
+                     show_edit_button: true
+
+%span.input-group
+  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
+    = icon_tag "add"
+    add another

data/set/type/pointer.rb

@@ -1,10 +1 @@
-include_set Abstract::Pointer
-
-format :html do
-  view :view_list do
-    %i[info_bar bar box closed titled labeled].map do |view|
-      voo.items[:view] = view
-      wrap_with :p, [content_tag(:h3, "#{view} items"), render_content]
-    end
-  end
-end
+include_set Abstract::List

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-list
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -61,34 +61,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- assets/script/pointer_config.js.coffee
+- assets/script/pointer_list_editor.js.coffee
+- assets/style/list.scss
+- config/locales/de.yml
+- config/locales/en.yml
+- data/files/mod_list_script_asset_output/file.js
+- data/real.yml
+- data/test.yml
 - db/migrate_core_cards/20160804112340_add_pointer_cards.rb
 - db/migrate_core_cards/20211107155032_out_with_the_brackets.rb
-- set/abstract/01_pointer.rb
-- set/abstract/01_pointer/events.rb
-- set/abstract/01_pointer/html_views.rb
-- set/abstract/01_pointer/html_views/autocomplete_input.haml
-- set/abstract/01_pointer/html_views/checkbox_input.haml
-- set/abstract/01_pointer/html_views/filter.rb
-- set/abstract/01_pointer/html_views/filter/filter_items.haml
-- set/abstract/01_pointer/html_views/filter/filtered_list_input.haml
-- set/abstract/01_pointer/html_views/list_input.haml
-- set/abstract/01_pointer/html_views/list_item.haml
-- set/abstract/01_pointer/html_views/radio_input.haml
-- set/abstract/01_pointer/options_api.rb
-- set/abstract/01_pointer/other_views.rb
-- set/abstract/code_pointer.rb
-- set/abstract/id_pointer.rb
+- set/abstract/01_list.rb
+- set/abstract/01_list/events.rb
+- set/abstract/01_list/html_views.rb
+- set/abstract/01_list/html_views/checkbox_input.haml
+- set/abstract/01_list/html_views/click_select_input.haml
+- set/abstract/01_list/html_views/list_input.haml
+- set/abstract/01_list/html_views/list_item.haml
+- set/abstract/01_list/html_views/radio_input.haml
+- set/abstract/01_list/options_api.rb
+- set/abstract/01_list/other_views.rb
+- set/abstract/codename_list.rb
+- set/abstract/delist.rb
+- set/abstract/id_list.rb
+- set/abstract/reference_list.rb
 - set/all/supports_content_options.rb
 - set/right/content_option_view.rb
 - set/right/content_options.rb
 - set/self/content_option_view.rb
 - set/self/content_options.rb
 - set/self/input_options.rb
+- set/type/_reference_list_input_row.haml
 - set/type/link_list.rb
-- set/type/link_list/link_list_input.haml
+- set/type/link_list_input.haml
 - set/type/list.rb
 - set/type/nest_list.rb
-- set/type/nest_list/nest_list_input.haml
+- set/type/nest_list_input.haml
 - set/type/pointer.rb
 homepage: https://decko.org
 licenses:
@@ -100,6 +108,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: list
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -115,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: list of cards

data/set/abstract/01_pointer/html_views/autocomplete_input.haml

@@ -1,3 +0,0 @@
-.pointer-list-editor.pointer-list-ul
-  = text_field_tag 'pointer_item', item, class: "pointer-item-text form-control",
-                                         "data-options-card": options_card

data/set/abstract/01_pointer/html_views/filter/filter_items.haml

@@ -1,28 +0,0 @@
-._filter-items.container-fluid.nodblclick._noFilterUrlUpdates
-  .row
-    = nest filter_card, view: :filter_form
-    ._unselected.col-6.border.mt-2.px-0
-      = nest filter_card, view: :select_item,
-                          items: { view: implicit_item_view },
-                          cql: { limit: 10 }
-    ._selected.col-6.border.mt-2.pl-0.pr-0
-      .selected-box
-        .card-header
-          %h5
-            Selected
-            .badge.badge-secondary
-              %span._selected-items 0
-        ._selected-item-list{ style: "display:none" }
-          .deselector.p-2
-            %input#deselect-all._deselect-all{ type: "checkbox", checked: true, disabled: true }
-            %label{ for: "deselect-all" }
-              deselect
-              %span._selected-items 0
-              following
-          ._selected-bin.p-2
-      ._filter-help.alert.alert-secondary
-        Filter and select items to add them here.
-      .form-group
-        .selected-item-buttons.p-2
-          = button_tag "Cancel", class: "cancel-modal", data: { dismiss: :modal }
-          = render :add_selected_link

data/set/abstract/01_pointer/html_views/filter/filtered_list_input.haml

@@ -1,16 +0,0 @@
-%div.filtered-list-editor
-  %ul.pointer-list.filtered-list-review._pointer-filtered-list.list-group.vertical.p-0
-    - card.item_cards(context: :raw).each do |item_card|
-      %li._filtered-list-item.clearfix{ data: item_card.format.wrap_data(false) }
-        %span._handle.float-left.m-2
-          = icon_tag :reorder
-        - nest_item item_card do |rendered, view|
-          %span{ class: "item-#{view} float-left w-75"}
-            = rendered
-        %span.filtered-list-item-button
-          %button._filtered-list-item-delete.btn.btn-secondary.btn-sm.m-2{:type => "button"}
-            = icon_tag :remove
-  %br
-  .clearfix
-    = add_item_modal_link
-

data/set/abstract/01_pointer/html_views/filter.rb

@@ -1,63 +0,0 @@
-format :html do
-  view :filtered_list, unknown: true do
-    filtered_list_input
-  end
-
-  view :filter_items_modal, unknown: true, wrap: :modal do
-    render_filter_items
-  end
-
-  view :filter_items, unknown: true, wrap: :slot, template: :haml
-
-  def filtered_list_input
-    with_nest_mode :normal do
-      class_up "card-slot", filtered_list_slot_class
-      with_class_up "card-slot", filtered_list_slot_class do
-        wrap do
-          haml :filtered_list_input
-        end
-      end
-    end
-  end
-
-  # NOCACHE because params alter view
-  view :add_selected_link, cache: :never, unknown: true do
-    link_to "Add Selected",
-            path: { filter_card: params[:filter_card] },
-            class: "_add-selected slotter _close-modal btn btn-primary disabled",
-            data: { "slot-selector": ".#{params[:slot_selector]}",
-                    "item-selector": ".#{params[:item_selector]}",
-                    remote: true }
-  end
-
-  def filtered_list_item item_card
-    nest_item item_card do |rendered, item_view|
-      wrap_item rendered, item_view
-    end
-  end
-
-  # for override
-  # @return [Card] search card on which filtering is based
-  def filter_card
-    filter_card_from_params || default_filter_card
-  end
-
-  def default_filter_card
-    fcard = card.options_card
-    return fcard if fcard.respond_to? :cql_hash
-
-    fcard.fetch :referred_to_by, new: {}
-  end
-
-  def filter_card_from_params
-    return unless params[:filter_card]
-
-    Card.fetch params[:filter_card], new: {}
-  end
-
-  # currently actually used as a class
-  # (because we don't have api to override slot's id)
-  def filtered_list_slot_class
-    @filtered_list_slot_class ||= "filtered-list-#{unique_id}"
-  end
-end

data/set/type/link_list/link_list_input.haml

@@ -1,24 +0,0 @@
-%ul{class: ul_classes}
-  - items.each.with_index do |(reference, title), index|
-    %li.pointer-li.mb-1{"data-index": index}
-      %span.input-group
-        .input-group-prepend.handle
-          %span.input-group-text
-            = icon_tag :reorder
-        %span.input-group-text.text-muted.group-text-left
-          [[
-        = text_field_tag "pointer_item", reference, class: "_reference pointer-item-text form-control group-text-middle",
-                                               "data-options-card": options_card
-        %span.input-group-text.text-muted.group-text-middle
-          |
-        = text_field_tag "pointer_item_title", title, class: "_title pointer-item-text form-control group-text-middle"
-        %span.input-group-text.text-muted.group-text-right
-          ]]
-        .input-group-append
-          %span.input-group-text.p-0
-            %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
-              = icon_tag :remove
-%span.input-group
-  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
-    = icon_tag "add"
-    add another

data/set/type/nest_list/nest_list_input.haml

@@ -1,28 +0,0 @@
-%ul{class: ul_classes}
-  - items.each.with_index do |(reference, title), index|
-    %li.pointer-li.mb-1._nest-form{"data-index": index}
-      %span.input-group
-        .input-group-prepend.handle
-          %span.input-group-text
-            = icon_tag :reorder
-        %span.input-group-text.text-muted.group-text-left
-          {{
-        = text_field_tag "pointer_item", reference, class: "_reference pointer-item-text form-control group-text-middle"
-        %span.input-group-text.text-muted.group-text-middle
-          = "|"
-        = text_field_tag "pointer_item_title", title, class: "_title _nest-options pointer-item-text form-control group-text-middle"
-        %span.input-group-text.text-muted.group-text-right
-          }}
-        .input-group-append
-          %span.input-group-text.p-0
-            %button.btn.btn-secondary._open-nest-editor{ type: "button"}
-              = icon_tag :edit
-        .input-group-append
-          %span.input-group-text.p-0
-            %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
-              = icon_tag :remove
-
-%span.input-group
-  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
-    = icon_tag "add"
-    add another