five-two-nw-olivander 0.2.0.48 → 0.2.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b22812b1ec4a12b08bf4438bb5a4fca7d336d3093731802bd8dcc9ff536a3aa
-  data.tar.gz: bb795edf8b2d5905608397b77eb1d16712b39f26428216a2899d3df56a4403ac
+  metadata.gz: fdf7c68c926c6c55749c67baa2a31d09a1a9b6599dc01213a3bbc182ec2d5400
+  data.tar.gz: 0dc80273f37685bdf97b9ac00ba9ab99e1b9a6959edc5d2bcd367656072624e2
 SHA512:
-  metadata.gz: c46a875fcff935a6bd0f42f810f3be80e71f688dd6b27af853d2b63504a0253eb30b132aa0062dde96a189f5e422ec036808ac5782f00fd5cd9d8a583eaa0cec
-  data.tar.gz: 68ce88b62806744b7c76026df4c3419ab725b19497e50765f4f893456938e516f3c3a3564164477980f0abbbf72f8c448909a59f8966504467807aa78e79e7d4
+  metadata.gz: f3595baa37801f0cb3f87f09c8053b5cfe83434758e5d44ab5c9c1396d7ff1a836e747eb118b74c300c8fd8d37a7404b63276787f1e38d07c0c9a28366fef472
+  data.tar.gz: 707ce0907e54b4137021e78edec417cd7ff3d2155ed1ba4798fd2519d3712c64d9a6c7a25fab99a8b7fbcfbd4fc00333a0b36db14c26bcebaaea636f87f4eb98

data/app/assets/javascripts/controllers/datatable_index_charts_controller.js

@@ -20,8 +20,11 @@ export default class extends Controller {
   transformData(chart) {
     var self = this
     if (chart.as == 'LineChart') {
-      // we don't know what to do
-      return chart.data
+      var transformed = chart.data.map(([name, obj]) => ({
+        name,
+        data: Object.entries(obj || {})
+      }));
+      return transformed
     } else {
       return chart.data
     }

data/app/channels/presence_channel.rb

@@ -0,0 +1,38 @@
+class PresenceChannel < ApplicationCable::Channel
+  def subscribed
+    chs = 'presence_channel'
+    stream_from chs
+    ActionCable.server.broadcast(chs, { message: 'Welcome to Olivander!!!' })
+
+    Rails.logger.debug 'subscribed'
+    channel_user.mark_online! if channel_user.present? && channel_user.respond_to?('mark_online!')
+    Rails.logger.debug 'marked online'
+    broadcast_presence
+  end
+
+  def unsubscribed
+    Rails.logger.debug 'unsubscribed'
+    channel_user.mark_offline! if channel_user.present? && channel_user.respond_to?('mark_offline!')
+    Rails.logger.debug 'marked offline'
+    broadcast_presence
+  end
+
+  def speak(data)
+    ActionCable.server.broadcast('presence_channel', data)
+    broadcast_presence
+  end
+
+  private
+
+  def broadcast_presence
+    return unless channel_user.present?
+
+    ActionCable.server.broadcast('presence_channel',
+                                 { online_users: channel_user.class.online_users.map do |u|
+                                                   {
+                                                     id: u.id,
+                                                     email: u.email
+                                                   }
+                                                 end })
+  end
+end

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/views/application/index.html.haml

@@ -23,7 +23,10 @@
                   %button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
                     %i.fas.fa-expand
               .card-body{ style: 'height: 220px' }
-                = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data], id: chart[:name], height: '90%', adapter: 'google')
+                - if chart[:as] == 'LineChart'
+                  = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data].map{ |x| {name: x[0], data: x[1]}}, id: chart[:name], height: '90%')
+                - else
+                  = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data], id: chart[:name], height: '90%', adapter: 'google')
 
   = content_for :datatable_charts
 

data/lib/olivander/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.48
+  version: 0.2.0.50
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-10 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -253,6 +253,7 @@ files:
 - app/assets/stylesheets/adminlte.css
 - app/assets/stylesheets/fa-fix.scss
 - app/assets/stylesheets/olivander/application.css
+- app/channels/presence_channel.rb
 - app/components/olivander/components/menu_item_component.html.haml
 - app/components/olivander/components/menu_item_component.rb
 - app/components/olivander/components/portlet_component.html.haml
@@ -268,6 +269,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