para 0.11.4 → 0.12.0

data/lib/para/form_builder/nested_form.rb

@@ -18,24 +18,25 @@ module Para
           end
 
           name = (name_method && object.send(name_method)) || default_resource_name
-          name = name.to_s.gsub(/(<\/p>|<br\s*\/?>)/, " ")
+          name = name.to_s.gsub(%r{(</p>|<br\s*/?>)}, ' ')
 
           template.sanitize(name, tags: [])
         end
       end
 
       def nested_resource_dom_id
-        return "" unless nested?
+        return '' unless nested?
 
         @nested_resource_dom_id ||= [
           object.class.model_name.singular,
           (Time.now.to_f * 1000).to_i,
-          (object.id || "_new_#{ nested_attribute_name }_id")
+          object.id || "_new_#{nested_attribute_name}_id"
         ].join('-')
       end
 
-      def remove_association_button
-        return "" unless allow_destroy?
+      def remove_association_button(allow_destroy_if:)
+        return '' unless allow_destroy?
+        return '' unless !allow_destroy_if || allow_destroy_if.call(object)
 
         template.content_tag(:div, class: 'panel-btns') do
           template.link_to_remove_association(

data/lib/para/inputs/nested_many_input.rb

@@ -31,6 +31,7 @@ module Para
               subclasses: subclasses,
               add_button_label: add_button_label,
               add_button_class: add_button_class,
+              allow_destroy_if: allow_destroy_if,
               inset: inset?,
               uncollapsed: uncollapsed?,
               render_partial: render_partial?,
@@ -59,6 +60,10 @@ module Para
         @model ||= parent_model.reflect_on_association(attribute_name).klass
       end
 
+      def allow_destroy_if
+        options.fetch(:allow_destroy_if, nil)
+      end
+
       def inset?
         options.fetch(:inset, false)
       end

data/lib/para/markup/modal.rb

@@ -2,38 +2,53 @@ module Para
   module Markup
     class Modal < Para::Markup::Component
       def container(options = {}, &block)
-        merge_class!(options, "modal")
-        merge_class!(options, "fade") unless options.delete(:fade) == false
-        merge_class!(options, "in") if options.delete(:displayed)
+        merge_class!(options, 'modal')
+        merge_class!(options, 'fade') unless options.delete(:fade) == false
+        merge_class!(options, 'in') if options.delete(:displayed)
 
         options.reverse_merge!(
-          tabindex: "-1", role: "dialog", "aria-hidden" => "true", "aria-labelledby" => (options[:id] || "modal")
+          tabindex: '-1',
+          role: 'dialog',
+          'aria-hidden' => 'true',
+          'aria-labelledby' => options[:id]
         )
 
+        options[:data] ||= {}
+        options[:data]['para-admin-modal-target'] ||= 'modal'
+
         content_tag(:div, options) do
-          content_tag(:div, class: "modal-dialog") do
-            content_tag(:div, class: "modal-content") do
-              capture { block.call(self) }
+          content_tag(:div, class: 'modal-dialog') do
+            content_tag(:div, class: 'modal-content') do
+              content_tag(:div, class: 'modal-inner') do
+                capture { block.call(self) }
+              end
             end
           end
         end
       end
 
       def header(options = {}, &block)
-        merge_class!(options, "modal-header")
+        merge_class!(options, 'modal-header')
 
         content_tag(:div, options) do
-          content_tag(:button, "&times;".html_safe, class: "close", type: "button",
-            "data-dismiss" => "modal", "aria-hidden" => "true"
+          content_tag(
+            :button,
+            '&times;'.html_safe,
+            class: 'close',
+            type: 'button',
+            'aria-hidden' => 'true',
+            data: {
+              action: 'click->para-admin-modal#closeModal'
+            }
           ) +
-          content_tag(:h4, class: "modal-title") do
-            capture { block.call }
-          end
+            content_tag(:h4, class: 'modal-title') do
+              capture { block.call }
+            end
         end
       end
 
       def body(options = {}, &block)
-        merge_class!(options, "modal-body")
+        merge_class!(options, 'modal-body')
 
         content_tag(:div, options) do
           capture { block.call }
@@ -41,7 +56,7 @@ module Para
       end
 
       def footer(options = {}, &block)
-        merge_class!(options, "modal-footer")
+        merge_class!(options, 'modal-footer')
 
         content_tag(:div, options) do
           capture { block.call }

data/lib/para/markup/resources_buttons.rb

@@ -16,14 +16,12 @@ module Para
         )
 
         options = {
-          method: :post,
           class: 'btn btn-sm btn-icon-info btn-shadow hint--left',
-          aria: {
-            label: ::I18n.t('para.shared.copy')
-          }
+          data: { 'turbo-method': :post, 'turbo-frame': '_top' },
+          aria: { label: ::I18n.t('para.shared.copy') }
         }
 
-        view.link_to(path, options) do
+        view.link_to(path, **options) do
           content_tag(:i, '', class: 'fa fa-copy')
         end
       end
@@ -35,7 +33,13 @@ module Para
           resource, action: :edit, return_to: view.request.fullpath
         )
 
-        view.link_to(path, class: 'btn btn-sm btn-icon-primary btn-shadow hint--left', aria: { label: ::I18n.t('para.shared.edit') }) do
+        options = {
+          class: 'btn btn-sm btn-icon-primary btn-shadow hint--left',
+          data: { 'turbo-frame': '_top' },
+          aria: { label: ::I18n.t('para.shared.edit') }
+        }
+
+        view.link_to(path, **options) do
           content_tag(:i, '', class: 'fa fa-pencil')
         end
       end
@@ -46,20 +50,20 @@ module Para
         path = component.relation_path(resource, return_to: view.request.fullpath)
 
         options = {
-          method: :delete,
+          class: 'btn btn-sm btn-icon-danger btn-shadow hint--left',
           data: {
-            confirm: ::I18n.t('para.list.delete_confirmation')
+            'turbo-method': :delete,
+            'turbo-confirm': ::I18n.t('para.list.delete_confirmation')
           },
-          class: 'btn btn-sm btn-icon-danger btn-shadow hint--left',
           aria: {
             label: ::I18n.t('para.shared.destroy')
           }
         }
 
-        view.link_to(path, options) do
+        view.link_to(path, **options) do
           content_tag(:i, '', class: 'fa fa-times')
         end
       end
     end
   end
-end
+end

data/lib/para/model_field_parsers/wysiwyg_editor.rb

@@ -0,0 +1,19 @@
+module Para
+  module ModelFieldParsers
+    class WysiwygEditor < Para::ModelFieldParsers::Base
+      register :wysiwyg_editor, self
+
+      def parse!
+        %w[content description].each do |field_name|
+          field = fields_hash[field_name]
+
+          next unless field && field.type == :text
+
+          fields_hash[field_name] = Para::AttributeField::WysiwygEditor.new(
+            field.model, name: field_name
+          )
+        end
+      end
+    end
+  end
+end

data/lib/para/model_field_parsers.rb

@@ -18,7 +18,7 @@ require 'para/model_field_parsers/devise'
 require 'para/model_field_parsers/paperclip'
 require 'para/model_field_parsers/orderable'
 require 'para/model_field_parsers/relations'
-require 'para/model_field_parsers/redactor'
+require 'para/model_field_parsers/wysiwyg_editor'
 require 'para/model_field_parsers/globalize'
 require 'para/model_field_parsers/friendly_id'
 require 'para/model_field_parsers/store'

data/lib/para/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Para
-  VERSION = '0.11.4'
+  VERSION = '0.12.0'
 end

data/lib/para.rb

@@ -19,15 +19,10 @@ require 'friendly_id'
 require 'deep_cloneable'
 require 'closure_tree'
 
-require 'jquery-rails'
-require 'turbolinks'
-require 'sass-rails'
-require 'selectize-rails'
-require 'bootstrap-sass'
+require 'turbo-rails'
+# Used for fa_icon helper, but font awesome is loaded from the app that requires Para.
 require 'font-awesome-rails'
 
-require 'vertebra'
-
 require 'rails/routing_mapper'
 require 'rails/relation_length_validator'
 
@@ -49,7 +44,6 @@ module Para
     autoload :Breadcrumbs
     autoload :Cache
     autoload :Logging
-    autoload :IframeTransport
     autoload :ActiveStorageDownloader
   end
 

data/lib/simple_form_extension/components/icons.rb

@@ -0,0 +1,13 @@
+module SimpleFormExtension
+  module Components
+    module Icons
+      def icon(wrapper_options)
+        icon_class unless options[:icon].nil?
+      end
+
+      def icon_class
+        template.content_tag(:i, '', class: options[:icon])
+      end
+    end
+  end
+end

data/lib/simple_form_extension/components/popovers.rb

@@ -0,0 +1,46 @@
+module SimpleFormExtension
+  module Components
+    module Popovers
+ 
+      def popover(wrapper_options)
+        return nil unless options[:popover]
+
+        options = { 
+          class: 'btn-popover fa fa-question-circle',
+          :rel => 'popover',
+          :'data-toggle' => 'popover',
+          :'data-container' => 'body',
+          :'data-title' => popover_title,
+          :'data-content' => popover_content,
+          :'data-placement' => popover_position,
+          :'data-trigger' => popover_tigger
+        }
+        
+        template.content_tag(:i, '', options)
+      end
+
+
+      def popover_title
+        popover_options[:title]
+      end
+
+      def popover_content
+        popover_options[:content]
+      end
+
+      def popover_position
+        popover_options[:position] ||= "auto"
+      end
+
+      def popover_tigger
+        popover_options[:trigger] ||= "click"
+      end
+
+      private
+
+      def popover_options
+        options[:popover] ||= {}
+      end
+    end
+  end
+end

data/lib/simple_form_extension/components.rb

@@ -0,0 +1,8 @@
+module SimpleFormExtension
+  module Components
+    extend ActiveSupport::Autoload
+
+    autoload :Icons
+    autoload :Popovers
+  end
+end

data/lib/simple_form_extension/ext/form_builder.rb

@@ -0,0 +1,20 @@
+require 'simple_form/form_builder'
+
+module SimpleForm
+  class FormBuilder < ActionView::Helpers::FormBuilder
+    alias_method :_original_find_mapping, :find_mapping
+
+    def find_mapping(input_type)
+      camelized = if (klass = self.class.mappings[input_type])
+        name = klass.name
+        (name =~ /^SimpleForm::Inputs/) ? name.split("::").last : name
+      else
+        "#{ input_type.to_s.camelize }Input"
+      end
+
+      mapping = attempt_mapping(camelized, SimpleFormExtension::Inputs)
+      return (discovery_cache[input_type] = mapping) if mapping
+      _original_find_mapping(input_type)
+    end
+  end
+end

data/lib/simple_form_extension/file_concern.rb

@@ -0,0 +1,74 @@
+module SimpleFormExtension
+  module FileConcern
+    def existing_file_tag
+      return '' unless file_exists?
+
+      content_tag(:div, class: 'input-group help-block existing-file', data: { provides: 'existing-file'}) do
+        content_tag(:span, class: 'input-group-addon') do
+          "#{ _translate('file.existing_file') } : ".html_safe
+        end +
+
+        file_preview_and_remove_button
+      end
+    end
+
+    def file_preview_and_remove_button
+      return '' unless file_exists?
+      
+      content_tag(:div, class: 'btn-group') do
+        template.link_to(file_url, class: 'btn btn-default ', target: '_blank', data: { toggle: 'existing-file' }) do
+          content_tag(:i, '', class: 'fa fa-file') +
+          " ".html_safe +
+
+          existing_file_name
+        end +
+
+        remove_file_button
+      end
+    end
+
+    def existing_file_name
+      if paperclip_attachment_attached?
+        object.send(:"#{ attribute_name }_file_name").html_safe
+      elsif activestorage_attachment_attached?
+        attachment = object.send(attribute_name)
+        attachment.filename.to_s
+      end
+    end
+
+    def remove_file_button
+      return unless object.respond_to?(:"#{ remove_attachment_method }=")
+
+      content_tag(:button, class: 'btn btn-default', type: 'button', data: { dismiss: 'existing-file' }) do
+        content_tag(:i, '', class: 'fa fa-remove', data: { :'removed-class' => 'fa fa-refresh' }) +
+        @builder.hidden_field(remove_attachment_method, class: 'remove-file-input', value: nil)
+      end
+    end
+
+    def remove_attachment_method
+      options[:remove_method] || :"remove_#{ attribute_name }"
+    end
+
+    def file_exists?
+      @file_exists ||= paperclip_attachment_attached? || activestorage_attachment_attached?
+    end
+
+    def file_url
+      if paperclip_attachment_attached?
+        object.send(attribute_name)
+      elsif activestorage_attachment_attached?
+        template.polymorphic_url(object.send(attribute_name))
+      end
+    end
+
+    def paperclip_attachment_attached?
+      @paperclip_attachment_attached ||= object.try(:"#{ attribute_name }?")
+    end
+
+    def activestorage_attachment_attached?
+      @activestorage_attachment_attached ||=
+        object.try(attribute_name).try(:attached?) &&
+        object.try(attribute_name).blob&.persisted?
+    end
+  end
+end

data/lib/simple_form_extension/inputs/boolean_input.rb

@@ -0,0 +1,16 @@
+module SimpleFormExtension
+  module Inputs
+    class BooleanInput < SimpleForm::Inputs::BooleanInput
+      def input(wrapper_options = nil)
+        input_html_options[:class] << "check_boxes"
+        super
+      end
+
+      private
+
+      def build_check_box(unchecked_value, options)
+        "#{@builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)} <i class=\"checkbox-icon\"></i>".html_safe
+      end
+    end
+  end
+end

data/lib/simple_form_extension/inputs/collection_check_boxes_input.rb

@@ -0,0 +1,15 @@
+module SimpleFormExtension
+  module Inputs
+    class CollectionCheckBoxesInput < SimpleForm::Inputs::CollectionCheckBoxesInput
+      protected
+
+      def build_nested_boolean_style_item_tag(collection_builder)
+        "#{collection_builder.check_box} <i class=\"checkbox-icon\"></i> #{collection_builder.text}".html_safe
+      end
+
+      def item_wrapper_class
+        nested_boolean_style? ? "checkbox" : "checkbox-inline"
+      end
+    end
+  end
+end

data/lib/simple_form_extension/inputs/collection_radio_buttons_input.rb

@@ -0,0 +1,15 @@
+module SimpleFormExtension
+  module Inputs
+    class CollectionRadioButtonsInput < SimpleForm::Inputs::CollectionRadioButtonsInput
+      protected
+
+      def build_nested_boolean_style_item_tag(collection_builder)
+      	"#{collection_builder.radio_button} <i class=\"radio-icon\"></i> #{collection_builder.text}".html_safe
+      end
+
+      def item_wrapper_class
+      	nested_boolean_style? ? "radio" : "radio-inline"
+      end
+    end
+  end
+end

data/lib/simple_form_extension/inputs/color_input.rb

@@ -0,0 +1,37 @@
+module SimpleFormExtension
+  module Inputs
+    class ColorInput < SimpleForm::Inputs::Base
+      delegate :content_tag, to: :template
+
+      def input(wrapper_options = nil)
+        input_html_options[:class] << "colorpicker form-control"
+
+        input_html_options[:data] ||= {}
+        input_html_options[:data].merge!(
+          colorpicker: true,
+          format: format,
+          align: align
+        )
+
+        # Fetch value
+        color = object.send(attribute_name)
+
+        content_tag(:div, class: 'input-group color', data: { :'colorpicker-wrapper' => true }) do
+          @builder.text_field(attribute_name, input_html_options) +
+
+          content_tag(:span, class: 'input-group-addon') do
+            content_tag(:i, '')
+          end
+        end
+      end
+
+      def format
+        options[:format].presence || :hex
+      end
+
+      def align
+        options[:align].presence || :right
+      end
+    end
+  end
+end

data/lib/simple_form_extension/inputs/date_time_input.rb

@@ -0,0 +1,48 @@
+module SimpleFormExtension
+  module Inputs
+    class DateTimeInput < SimpleForm::Inputs::DateTimeInput
+      include SimpleFormExtension::Translations
+
+      delegate :content_tag, to: :template
+
+      def input(wrapper_options = nil)
+      	input_html_options[:class] << "form-control"
+
+        input_html_options[:data] ||= {}
+        input_html_options[:data].merge!(type_specific_option)
+
+        if (value = object.send(attribute_name).presence) && !input_html_options.key?(:value)
+          format = _translate("#{ input_type }.format.rails")
+          input_html_options[:value] = I18n.l(value, format: format)
+        end
+
+        content_tag(:div, class: 'input-group') do
+          @builder.text_field(attribute_name, input_html_options) +
+
+          content_tag(:span, class: 'input-group-btn') do
+            content_tag(:button, type: 'button', class: 'btn btn-default datetimepicker-trigger') do
+              content_tag(:i, '', class: "fa fa-#{ icon }")
+            end
+          end
+        end
+      end
+
+      private
+
+      def type_specific_option
+        options = { format: _translate("#{ input_type }.format.js") }
+
+        unless input_type == :time
+          options[:'week-start-day'] = _translate('shared.week_start_day')
+          options[:'format-date'] = _translate('date.format.js')
+        end
+
+        options
+      end
+
+      def icon
+        input_type == :time ? 'clock-o' : 'calendar'
+      end
+    end
+  end
+end

data/lib/simple_form_extension/inputs/file_input.rb

@@ -0,0 +1,41 @@
+module SimpleFormExtension
+  module Inputs
+    class FileInput < SimpleForm::Inputs::Base
+      include SimpleFormExtension::Translations
+      include SimpleFormExtension::FileConcern
+
+      delegate :content_tag, to: :template
+
+      def input(wrapper_options = nil)
+      	input_html_options[:class] << "file-upload"
+
+        input_markup
+      end
+
+      private
+
+      def input_markup
+        content_tag(:div, class: 'fileinput fileinput-new input-group', data: { provides: 'fileinput' }) do
+          content_tag(:div, class: 'form-control uneditable-input', data: { trigger: 'fileinput' }) do
+            content_tag(:i, '', class: 'fa fa-file fileinput-exists') +
+            content_tag(:span, '', class: 'fileinput-filename')
+          end +
+
+          content_tag(:div, class: 'input-group-btn') do
+            content_tag(:div, class: 'btn btn-default btn-file') do
+               content_tag(:span, _translate('file.select'), class: 'fileinput-new') +
+               content_tag(:span, _translate('file.change'), class: 'fileinput-exists') +
+               @builder.file_field(attribute_name, input_html_options)
+             end +
+
+            content_tag(:button, class: 'btn btn-default fileinput-exists', type: 'button', data: { dismiss: 'fileinput' }) do
+              content_tag(:i, '', class: 'fa fa-times')
+            end
+          end
+        end +
+
+        existing_file_tag
+      end
+    end
+  end
+end