para 0.7.1 → 0.7.2

data/vendor/assets/javascripts/jquery.remote-modal-form.coffee

@@ -2,10 +2,25 @@
 # forms feature, without having to write any extra javascript
 #
 class @RemoteModalForm extends Vertebra.View
+  @setLoading = ($el) ->
+    return unless $el and $el.length
+
+    unless $el.data('loading-text')
+      $el.data('loading-text', '<i class="fa fa-spinner fa-spin"></i>')
+
+    $el.button('loading')
+
+  @resetLoading = ($el) ->
+    return unless $el and $el.length
+    $el?.button('reset')
+
   events:
     'ajax:success form[data-remote]': 'formSuccess'
     'ajax:success a[data-remote]': 'pageLoaded'
     'ajax:error [data-remote]': 'formError'
+    'ajax:beforeSend form[data-remote]': 'formBeforeSend'
+    'ajax:beforeSend a[data-remote]': 'linkBeforeSend'
+    'ajax:aborted:file [data-remote]': 'handleFormWithFiles'
     'hidden.bs.modal': 'modalHidden'
     'hide.bs.modal': 'modalHide'
 
@@ -16,13 +31,50 @@ class @RemoteModalForm extends Vertebra.View
     @trigger('shown')
 
   formSuccess: (e, response) ->
-    @formDidSuccess = true
     @handleModalResponse(response)
     @trigger('success')
+    @formDidSuccess = true
 
   formError: (e, jqXHR) ->
     @replaceModalWith(jqXHR.responseText)
     @trigger('error')
+    @formDidSuccess = false
+
+  # Intercept form jquery-ujs form submission when there are non-blank file
+  # inputs in the `remote` form, so we can submit the form through FormData or
+  # jquery.iframe-transport depending on browser support.
+  #
+  # Note that iframe transport does not allow us to track upload progress.
+  #
+  handleFormWithFiles: (e) ->
+    if RemoteFileForm?.supported
+      form = new RemoteFileForm(el: e.target)
+      form.on('progress', @onFormUploadProgress)
+    else
+      @submitWithIframe($(e.currentTarget))
+
+    return false
+
+  submitWithIframe: ($form) ->
+    jqXHR = jQuery.ajax
+      url: $form.attr('action')
+      method: $form.attr('method')
+      files: $form.find(':file')
+      iframe: true
+      data: $form.find('input:not(:file), textarea, select').serializeArray()
+      processData: false
+
+    jqXHR
+      .done (data) => @formSuccess(null, data)
+      .fail (jqXHR) => @formError(null, jqXHR)
+
+  onFormUploadProgress: (e) =>
+    return unless e.originalEvent.lengthComputable
+    # Build rounded progress
+    progress = (e.originalEvent.loaded / e.originalEvent.total) 
+    progress = Math.round(progress * 10000) / 100
+    # Display it in the submit button
+    @$(':submit').text(progress + '%')
 
   pageLoaded: (e, response) ->
     @handleModalResponse(response)
@@ -35,7 +87,20 @@ class @RemoteModalForm extends Vertebra.View
 
   replaceModalWith: (modalMarkup) ->
     @hideModal()
-    @setElement($(modalMarkup).appendTo('body').modal())
+
+    # We try to find a modal in the returned elements from the server
+    $modal = $(modalMarkup).filter('.modal').eq(0)
+    # If there are no modal, we try to find a modal inside the returned elements
+    $modal = $modal.find('.modal') unless $modal.length
+    # If no modal is finally found, we return and don't do anything
+    return unless $modal.length
+
+    # Initialize the returned modal
+    $modal.appendTo('body')
+    $modal.modal()
+
+    # Configure the remote modal class to use the new modal and show it
+    @setElement($modal)
     @$el.data('remote-modal-form', this)
     @showModal()
 
@@ -53,6 +118,12 @@ class @RemoteModalForm extends Vertebra.View
     @trigger('hide')
     @trigger('close') if @$el[0] is $(e.currentTarget)[0]
 
+  formBeforeSend: (e) ->
+    RemoteModalForm.setLoading(@$(':submit'))
+
+  linkBeforeSend: (e) ->
+    RemoteModalForm.setLoading($(e.currentTarget))
+
   refreshPage: ->
     Turbolinks.reloadPage() if @refreshOnClose and @formDidSuccess
 
@@ -63,5 +134,12 @@ class @RemoteModalForm extends Vertebra.View
 # Lazy initialization when the link target is loaded
 #
 $(document).on 'page:change turbolinks:load', ->
+  $('body').on 'ajax:beforeSend', '[data-remote-modal-form]', (e) ->
+    RemoteModalForm.setLoading($(e.currentTarget))
+
+  $('body').on 'ajax:error', '[data-remote-modal-form]', (e) ->
+    RemoteModalForm.resetLoading($(e.currentTarget))
+
   $('body').on 'ajax:success', '[data-remote-modal-form]', (e, response) ->
+    RemoteModalForm.resetLoading($(e.currentTarget))
     new RemoteModalForm(modalMarkup: response, $link: $(e.currentTarget))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,14 +96,14 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cocoon
   requirement: !ruby/object:Gem::Requirement
@@ -208,14 +208,14 @@ dependencies:
   name: deep_cloneable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
 - !ruby/object:Gem::Dependency
@@ -511,6 +511,7 @@ files:
 - app/assets/stylesheets/admin/app.sass
 - app/assets/stylesheets/para/admin.sass
 - app/assets/stylesheets/para/admin/main.sass
+- app/assets/stylesheets/para/admin/src/_affix.sass
 - app/assets/stylesheets/para/admin/src/_alert.sass
 - app/assets/stylesheets/para/admin/src/_base.sass
 - app/assets/stylesheets/para/admin/src/_bootstrap-variables.scss
@@ -554,6 +555,7 @@ files:
 - app/controllers/para/admin/imports_controller.rb
 - app/controllers/para/admin/jobs_controller.rb
 - app/controllers/para/admin/main_controller.rb
+- app/controllers/para/admin/nested_forms_controller.rb
 - app/controllers/para/admin/resources_controller.rb
 - app/controllers/para/admin/search_controller.rb
 - app/controllers/para/admin/settings_component_controller.rb
@@ -563,10 +565,12 @@ files:
 - app/decorators/para/component/form_decorator.rb
 - app/decorators/para/component/settings_decorator.rb
 - app/decorators/para/component_section_decorator.rb
+- app/exporters/call_for_projects_votes_exporter.rb
 - app/helpers/para/admin/base_helper.rb
 - app/helpers/para/admin/component_groups_helper.rb
 - app/helpers/para/admin/components_helper.rb
 - app/helpers/para/admin/decorators_helper.rb
+- app/helpers/para/admin/history_helper.rb
 - app/helpers/para/admin/page_helper.rb
 - app/helpers/para/admin/pagination_helper.rb
 - app/helpers/para/admin/resources_helper.rb
@@ -609,6 +613,7 @@ files:
 - app/views/para/admin/jobs/_progress.html.haml
 - app/views/para/admin/jobs/show.html.haml
 - app/views/para/admin/main/index.html.haml
+- app/views/para/admin/nested_forms/show.html.haml
 - app/views/para/admin/resources/_actions.html.haml
 - app/views/para/admin/resources/_add_button.html.haml
 - app/views/para/admin/resources/_exports_menu.html.haml
@@ -618,11 +623,13 @@ files:
 - app/views/para/admin/resources/_imports_menu.html.haml
 - app/views/para/admin/resources/_list.html.haml
 - app/views/para/admin/resources/_per_page_select.html.haml
+- app/views/para/admin/resources/_remote_nested_form.html.haml
 - app/views/para/admin/resources/_subclassable_add_button.html.haml
 - app/views/para/admin/resources/_table.html.haml
 - app/views/para/admin/resources/_tree.html.haml
 - app/views/para/admin/resources/_tree_item.html.haml
 - app/views/para/admin/resources/edit.html.haml
+- app/views/para/admin/resources/history/_index.html.haml
 - app/views/para/admin/resources/new.html.haml
 - app/views/para/admin/search/_result.html.haml
 - app/views/para/admin/search/index.html.haml
@@ -715,6 +722,7 @@ files:
 - lib/para/cloneable.rb
 - lib/para/component.rb
 - lib/para/component/exportable.rb
+- lib/para/component/history.rb
 - lib/para/component/importable.rb
 - lib/para/component/subclassable.rb
 - lib/para/components_cleaner.rb
@@ -732,6 +740,7 @@ files:
 - lib/para/ext/active_job_status.rb
 - lib/para/ext/active_record_nested_attributes.rb
 - lib/para/ext/paperclip.rb
+- lib/para/ext/request_iframe_xhr.rb
 - lib/para/form_builder.rb
 - lib/para/form_builder/attributes_mappings_tracker.rb
 - lib/para/form_builder/containers.rb
@@ -748,14 +757,18 @@ files:
 - lib/para/helpers.rb
 - lib/para/helpers/attributes_mappings.rb
 - lib/para/helpers/resource_name.rb
+- lib/para/iframe_transport.rb
+- lib/para/iframe_transport/middleware.rb
 - lib/para/importer.rb
 - lib/para/importer/base.rb
 - lib/para/inputs.rb
 - lib/para/inputs/multi_select_input.rb
+- lib/para/inputs/nested_base_input.rb
 - lib/para/inputs/nested_many_input.rb
 - lib/para/inputs/nested_one_input.rb
 - lib/para/job.rb
 - lib/para/job/base.rb
+- lib/para/log_config.rb
 - lib/para/logging.rb
 - lib/para/logging/active_job_log_subscriber.rb
 - lib/para/markup.rb
@@ -799,6 +812,7 @@ files:
 - lib/tasks/para_tasks.rake
 - vendor/assets/javascripts/html5-sortable.js
 - vendor/assets/javascripts/jasny-bootstrap.js
+- vendor/assets/javascripts/jquery.iframe-transport.js
 - vendor/assets/javascripts/jquery.remote-modal-form.coffee
 - vendor/assets/javascripts/jquery.scrollto.js
 - vendor/assets/stylesheets/animate.css
@@ -824,7 +838,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails admin engine