five-two-nw-olivander 0.2.0.47 → 0.2.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd2a2c61d70faf6f301ba6e8accf9c64fccb5acbaa22b32f73275023f6489d0f
-  data.tar.gz: 9489350aad972f11860c79bc6600a953bb3b21365909139c9c2a1972c588e88c
+  metadata.gz: 7d230d3b035fa0ef2848260e9a18935d703332e40ae67e1f3ac82720859ed681
+  data.tar.gz: 25d75dde2112dee7691f9e01f02da3383b7f86fb1a5bebf21516fffbef504443
 SHA512:
-  metadata.gz: 80808f7ec2804eb17d90e9ec9a67b2f800494fe982da0c62e067de519d492ef3295015db820a278d5f62e778a73530a62684e9cba57b32ebe6e0c100dc533756
-  data.tar.gz: a7999e0e3bf9557f0c24d5ddec7fbe6246039751027b0159fe897680fd80a654e4f9fb8935e1a72b4012e41c372e974cbf54cb9cc20a837b907739fbdf9c808f
+  metadata.gz: 64885a09cd9644a5eb035605186ec6ccfd711906772a81ff62b3ecf8523c78cf7ed2fd6a6eeb4e349e19779591f09b7f02516dd6ab06f8a4a0520aca8af0a212
+  data.tar.gz: 95a26ab22fb487d7fae8646898457fc77fbd77d02dd0a5fa8439931a892b1da3e05c80ac23307c9d2db6a0f3561f0c727abcf4975f93315679b913761b201a89

data/app/components/olivander/components/tabs_component.html.haml

@@ -0,0 +1,33 @@
+- content_for tab_strip_id do
+  %ul.nav.nav-tabs{id: id, role: "tablist"}
+    - tabs.each_with_index do |tab, index|
+      %li.nav-item
+        %a.nav-link{ 
+          id: "#{tab.id}-tab", 
+          href: "##{tab.id}", 
+          "data-toggle": "tab", 
+          role: "tab", 
+          "aria-controls": tab.id, 
+          "aria-selected": tab.active, 
+          class: ("nav-link active" if tab.active) 
+        }
+          = tab.title
+- content_for tab_content_id do
+  .tab-content.mt-2{id: "#{id}-content"}
+    - tabs.each do |tab|
+      .tab-pane.fade{ 
+        id: tab.id, 
+        role: "tabpanel", 
+        "aria-labelledby": "#{tab.id}-tab", 
+        class: ("tab-pane fade show active" if tab.active) 
+      }
+        = tab
+- if card
+  .card.card-tabs{ class: card_class }
+    .card-header.p-0.pt-1
+      = content_for tab_strip_id
+    .card-body
+      = content_for tab_content_id
+- else
+  = content_for tab_strip_id
+  = content_for tab_content_id

data/app/components/olivander/components/tabs_component.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# app/components/tab_component.rb
+module Olivander
+  module Components
+    # component to render tabs
+    class TabsComponent < ViewComponent::Base
+      renders_many :tabs, '::Olivander::Components::TabsComponent::Tab'
+
+      attr_reader :id, :card, :card_class, :tab_strip_id, :tab_content_id
+
+      def initialize(*args)
+        super
+        options = args.extract_options!
+        @id = options[:id] || "tabs-#{SecureRandom.hex(4)}"
+        @card = options.key?(:card) ? !!options[:card] : true
+        @card_class = options.key?(:card_class) ? !!options[:card_class] : 'card-primary'
+        @tab_strip_id = "tab-strip-#{SecureRandom.hex(4)}"
+        @tab_content_id = "tab-strip-#{SecureRandom.hex(4)}"
+      end
+
+      class Tab < ViewComponent::Base
+        attr_reader :title, :id, :active
+
+        def initialize(title:, id: "tab-#{SecureRandom.hex(6)}", active: false)
+          super
+          @title = title
+          @id = id
+          @active = active
+        end
+
+        def call
+          content
+        end
+      end
+    end
+  end
+end

data/app/datatables/olivander/datatable.rb

@@ -41,6 +41,8 @@ module Olivander
         dc = collection.nil? ? klazz.all : collection
 
         attributes.each do |att|
+          next if att[0].to_s == 'deleted_at' && klazz.respond_to?(:paranoid?) && klazz.paranoid?
+
           dc = dc.where("#{att[0]} = ?", att[1]) if klazz_attributes.include?(att[0].to_s)
         end
 

data/app/helpers/olivander/application_helper.rb

@@ -173,6 +173,12 @@ module Olivander
         (is_dev_environment? ? 'bg-danger' : 'bg-info')
     end
 
+    def sidebar_class
+      Olivander::CurrentContext.application_context.sidebar_class ||
+        ENV['SIDEBAR_CLASS'] ||
+        'sidebar-dark-primary'
+    end
+
     def header_page_title
       [is_dev_environment? ? sidebar_context_suffix.upcase : nil, page_title].reject(&:blank?).join(' ')
     end

data/app/inputs/date_time_input.rb

@@ -1,32 +1,34 @@
 class DateTimeInput < SimpleForm::Inputs::Base
-  def input(wrapper_options)
+  def input(_wrapper_options)
     raw_value = parse_value(object.public_send(attribute_name), options[:date_format])
 
     disabled = options[:disabled] || false
 
-    hash = { id: "#{attribute_name}_datetimepicker", class: 'form-control datetimepicker-input', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker" }
+    hash = { id: "#{attribute_name}_datetimepicker", class: 'form-control datetimepicker-input', value: raw_value,
+             disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker", autocomplete: 'off' }
     data = options[:data] || {}
     data.keys.each do |d|
       hash["data-#{d.to_s.dasherize}".to_sym] = data[d]
     end
     field = @builder.text_field(attribute_name, hash)
 
-    add_on_class = options[:add_on_class] || "fa fa-calendar"
+    add_on_class = options[:add_on_class] || 'fa fa-calendar'
 
-    add_on = template.content_tag(:div, class: "input-group-prepend") do
-      add_on = template.content_tag(:div, class: "input-group-text") do
-        hash = { class: add_on_class, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker" }
+    add_on = template.content_tag(:div, class: 'input-group-prepend') do
+      add_on = template.content_tag(:div, class: 'input-group-text') do
+        hash = { class: add_on_class, 'data-toggle': 'datetimepicker',
+                 'data-target': "##{attribute_name}_datetimepicker" }
         template.content_tag(:i, '', hash)
       end
     end
 
     all = content_tag(:div, add_on + field, class: 'input-group')
 
-    script = "".html_safe
-    unless disabled then
-      picker_options = options[:picker_options] || { "format": "MM/DD/YYYY" }
+    script = ''.html_safe
+    unless disabled
+      picker_options = options[:picker_options] || { "format": 'MM/DD/YYYY' }
 
-      script = """
+      script = ''"
         <script>
         $(document).ready(function() {
           $('##{attribute_name}_datetimepicker').datetimepicker(
@@ -34,7 +36,7 @@ class DateTimeInput < SimpleForm::Inputs::Base
           );
         });
         </script>
-      """.html_safe
+      "''.html_safe
     end
 
     all + script

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -1,5 +1,5 @@
 / Main Sidebar Container
-%aside.main-sidebar.sidebar-dark-primary.elevation-4{ data: { controller: 'left-nav' }}
+%aside.main-sidebar.elevation-4{ class: sidebar_class, data: { controller: 'left-nav' }}
   / Brand Logo
   %a.brand-link{ href: "/", class: sidebar_background_class }
     %img.brand-image.img-circle.elevation-3{:alt => Olivander::CurrentContext.application_context.logo.alt, :src => Olivander::CurrentContext.application_context.logo.url, :style => "opacity: .8"}/

data/lib/olivander/application_context.rb

@@ -4,7 +4,7 @@ module Olivander
   # DTO to represent the overall application context
   class ApplicationContext
     attr_accessor :name, :logo, :login_logo, :company, :menu_items,
-                  :route_builder, :sign_out_path, :sidebar_background_class,
+                  :route_builder, :sign_out_path, :sidebar_class, :sidebar_background_class,
                   :nav_container, :nav_class, :layout_container, :layout_class,
                   :sidebar, :back_to_top
 

data/lib/olivander/version.rb

@@ -2,5 +2,5 @@
 
 # needed for gem
 module Olivander
-  VERSION = '0.2.0.47'
+  VERSION = '0.2.0.49'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.47
+  version: 0.2.0.49
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-11 00:00:00.000000000 Z
+date: 2025-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -268,6 +268,8 @@ files:
 - app/components/olivander/components/table_portlet_component.html.haml
 - app/components/olivander/components/table_portlet_component.rb
 - app/components/olivander/components/table_portlet_component/table_component.html.haml
+- app/components/olivander/components/tabs_component.html.haml
+- app/components/olivander/components/tabs_component.rb
 - app/controllers/concerns/olivander/resources/application_record.rb
 - app/controllers/concerns/olivander/resources/auto_form_attributes.rb
 - app/controllers/concerns/olivander/resources/crud_controller.rb