effective_bootstrap 0.12.7 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf072e51e23f572c945c0d6a96bfe6409e7858663c7f381f26b2182b63f48e2
-  data.tar.gz: 6e24ba3f3a68fb5d75b464ded353bbfab42f7c6712643f146ee344bb9f9b1f40
+  metadata.gz: 18aa82bffaabfcab3bd340de2d1125a8a6111e5a09d9ddb921abf06fac1bc99e
+  data.tar.gz: 95f1b53bfa7e32dcd5c49a769b5e58c824becf5ce098a50ce61c874e37e7a31c
 SHA512:
-  metadata.gz: 8b5b92e6c0ed5fa76633e0f514dd151978aaca1c5a92ce88c86201363334c45e13f96380c796e2e2ab06eaf8f7afcbbce6bd9c59ee4b0d484ccd8a4d908c1f14
-  data.tar.gz: 05db676088a579d304260b324a3c48114aca3f76f9382d05bc0a048fd87a155fb1297706af728b7b731912e1d9fce277de0166634e895dbf506dc360a10c16e1
+  metadata.gz: 0750f84d089f5c28d599ba92ab2c9b957c83d3e28abc02b5bc727317954152278b303581597e0b2ba1f1b9284ec0b0b840b67854485c58dc8e3354119be5fa69
+  data.tar.gz: 1849f908e4a40614cc24f27465b12185d49584d982fa243cf1e9e681ac19df68b88ec67b3d8cf5271a203a6f50c6c43ebeb6108d26d6bfb661119dc60f9449e9

data/app/assets/javascripts/effective_bootstrap/tabs.js

@@ -1,18 +1,37 @@
+// Set the document hash to the tab href
+$(document).on('show.bs.tab', function (e) {
+  history.replaceState(null, null, '#' + e.target.getAttribute('id'));
+});
+
+// Display the tab based on form errors, the document hash, or ?tab= params
 $(document).ready(function() {
-  var $tab_with_error = $(".form-control.is-invalid").first().closest('.tab-pane');
+  var href = '';
 
-  if ($tab_with_error.length > 0) {
-    $(".nav.nav-tabs").find("a[href^='#" + $tab_with_error.attr('id') + "']").tab('show');
-    return true;
+  var $tab_with_error = $(".form-control.is-invalid").first().closest('.tab-pane')
 
+  if ($tab_with_error.length > 0) {
+    href = $tab_with_error.attr('id')
+  } else if (document.location.hash.length > 0) {
+    var hash = document.location.hash
+    if(hash.startsWith('#tab-')) { href = hash.replace('#tab-', '') }
   } else if (document.location.search.length > 0) {
-    var tab = new URLSearchParams(document.location.search).get('tab');
-    if((tab || '').length == 0) { return false; }
+    var param = new URLSearchParams(document.location.search).get('tab') || ''
+    if(param.length > 0) { href = param }
+  }
+
+  if (href.length > 0) {
+    var $tab = $(".nav.nav-tabs").find("a[href^='#" + href + "']")
 
-    $('.nav.nav-tabs').find("a[href^='#" + tab + "']").tab('show');
+    $tab.parents('.tab-pane').each (function() {
+      $('.nav.nav-tabs').find("a[href^='#" + $(this).attr('id') + "']").tab('show')
+    })
+
+    $tab.tab('show')
   }
 });
 
+
+// Click tab button
 $(document).on('click', '[data-click-tab]', function(event) {
   event.preventDefault();
 

data/app/helpers/effective_bootstrap_helper.rb

@@ -64,15 +64,17 @@ module EffectiveBootstrapHelper
   # = card('title do')
   #   %p Stuff
   # = card('Stuff', header: 'header title')
-  def card(value = nil, opts = {}, &block)
+  def card(resource = nil, opts = {}, &block)
     raise('expected a block') unless block_given?
 
-    if value.kind_of?(Hash)
-      opts = value; value = nil
+    if resource.kind_of?(Hash)
+      opts = resource; resource = nil
     end
 
+    return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
+
     header = opts.delete(:header)
-    title = opts.delete(:title) || effective_bootstrap_human_name(value)
+    title = opts.delete(:title) || opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true))
 
     content_tag(:div, merge_class_key(opts, 'card mb-4')) do
       header = content_tag(:div, header, class: 'card-header') if header.present?
@@ -316,7 +318,7 @@ module EffectiveBootstrapHelper
   def nav_link_to(resource, path, opts = {})
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
 
-    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: true, prefer_model_name: true)
+    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true), prefer_model_name: true)
 
     if @_nav_mode == :dropdown  # We insert dropdown-items
       return link_to(label, path, merge_class_key(opts, 'dropdown-item'))
@@ -596,12 +598,13 @@ module EffectiveBootstrapHelper
 
   NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
 
-  def tab(label, options = {}, &block)
-    label = effective_bootstrap_human_name(label, prefer_model_name: true)
+  def tab(resource, opts = {}, &block)
+    return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
+    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true), prefer_model_name: true)
 
     (@_tab_labels.push(label) and return) if @_tab_mode == :validate
 
-    controls = options.delete(:controls) || label.to_s.parameterize.gsub('_', '-')
+    controls = opts.delete(:controls) || label.to_s.parameterize.gsub('_', '-')
     controls = "item-#{controls}" if NUMBERS.include?(controls[0]) # Can't start with a number
     controls = controls[1..-1] if controls[0] == '#'
     controls = "#{controls}-#{@_tab_unique}" if @_tab_unique
@@ -617,7 +620,7 @@ module EffectiveBootstrapHelper
         content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)].compact.join(' '), href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
       end
     else # Inserting the content into the tab itself
-      classes = ['tab-pane', 'fade', ('show active' if active), options[:class].presence].compact.join(' ')
+      classes = ['tab-pane', 'fade', ('show active' if active), opts[:class].presence].compact.join(' ')
       content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls), 'data-tab-label': label) do
         yield
       end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.12.7'.freeze
+  VERSION = '0.13.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.13.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails