ui_bibz 2.0.0.alpha28 → 2.0.0.alpha29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87cacb8d8195be40dd87fb7c98dea34e21d46504
-  data.tar.gz: 9e4ec75e0689f6e6684b37347c1778733cc6205a
+  metadata.gz: eba8735c72e14ff037beabdc38c39cdca776757f
+  data.tar.gz: a1fa0ddb5be8b7056ab83e32258249ccf49bed1c
 SHA512:
-  metadata.gz: 7978cf0ba0599e40319ee265823262d610c5c129a430f6baf5806d640e3be09ab4ffa8325c82d0ec7ce48d345cf1ad078bae4e2b045f333e51e6e6557681f505
-  data.tar.gz: bbaf9a314e70ccfcf5ada6429e864ae316a2515d2a336a19f761c0efdbfa00b09d7ae5acb54fddce75ca67aee13494d3fc0e2297a467e8e8a09b67e3374a0029
+  metadata.gz: dd839687955389dd26fe3a3e355ff4d7803ecff01982d2f83fd0eaf99bcb8517ea3facc18bdd88c716656f010dc2cdbe5508102162f7b5780cb88fcbe157e84b
+  data.tar.gz: 4710b15b4581678be50bb53b0efb12db286676b1b15baafb5c39eff30161d0989105712ae83650529bf0e258f506ae9c6a660a513140c8fc0ad32be06a230554

data/Gemfile

@@ -19,4 +19,5 @@ gemspec
 
 # To use a debugger
 #gem 'byebug',        group: [:development, :test]
-gem 'simple_form',   group: :test
+gem 'simple_form',   group: [:test, :development]
+gem 'awesome_print', group: [:test, :development]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (2.0.0.alpha28)
+    ui_bibz (2.0.0.alpha29)
       bootstrap (= 4.0.0.alpha5)
       font-awesome-sass
       haml
@@ -53,13 +53,14 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
-    autoprefixer-rails (6.7.6)
+    autoprefixer-rails (6.7.7)
       execjs
+    awesome_print (1.7.0)
     bootstrap (4.0.0.alpha5)
       autoprefixer-rails (>= 6.0.3)
       sass (>= 3.4.19)
     builder (3.2.3)
-    codeclimate-test-reporter (1.0.6)
+    codeclimate-test-reporter (1.0.7)
       simplecov
     concurrent-ruby (1.0.5)
     docile (1.1.5)
@@ -172,6 +173,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   codeclimate-test-reporter
   factory_girl_rails (~> 4.0)
   minitest

data/app/assets/javascripts/form.coffee

@@ -1,36 +1,37 @@
 @UiBibzForm = class Form
 
   constructor: ->
-    @switch()       if $('input.switch').length > 0
-    @inputConnected()
-    @selectPicker() if $('select.selectpicker').length > 0
-    @multiSelect()  if $('.multi-select').length > 0
-    @multiColumn()  if $('.multi-column').length > 0
-    @formula()      if $('.formula_field_input').length > 0
+    @switch()         if $('input.switch-field').length > 0
+    @inputConnected() if $('.ui-bibz-connect').length > 0
+    @selectPicker()   if $('.dropdown-select-field').length > 0
+    @multiSelect()    if $('.multi-select-field').length > 0
+    @multiColumn()    if $('.multi-column-field').length > 0
+    @formula()        if $('.formula-field').length > 0
 
   inputConnected: ->
     $('.ui-bibz-connect').inputConnected()
 
   selectPicker: ->
-    $('select.selectpicker').selectpicker
+    $('select.dropdown-select-field').selectpicker
       iconBase: 'fa'
       tickIcon: 'fa-check'
       style:    'btn-secondary'
+      showTick: false
 
   switch: ->
-    $('input.switch').bootstrapSwitch({ size: 'large' })
+    $('input.switch-field').bootstrapSwitch({ size: 'large' })
 
   multiSelect: ->
     # http://loudev.com/
-    $('.multi-select').each ->
+    $('.multi-select-field').each ->
       data = $(this).data()
       delete data["multiselect"]
-      data = Object.assign({ inheritClass: true }, data)
+      data = Object.assign({ buttonClass: 'btn btn-secondary', inheritClass: true }, data)
       $(this).multiselect(data)
 
   formula: ->
     me = this
-    formula_input_field = $('.formula_field_input')
+    formula_input_field = $('.formula-field')
     me.updateFormulaField(formula_input_field)
 
     formula_input_field.on 'keyup', ->
@@ -38,9 +39,9 @@
 
   updateFormulaField: (field) ->
     formulaInputField  = field
-    formulaSignField   = formulaInputField.siblings('.formula_field_sign')
-    formulaResultField = formulaInputField.siblings('.formula_field_result')
-    formulaAlert       = formulaInputField.siblings('.formula_field_alert')
+    formulaSignField   = formulaInputField.siblings('.formula-field-sign')
+    formulaResultField = formulaInputField.siblings('.formula-field-result')
+    formulaAlert       = formulaInputField.siblings('.formula-field-alert')
 
     f        = new window.UiBibzFormula()
     result   = f.go(formulaInputField.val())
@@ -66,43 +67,4 @@
       formulaInputField.removeClass('fix-border-right')
 
   multiColumn: ->
-    $(".multi-column").multiSelect()
-    # $('.multi-column').each ->
-    #   data = $(this).data()
-    #   delete data["multiselect"]
-    #   if data["searchable"]
-    #     $(this).multiSelect
-    #       selectableOptgroup: if data["selectableOptgroup"] then true else false
-    #       selectableHeader:  "<input type='text' class='search-input form-control' autocomplete='off' placeholder='Search in selectable items'><br/>"
-    #       selectionHeader:   "<input type='text' class='search-input form-control' autocomplete='off' placeholder='Search in selected items'><br/>"
-    #       afterInit: (ms) ->
-    #         that                   = this
-    #         $selectableSearch      = that.$selectableUl.siblings('input')
-    #         $selectionSearch       = that.$selectionUl.siblings('input')
-    #         $selectionSearch       = that.$selectionUl.siblings('input')
-    #         selectableSearchString = "#" + that.$container.attr("id") + " .ms-elem-selectable:not(.ms-selected)"
-    #         selectionSearchString  = "#" + that.$container.attr("id") + " .ms-elem-selection.ms-selected"
-
-    #         that.qs1 = $selectableSearch.quicksearch(selectableSearchString).on("keydown", (e) ->
-    #           if e.which is 40
-    #             that.$selectableUl.focus()
-    #             false
-    #         )
-    #         that.qs2 = $selectionSearch.quicksearch(selectionSearchString).on("keydown", (e) ->
-    #           if e.which is 40
-    #             that.$selectionUl.focus()
-    #             false
-    #         )
-    #         return
-
-    #       afterSelect: ->
-    #         @qs1.cache()
-    #         @qs2.cache()
-    #         return
-
-    #       afterDeselect: ->
-    #         @qs1.cache()
-    #         @qs2.cache()
-    #         return
-    #   else
-    #     $(this).multiSelect(data)
+    $(".multi-column-field").multiSelect()

data/app/assets/javascripts/input-connected.coffee

@@ -1,25 +1,46 @@
 (($) ->
 
   updateOptionsHtml = (data, componentTarget) ->
-    componentTarget.children('option').remove()
+    componentTarget.children('option:not([value=""])').remove()
+
+    if Array.isArray(data)
+      appendToElement(data, componentTarget)
+    else
+      $.each data, (k,v) ->
+        updateOptionsHtml(data, componentTarget)
+        optgroup = $("<optgroup></optgroup>").attr("label", k)
+        appendToElement(v, optgroup)
+        componentTarget.append(optgroup)
+
+  appendToElement = (data, element) ->
     data.forEach (opt) ->
-      componentTarget.append($("<option></option>").attr("value", opt.value).text(opt.text))
+      element.append($("<option></option>").attr("value", opt.value).text(opt.text))
 
-  updateTargetComponent = (data, componentTarget) ->
+  updateTargetComponent = (data, componentTarget, component) ->
     updateOptionsHtml(data, componentTarget)
-    componentTarget.multiSelect('refresh')  if componentTarget.hasClass('multi-column')
-    componentTarget.selectpicker('refresh') if componentTarget.hasClass('selectpicker')
-    componentTarget.multiselect('rebuild')  if componentTarget.hasClass('multi-select')
+    updateTargetRefreshButton(componentTarget, component)
+    componentTarget.multiSelect('refresh')  if componentTarget.hasClass('multi-column-field')
+    componentTarget.selectpicker('refresh') if componentTarget.hasClass('dropdown-select-field')
+    componentTarget.multiselect('rebuild')  if componentTarget.hasClass('multi-select-field')
+    componentTarget.change()
+
+  updateTargetRefreshButton = (componentTarget, component) ->
+    if hasRefreshButton(componentTarget)
+      refreshBtn = componentTarget.parents('.input-group').find('.input-refresh-button')
+      refreshBtn.attr('value', component.val()).attr('name', component.attr('name'))
+
+  hasRefreshButton = (component) ->
+    component.parents('.input-group').hasClass('field-refresh')
 
   $.fn.inputConnected = (options) ->
 
     defaults =
-      mode:        "remote"
-      events:      "change"  # change, click, ...
+      mode:        "remote"  # String: remote || local
+      events:      "change"  # String: change, click, ...
       target:
-        url:        null     # url for remote connection
-        selector:   null     # component target id
-        data: []             # data for local connection
+        url:        null     # String: url for remote connection
+        selector:   null     # String: component target id or class
+        data: []             # Array : data for local connection
         # Add a proxy
         # Proxy:
         #  url:    null
@@ -46,13 +67,16 @@
 
       component.on events, (e) ->
         e.preventDefault()
-        componentTarget.empty()
         values = component.val()
 
+        name = component.attr('name')
+        name = if name? then name.replace(' ', '_').split('[')[0] else "id"
+        name = if Array.isArray(values) then "#{ name }s" else name
+
         if mode == "remote"
-          params = if Array.isArray(values) then { ids: values } else { id: values }
+          params = { "#{ name }": values }
           $.ajax({ url: target.url, data: params }).done (data) ->
-            updateTargetComponent(data, componentTarget)
+            updateTargetComponent(data, componentTarget, component)
 
         if mode == "local"
           data = target.data || settings.target.data
@@ -60,6 +84,6 @@
             values = [].concat.apply([], [values]) # flatten
             return values.includes(String(value.connect_option_id))
 
-          updateTargetComponent(data, componentTarget)
+          updateTargetComponent(data, componentTarget, component)
 
 )(jQuery)

data/app/assets/javascripts/table.coffee

@@ -10,12 +10,13 @@
   # Submit form when per_page select changing
   submitPerPageSelect: ->
     $('.table-pagination-per-page select').change () ->
+      $(this).parents('form').find('input[name=link_type]').val('per_page')
       $(this).parents('form').submit()
 
   # Clear search
   clearSearch: ->
-    $('.table-search-field .clear-search-btn').click () ->
-      $(this).prev().val('')
+    $('.clear-search-btn').click () ->
+      $(this).parents('form').find('input[type=search]').val('')
       $(this).parents('form').submit()
 
   # Resize search field

data/app/assets/stylesheets/fix-dropdown-select.sass

@@ -240,3 +240,9 @@ div.bootstrap-select
   .hidden
     display: none
 
+.field-refresh
+  .input-refresh-button
+    padding: 0.62rem 1rem
+
+.multiselect-container > li > a > label
+  padding: 3px 1.5rem

data/app/assets/stylesheets/ui_bibz.sass

@@ -71,10 +71,9 @@ select.form-control
     border-bottom-right-radius: 0 !important
     border-top-right-radius: 0 !important
   width: 100%
-  .formula_field_sign
+  .formula-field-sign
     width: auto
     min-width: 16px
-    padding: 4px 5px
     font-weight: 400
     line-height: 1.42857143
     text-align: center
@@ -83,13 +82,14 @@ select.form-control
     background-color: #eee
     border: solid #ccc
     border-width: 1px 0
+    padding: 0.5rem 0.75rem
     margin-left: -5px
     margin-right: -5px
     border-left: none
     border-right: none
   .form-control[readonly]
     background-color: white
-  .formula_field_alert, .formula_field_result, .formula_field_sign
+  .formula-field_alert, .formula-field-result, .formula-field-sign
     display: none
 
 .select-field-refresh

data/app/inputs/custom_inputs/{autocomplete_input.rb → auto_complete_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class AutocompleteInput < SimpleForm::Inputs::CollectionInput
+  class AutoCompleteFieldInput < SimpleForm::Inputs::CollectionInput
     include UiBibz::Ui::Core::Forms::Texts
     include ActionView::Helpers::FormOptionsHelper
 
@@ -9,7 +9,7 @@ module CustomInputs
       options = options.merge({ builder: @builder })
       options = options.merge(option_tags: options_from_collection_for_select(collection, label_method, label_method))
 
-      UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new(attribute_name, options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(attribute_name, options, input_html_options).render
     end
   end
 end

data/app/inputs/custom_inputs/{dropdown_select_input.rb → collection_input.rb}

@@ -1,23 +1,30 @@
 module CustomInputs
-  class DropdownSelectInput < SimpleForm::Inputs::CollectionInput
+  class CollectionInput < SimpleForm::Inputs::CollectionInput
     include UiBibz::Ui::Core::Forms::Selects
+    include ActionView::Helpers::FormOptionsHelper
+
+    def input_html_options
+      opts = super
+      opts = opts.merge({ prompt: options[:prompt] })               unless options[:prompt].blank?
+      opts = opts.merge({ disabled: options[:disabled] })           unless options[:disabled].blank?
+      opts = opts.merge({ include_blank: options[:include_blank] }) unless options[:include_blank].blank?
+      opts = opts.merge({ multiple: options[:multiple] })           unless options[:multiple].blank?
+      opts
+    end
 
-    def input(wrapper_options)
+    def new_options
       label_method, value_method = detect_collection_methods
-      i = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(attribute_name, options, input_html_options)
-
       if options[:grouped] == true
-        @builder.grouped_collection_select(
-          attribute_name, grouped_collection,
+        options.merge({ option_tags: option_groups_from_collection_for_select(
+          grouped_collection,
           group_method, group_label_method,
           value_method, label_method,
-          input_options, i.html_options
-        )
+          input_options
+        )})
       else
-        @builder.collection_select(
-         attribute_name, collection, value_method, label_method,
-         input_options, i.html_options
-        )
+        options.merge({ option_tags: options_from_collection_for_select(
+          collection, value_method, label_method, input_options
+        )})
       end
     end
 

data/app/inputs/custom_inputs/{date_picker_input.rb → date_picker_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class DatePickerInput < SimpleForm::Inputs::StringInput
+  class DatePickerFieldInput < SimpleForm::Inputs::StringInput
     include UiBibz::Ui::Core::Forms::Dates
 
     def input(wrapper_options)

data/app/inputs/custom_inputs/dropdown_select_field_input.rb

@@ -0,0 +1,9 @@
+module CustomInputs
+  class DropdownSelectFieldInput < CollectionInput
+
+    def input(wrapper_options)
+      UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(attribute_name, new_options, input_html_options).render
+    end
+
+  end
+end

data/app/inputs/custom_inputs/{formula_input.rb → formula_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class FormulaInput < SimpleForm::Inputs::StringInput
+  class FormulaFieldInput < SimpleForm::Inputs::StringInput
     include UiBibz::Ui::Core::Forms::Numbers
 
     def input(wrapper_options)

data/app/inputs/custom_inputs/{markdown_editor_input.rb → markdown_editor_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class MarkdownEditorInput < SimpleForm::Inputs::StringInput
+  class MarkdownEditorFieldInput < SimpleForm::Inputs::StringInput
     include UiBibz::Ui::Core::Forms::Textareas
 
     def input(wrapper_options)

data/app/inputs/custom_inputs/{multi_column_input.rb → multi_column_field_input.rb}

@@ -1,6 +1,6 @@
 module CustomInputs
   # multi_column_input manages collection and grouped_collection
-  class MultiColumnInput < SimpleForm::Inputs::CollectionInput
+  class MultiColumnFieldInput < SimpleForm::Inputs::CollectionInput
     include UiBibz::Ui::Core::Forms::Selects
 
     def input(wrapper_options)

data/app/inputs/custom_inputs/multi_select_field_input.rb

@@ -0,0 +1,9 @@
+module CustomInputs
+  class MultiSelectFieldInput < CollectionInput
+
+    def input(wrapper_options)
+      UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new(attribute_name, new_options, input_html_options).render
+    end
+
+  end
+end

data/app/inputs/custom_inputs/{radios_input.rb → radio_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class RadiosInput < SimpleForm::Inputs::CollectionRadioButtonsInput
+  class RadioFieldInput < SimpleForm::Inputs::CollectionRadioButtonsInput
     include UiBibz::Ui::Core::Forms::Choices
 
     def input(wrapper_options)

data/app/inputs/custom_inputs/select_field_input.rb

@@ -0,0 +1,8 @@
+module CustomInputs
+  class SelectFieldInput < CollectionInput
+
+    def input(wrapper_options)
+      UiBibz::Ui::Core::Forms::Selects::SelectField.new(attribute_name, new_options, input_html_options).render
+    end
+  end
+end

data/app/inputs/custom_inputs/{surround_input.rb → surround_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class SurroundInput < SimpleForm::Inputs::StringInput
+  class SurroundFieldInput < SimpleForm::Inputs::StringInput
     include UiBibz::Ui::Core::Forms::Texts
 
     def input(wrapper_options)

data/app/inputs/custom_inputs/{switch_input.rb → switch_field_input.rb}

@@ -1,5 +1,5 @@
 module CustomInputs
-  class SwitchInput < SimpleForm::Inputs::Base
+  class SwitchFieldInput < SimpleForm::Inputs::Base
     include UiBibz::Ui::Core::Forms::Choices
 
     def input(wrapper_options)

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -42,13 +42,14 @@ module UiBibz::Concerns::Models::Searchable
         @tmp_params = {
           search:    @params[:search],
           per_page:  @params[:per_page],
-          page:      @params[:page],
+          page:      self.new_search? ? nil : @params[:page],
           sort:      @params[:sort],
           direction: @params[:direction]
         }
       end
     end
 
+
     def self.search
       sql         = all
       column_args = get_column_args
@@ -146,6 +147,10 @@ module UiBibz::Concerns::Models::Searchable
     def self.is_good_store_id?
       @arguments[:store_id] == @params[:store_id]
     end
+
+    def self.new_search?
+      @params[:link_type] == 'search'
+    end
   end
 
   module ClassMethods

data/lib/ui_bibz/helpers/ui_core_helper.rb

@@ -174,8 +174,8 @@ module UiBibz::Helpers::UiCoreHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def autocomplete_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new(content, options, html_options, &block).render
+  def auto_complete_field content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options, html_options, &block).render
   end
 
   # Input section end ----------------------------------------------------

data/lib/ui_bibz/ui/core/component.rb

@@ -90,7 +90,6 @@ module UiBibz::Ui::Core
 
     # Override this method to add html data
     def component_html_data
-      add_html_data('connect', options[:connect]) if options[:connect]
     end
 
     # Override this method to add html Options

data/lib/ui_bibz/ui/core/connected_component.rb

@@ -0,0 +1,80 @@
+module UiBibz::Ui::Core
+
+  # Creates a connected component of the given +name+ using options created by the set of +options+.
+  #
+  # ==== Attributes
+  #
+  # * +content+ -   Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  # * +status+ - status of élement with symbol value:
+  #   (+:default+, +:primary+, +:info+, +:warning+, +:danger+)
+  # * +glyph+ - Add glyph with name or hash options
+  #   * +name+ - String
+  #   * +size+ - Integer
+  #   * +type+ - Symbol
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Component.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Component.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Component.new(content, { type: :success, glyph: 'eye' }, { class: 'test' })
+  #   # or
+  #   UiBibz::Ui::Core::Component.new({glyph: { name: 'eye', size: 3}, { class: 'test' }) do
+  #     content
+  #   end
+  #
+  class ConnectedComponent < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      super
+    end
+
+    protected
+
+    def refresh_render
+      content_tag :div, class: 'input-group field-refresh' do
+        concat select_tag content, options[:option_tags], html_options
+        concat refresh_btn_html
+      end
+    end
+
+    def component_html_data
+      connect_options
+    end
+
+    private
+
+    def connect_opts
+      selector = options[:refresh][:target][:selector]
+      options[:refresh][:target][:selector] = selector.blank? ? "##{ content.to_s.parameterize.underscore }" : selector
+      options[:refresh]
+    end
+
+    def refresh_btn_html
+      content_tag(:span, UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh.new('', connect: connect_opts).render, class: 'input-group-btn')
+    end
+
+    def connect_options
+      add_html_data('connect', options[:connect]) if options[:connect]
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/forms/buttons/button.rb

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Forms::Buttons
   #  button(options = {}, html_options = {}) do
   #    content
   #  end
-  class Button < UiBibz::Ui::Core::Component
+  class Button < UiBibz::Ui::Core::ConnectedComponent
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block

data/lib/ui_bibz/ui/core/forms/buttons/button_refresh.rb

@@ -57,7 +57,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     private
 
     def component_options
-      options[:connect] = connect_options
+      options[:connect] = cnt_opts
       { glyph: 'refresh', status: options[:status] }
     end
 
@@ -65,10 +65,10 @@ module UiBibz::Ui::Core::Forms::Buttons
       ['input-refresh-button', 'btn']
     end
 
-    def connect_options
+    def cnt_opts
       {
         events: options[:connect].try(:[], :events) || "click",
-        mode:   options[:connect].try(:[], :type)   || "remote",
+        mode:   options[:connect].try(:[], :mode)   || "remote",
         target: {
           selector: options[:connect].try(:[], :target).try(:[], :selector) || "",
           url:      options[:connect].try(:[], :target).try(:[], :url)      || "",

data/lib/ui_bibz/ui/core/forms/choices/switch_field.rb

@@ -65,7 +65,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def component_html_classes
-      "switch"
+      "switch-field"
     end
 
     def component_html_data