effective_bootstrap 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c81334cb6ac486e6880fc75bc9e0517bbb1a19fa2a2a0b2ad435cbc7d35beb
-  data.tar.gz: b792f8cb43154fe1f3e5eb96a8e68fb066ca0007224a58ba507c1e93d962a8d3
+  metadata.gz: 2397e2be81dbb9b78de24f2397762cfe44458a7f1d351d60d32a86769add1d9c
+  data.tar.gz: 6405deac6426fc49962d3da0dd30b006dcf5f113ceff08335c03f029d589a37a
 SHA512:
-  metadata.gz: dd06f6e3db1c37e4b3e9136d0172c1388303f7faa62e24e91ad4e308bd2511e32ebd665b47c7dab5142bcd34278dc5723cef0e8fc9a76b8b5ba1d8efc122b777
-  data.tar.gz: a06ba1c6e1cc2692bbf27d9cc9c78137d1ee18d57a6689974c5ca58b643cf99b340ac3c3b58abf51b2b58f97d2a2c368669ae76ae8be59e87985d03a89db7052
+  metadata.gz: 655c9ec56944dc576cf61a0ed8a6d2dfdb784cf4e4532f9a4b0e32b9c15ffcd6a2717682a5229f44df8d582b1aa734d9ee65d0762b71029fa210da21812238f7
+  data.tar.gz: 8ab4a5452665c92b72d0f018059df0e72a8e71ad8a1a6ad013849fb78f54909879ed823dac1c384159cc4c0c319c8c88675fabc6a266c6272bb2bc2d48f79de6

data/app/assets/javascripts/effective_article_editor/initialize.js.coffee

@@ -1,13 +1,36 @@
 # https://imperavi.com/article/
 
 uploadActiveStorage = (editor, data) ->
+  rails_url = '/rails/active_storage/blobs/redirect/'
+
   for file in data.files
     upload = new ActiveStorage.DirectUpload(file, '/rails/active_storage/direct_uploads')
 
     upload.create (error, blob) =>
-      url = '/rails/active_storage/blobs/redirect/' + blob.signed_id + '/' + blob.filename
+      url = rails_url + blob.signed_id + '/' + blob.filename
       editor.complete({ file: { url: url, name: blob.filename, content_type: blob.content_type }}, data.e)
 
+      # We append this nested attachment html
+      attachment = $('<action-text-attachment>')
+        .attr('sgid', blob.attachable_sgid)
+        .attr('class', 'effective-article-editor-attachment')
+
+      attachment = $('<div>').append(attachment).html()
+
+      doc = editor.app.editor.getLayout()
+
+      doc
+        .find("img[src^='#{rails_url}']:not(.effective-article-editor-attachment)")
+        .after(attachment)
+        .addClass('effective-article-editor-attachment')
+
+      doc
+        .find("a[data-file][data-name='#{file.name}']:not(.action-text-attachment)")
+        .after(attachment)
+        .addClass('effective-article-editor-attachment')
+        .removeAttr('data-file')
+        .removeAttr('data-name')
+
 insertUploadByDrop = (response, e) ->
   if @app.block.is()
     instance = @app.block.get()

data/app/assets/javascripts/effective_bootstrap/form.js.coffee

@@ -19,6 +19,8 @@ this.EffectiveForm ||= new class
   submitting: ($form) ->
     $form.addClass('form-is-valid').removeClass('form-is-invalid')
     @spin()
+    @saveTabs($form)
+
     setTimeout((-> EffectiveForm.disable($form)), 0)
 
     if ($form.attr('method') || '').toLowerCase() == 'get' || (@current_submit.length > 0 && @current_submit.hasClass('form-actions-reset'))
@@ -59,6 +61,16 @@ this.EffectiveForm ||= new class
 
   spin: -> @current_submit.addClass('form-current-submit') if @current_submit.length > 0
 
+  saveTabs: ($form) ->
+    $tabs = $form.parents('div.tab-pane[data-tab-label]')
+    $tabs = @current_submit.parents('div.tab-pane[data-tab-label]') if $tabs.length == 0
+
+    $form.find("input[name='_tabs[]']").remove()
+
+    $tabs.each (i, element) ->
+      label = $(element).data('tab-label')
+      $form.append("<input type='hidden' name='_tabs[]' value='#{label}'>")
+
   beforeAjax: ($form) ->
     return unless $form.data('remote')
 

data/app/controllers/concerns/effective_bootstrap/save_tabs.rb

@@ -0,0 +1,20 @@
+module EffectiveBootstrap
+  module SaveTabs
+    extend ActiveSupport::Concern
+
+    included do
+
+      # If there is a params[:_tabs], save it to the session
+      before_action(if: -> { params[:_tabs] }) do
+        session[:_tabs] = params[:_tabs]
+      end
+
+      # After we're done, delete it from session
+      after_action(if: -> { session[:_tabs] }) do
+        session.delete(:_tabs) unless response.redirect?
+      end
+
+    end
+
+  end
+end

data/app/helpers/effective_article_editor_helper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module EffectiveArticleEditorHelper
+
+  def render_article_editor_action_text_content(content)
+    raise('expected content to be an content') unless content.kind_of?(ActionText::Content)
+
+    rendered = render_action_text_content(content)
+
+    if rendered.include?('effective-article-editor')
+      doc = Nokogiri::HTML(rendered)
+      doc.search('action-text-attachment').each { |fragment| fragment.remove }
+
+      # Filter out <html><body>\n and \n</body></html>
+      rendered = doc.inner_html.to_s[13..-16].html_safe
+    end
+
+    rendered
+  end
+
+end

data/app/helpers/effective_bootstrap_helper.rb

@@ -488,24 +488,43 @@ module EffectiveBootstrapHelper
   # If you pass active 'label' it will make that tab active. Otherwise first.
   # Unique will make sure the tab html IDs are unique
   # $('#tab-demographics').tab('show')
-  def tabs(active: nil, unique: false, list: {}, content: {}, &block)
+  def tabs(active: nil, unique: false, ignore_save_tab: false, list: {}, content: {}, &block)
     raise 'expected a block' unless block_given?
 
-    @_tab_mode = :tablist
-    @_tab_active = :first if active.nil?
+    # The Active Tab might be set from a previous form submission, or passed into helper
+    tab_active = session[:_tabs].try(:pop) unless ignore_save_tab
+    tab_active ||= active
+
+    # If an active tab is passed, we validate we have a tab with that label, or fallback to first
+    if tab_active.present?
+      @_tab_mode = :validate
+      @_tab_labels = []
+      yield
+
+      tab_active = nil unless @_tab_labels.include?(tab_active)
+    end
+
+    tab_active ||= :first
     @_tab_unique = effective_bootstrap_unique_id if unique
 
+    # Generate the html in two passes
     content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) do
+      @_tab_mode = :tablist
+      @_tab_active = tab_active
+
       yield # Yield to tab the first time
     end +
     content_tag(:div, {class: 'tab-content'}.merge(content)) do
       @_tab_mode = :content
-      @_tab_active = (active || :first)
+      @_tab_active = tab_active
+
       yield # Yield to tab the second time
     end
   end
 
   def tab(label, options = {}, &block)
+    (@_tab_labels.push(label) and return) if @_tab_mode == :validate
+
     controls = options.delete(:controls) || label.to_s.parameterize.gsub('_', '-')
     controls = controls[1..-1] if controls[0] == '#'
     controls = "#{controls}-#{@_tab_unique}" if @_tab_unique
@@ -522,7 +541,7 @@ module EffectiveBootstrapHelper
       end
     else # Inserting the content into the tab itself
       classes = ['tab-pane', 'fade', ('show active' if active), options[:class].presence].compact.join(' ')
-      content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls)) do
+      content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls), 'data-tab-label': label) do
         yield
       end
     end

data/app/models/effective/form_inputs/article_editor.rb

@@ -69,8 +69,16 @@ module Effective
         }
       end
 
+      def content
+        if defined?(ActionText::RichText) && value.kind_of?(ActionText::RichText)
+          return value.body.to_html
+        end
+
+        value
+      end
+
       def build_input(&block)
-        @builder.super_text_area(name, options[:input])
+        @builder.super_text_area(name, options[:input].merge(value: content))
       end
 
       def input_html_options
@@ -86,7 +94,7 @@ module Effective
           (@template.asset_pack_path('application.css') if @template.respond_to?(:asset_pack_path)),
           (@template.asset_path('application.css') if @template.respond_to?(:asset_path)),
           ('/assets/effective_bootstrap_article_editor.css')
-        ]
+        ].compact
       end
 
       def active_storage

data/config/effective_bootstrap.rb

@@ -2,4 +2,8 @@ EffectiveBootstrap.setup do |config|
   # Replaces rails_ujs data-confirm with a custom inline implementation.
   # You will need to recompile assets (or "rm -rf tmp/") if you change this.
   config.use_custom_data_confirm = true
+
+  # Adds a before_action to ApplicationController
+  # To save and restore the active bootstrap tabs
+  config.save_tabs = true
 end

data/lib/effective_bootstrap/engine.rb

@@ -21,5 +21,14 @@ module EffectiveBootstrap
       end
     end
 
+    # Adds a before_action to application controller
+    initializer 'effective_bootstrap.action_controller' do |app|
+      if EffectiveBootstrap.save_tabs
+        app.config.to_prepare do
+          ApplicationController.send(:include, EffectiveBootstrap::SaveTabs)
+        end
+      end
+    end
+
   end
 end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.10.9'.freeze
+  VERSION = '0.10.10'.freeze
 end

data/lib/effective_bootstrap.rb

@@ -6,7 +6,7 @@ require 'effective_bootstrap/version'
 module EffectiveBootstrap
 
   def self.config_keys
-    [:use_custom_data_confirm]
+    [:use_custom_data_confirm, :save_tabs]
   end
 
   include EffectiveGem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -640,6 +640,8 @@ files:
 - app/assets/stylesheets/effective_select/overrides.scss
 - app/assets/stylesheets/effective_select/select2.css
 - app/assets/stylesheets/effective_select_or_text/input.scss
+- app/controllers/concerns/effective_bootstrap/save_tabs.rb
+- app/helpers/effective_article_editor_helper.rb
 - app/helpers/effective_bootstrap_helper.rb
 - app/helpers/effective_editor_helper.rb
 - app/helpers/effective_form_builder_helper.rb