avo 2.27.0 → 2.27.2.pre.pr1606

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aeea2a89ba96a4f920fe402b22ad5ec878c68f538d93d85e7c9e294a417fd20
-  data.tar.gz: cc521cbc9e8e6ac23b56af74f29222bdfacef50bc0adec8eb4e3bae29684ab45
+  metadata.gz: 161deecc8d313c1254a3be834d954d88d6a20b5d9d9ba68f17b38eed7eb05de7
+  data.tar.gz: 9f78a084bf9129ed2789c412ed9836d940f372563d8a0ae715df52e3edce0874
 SHA512:
-  metadata.gz: f01a90d325dff0c0143e9a2ce3194c49b51ad42c4435621999be67463a33e201c94072b25a6d369f8230c76476e27bcaaef35de67aca1e88cff94a685aa1dbaf
-  data.tar.gz: 9368a51618b19f713d94f9f83e4922dbb307e5963d581a7ad55d8f10511f49befa28e95ab4a304c3ee7dbfab06748e3e64c0b4ea3907f308f34832bafb9e29c4
+  metadata.gz: 3dd2b783c45b8d836c0715e8677dbcd253d94ac9f59ef3ee9f230464564915bc2730b35e77e2a60626db2fe0131fdbb9f9b467205e66528926392bc5e6376b73
+  data.tar.gz: 4cc9d8b35be4eebec0323721dce5573ba74e5a2dc2bbbbf16d0a2c0634ecc21b1b20f9ef3e272a3eaf50733694c62437905d94fdd0578cef2032df087474152f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.27.0)
+    avo (2.27.2.pre.pr1606)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/views/avo/partials/_footer.html.erb

@@ -1,3 +1,3 @@
 <div class="text-center text-sm text-gray-700 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>">
-  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.valid ? 'valid' : 'invalid'%> <%= Avo::App.license.id %> license">v<%= Avo::VERSION %></span> · Current.user.id = <%= Current.user&.id %>
+  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.valid ? 'valid' : 'invalid'%> <%= Avo::App.license.id %> license">v<%= Avo::VERSION %></span>
 </div>

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/base_card.rb

@@ -1,5 +1,7 @@
 module Avo
   class BaseCard
+    include Avo::Concerns::VisibleInDashboard
+
     class_attribute :id
     class_attribute :label
     class_attribute :description
@@ -31,7 +33,7 @@ module Avo
       end
     end
 
-    def initialize(dashboard:, options: {}, arguments: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil)
+    def initialize(dashboard:, options: {}, arguments: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil, visible: nil)
       @dashboard = dashboard
       @options = options
       @arguments = arguments
@@ -41,6 +43,7 @@ module Avo
       @label = label
       @refresh_every = refresh_every
       @description = description
+      @visible = visible
     end
 
     def label
@@ -137,6 +140,14 @@ module Avo
       false
     end
 
+    def visible
+      @visible || self.class.visible
+    end
+
+    def call_block
+      ::Avo::Hosts::CardVisibility.new(block: visible, card: self, parent: dashboard).handle
+    end
+
     private
 
     def cols

data/lib/avo/concerns/visible_in_dashboard.rb

@@ -0,0 +1,31 @@
+module Avo
+  module Concerns
+    module VisibleInDashboard
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :visible, default: true
+      end
+
+      def is_visible?
+        # Default is true
+        return true if visible == true
+
+        # Hide if false
+        return false if visible == false
+
+        if visible.respond_to? :call
+          call_block
+        end
+      end
+
+      def is_hidden?
+        !is_visible?
+      end
+
+      def call_block
+        ::Avo::Hosts::DashboardVisibility.new(block: visible, dashboard: self).handle
+      end
+    end
+  end
+end

data/lib/avo/dashboards/base_dashboard.rb

@@ -1,6 +1,8 @@
 module Avo
   module Dashboards
     class BaseDashboard
+      # TODO: convert the dashboards from classes to instances.
+      extend Avo::Concerns::VisibleInDashboard
       extend ActiveSupport::DescendantsTracker
 
       class_attribute :id
@@ -8,6 +10,7 @@ module Avo
       class_attribute :description
       class_attribute :items_holder
       class_attribute :grid_cols, default: 3
+      # TODO: remove this when you make the conversion.
       class_attribute :visible, default: true
       class_attribute :index, default: 0
       class_attribute :authorize, default: -> { true }
@@ -17,11 +20,12 @@ module Avo
           Rails.logger.warn "DEPRECATION WARNING: Card options parameter is deprecated in favor of arguments parameter and will be removed from Avo version 3.0.0"
         end
 
-        def card(klass, label: nil, description: nil, cols: nil, rows: nil, refresh_every: nil, options: {}, arguments: {})
+        def card(klass, label: nil, description: nil, cols: nil, rows: nil, refresh_every: nil, options: {}, arguments: {}, visible: nil)
           options_deprecation_message if options.present?
           self.items_holder ||= []
 
-          self.items_holder << klass.new(dashboard: self,
+          self.items_holder << klass.new(
+            dashboard: self,
             label: label,
             description: description,
             cols: cols,
@@ -29,7 +33,8 @@ module Avo
             refresh_every: refresh_every,
             options: options,
             arguments: arguments,
-            index: index
+            index: index,
+            visible: visible
           )
           self.index += 1
         end
@@ -45,11 +50,15 @@ module Avo
         def divider(**args)
           self.items_holder ||= []
 
-          self.items_holder << BaseDivider.new(**args)
+          self.items_holder << BaseDivider.new(dashboard: self, **args)
         end
 
         def items
-          self.items_holder
+          items = self.items_holder || []
+
+          items.filter do |item|
+            item.is_visible?
+          end
         end
 
         def classes
@@ -74,22 +83,6 @@ module Avo
         def navigation_path
           Avo::App.view_context.avo.dashboard_path id
         end
-
-        def is_visible?
-          # Default is true
-          return true if visible == true
-
-          # Hide if false
-          return false if visible == false
-
-          if visible.respond_to? :call
-            ::Avo::Hosts::DashboardVisibility.new(block: visible, dashboard: self).handle
-          end
-        end
-
-        def is_hidden?
-          !is_visible?
-        end
       end
     end
   end

data/lib/avo/dashboards/base_divider.rb

@@ -1,16 +1,22 @@
 module Avo
   module Dashboards
     class BaseDivider
+      include Avo::Concerns::VisibleInDashboard
+
+      attr_reader :dashboard
       attr_reader :label
       attr_reader :invisible
       attr_reader :index
+      attr_reader :visible
 
       class_attribute :id
 
-      def initialize(label: nil, invisible: false, index: nil)
+      def initialize(dashboard: nil, label: nil, invisible: false, index: nil, visible: nil)
+        @dashboard = dashboard
         @label = label
         @invisible = invisible
         @index = index
+        @visible = visible
       end
 
       def is_divider?
@@ -20,6 +26,10 @@ module Avo
       def is_card?
         false
       end
+
+      def call_block
+        ::Avo::Hosts::CardVisibility.new(block: visible, card: self, parent: dashboard).handle
+      end
     end
   end
 end

data/lib/avo/hosts/card_visibility.rb

@@ -0,0 +1,20 @@
+require "dry-initializer"
+
+module Avo
+  module Hosts
+    class CardVisibility
+      extend Dry::Initializer
+
+      option :block, default: proc { proc {} }
+      option :current_user, default: proc { ::Avo::App.current_user }
+      option :context, default: proc { ::Avo::App.context }
+      option :parent
+      option :card
+      option :params, default: proc { ::Avo::App.params }
+
+      def handle
+        instance_exec(&block)
+      end
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.27.0" unless const_defined?(:VERSION)
+  VERSION = "2.27.2.pre.pr1606" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.27.2.pre.pr1606
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1696,6 +1696,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1717,6 +1718,7 @@ files:
 - lib/avo/concerns/has_stimulus_controllers.rb
 - lib/avo/concerns/is_resource_item.rb
 - lib/avo/concerns/model_class_constantized.rb
+- lib/avo/concerns/visible_in_dashboard.rb
 - lib/avo/concerns/visible_items.rb
 - lib/avo/configuration.rb
 - lib/avo/configuration/branding.rb
@@ -1781,6 +1783,7 @@ files:
 - lib/avo/grid_fields/title_field.rb
 - lib/avo/hosts/association_scope_host.rb
 - lib/avo/hosts/base_host.rb
+- lib/avo/hosts/card_visibility.rb
 - lib/avo/hosts/dashboard_card.rb
 - lib/avo/hosts/dashboard_visibility.rb
 - lib/avo/hosts/ordering.rb
@@ -1951,9 +1954,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: