avo 2.1.0 → 2.1.2.pre2

data/lib/avo/engine.rb

@@ -19,7 +19,8 @@ module Avo
 
     config.i18n.load_path += Dir[Avo::Engine.root.join('lib', 'generators', 'avo', 'templates', 'locales', '*.{rb,yml}')]
 
-    initializer "avo.autoload", before: :set_autoload_paths do |app|
+    # initializer "avo.autoload", before: :set_autoload_paths do |app|
+    initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],
         ["app", "avo", "filters"],
@@ -41,21 +42,11 @@ module Avo
       ::Avo::App.init_fields
     end
 
-    initializer "avo.reload_avo_files" do |app|
-      if Avo::IN_DEVELOPMENT && ENV["RELOAD_AVO_FILES"]
-        avo_root_path = Avo::Engine.root.to_s
-        # This should only be happening when ENV["RELOAD_AVO_FILES"] is true because it loads all the files into memory on every change and makes rails sluggish.
-        app.config.autoload_paths += [Avo::Engine.root.join("lib", "avo").to_s]
-        # Register reloader
-        app.reloaders << app.config.file_watcher.new([], {
-          Avo::Engine.root.join("lib", "avo").to_s => ["rb"]
-        }) {}
-
-        # What to do on file change
-        config.to_prepare do
-          Dir.glob(avo_root_path + "/lib/avo/**/*.rb".to_s).each { |c| load c }
-          Avo::App.boot
-        end
+    initializer "avo.reloader" do |app|
+      Avo::Reloader.new.tap do |reloader|
+        reloader.execute
+        app.reloaders << reloader
+        app.reloader.to_run { reloader.execute }
       end
     end
 

data/lib/avo/fields/base_field.rb

@@ -104,7 +104,7 @@ module Avo
 
         return @name if @name.present?
 
-        return t(translation_key, count: 1, default: default).capitalize if @translation_key
+        return t(translation_key, count: 1, default: default).capitalize if translation_key
 
         default
       end
@@ -112,7 +112,7 @@ module Avo
       def plural_name
         default = name.pluralize
 
-        return t(translation_key, count: 2, default: default).capitalize if @translation_key
+        return t(translation_key, count: 2, default: default).capitalize if translation_key
 
         default
       end

data/lib/avo/fields/date_field.rb

@@ -19,7 +19,7 @@ module Avo
         return if value.blank?
 
         if @format.is_a?(Symbol)
-          value.to_s(@format)
+          value.to_formatted_s(@format)
         else
           value.strftime(@format)
         end

data/lib/avo/fields_collector.rb

@@ -2,14 +2,19 @@ module Avo
   module FieldsCollector
     def field(field_name, as:, **args, &block)
       self.fields ||= []
+      self.invalid_fields ||= []
 
       field_instance = parse_field(field_name, as: as, **args, &block)
 
       if field_instance.present?
         self.fields << field_instance
       else
-        message = "[Avo] The #{field_name} field, as: #{as} from #{self.name} has an invalid configuration."
-        ::Rails.logger.warn message
+        self.invalid_fields << ({
+          name: field_name,
+          as: as,
+          resource: name,
+          message: "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: #{as}</code>"
+        })
       end
     end
 

data/lib/avo/hosts/dashboard_card.rb

@@ -10,6 +10,7 @@ module Avo
       option :dashboard
       option :card
       option :params
+      option :options
 
       delegate :result, to: :card
 

data/lib/avo/reloader.rb

@@ -0,0 +1,51 @@
+class Avo::Reloader
+  delegate :execute_if_updated, :execute, :updated?, to: :updater
+
+  def reload!
+    # reload all files declared in paths
+    paths.each { |path| load path }
+
+    # reload all files declared in each directory
+    directories.keys.each do |dir|
+      Dir.glob("#{dir}/**/*.rb".to_s).each { |c| load c }
+    end
+  end
+
+  private
+    def updater
+      @updater ||= config.file_watcher.new(paths, directories) { reload! }
+    end
+
+    def paths
+      # we want to watch some files no matter what
+      files = [
+        Rails.root.join("config", "initializers", "avo.rb"),
+      ]
+
+      # we want to watch some files only in Avo development
+      if reload_lib?
+        files += []
+      end
+
+      files
+    end
+
+    def directories
+      dirs = {}
+
+      # watch the lib directory in Avo development
+      if reload_lib?
+        dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
+      end
+
+      dirs
+    end
+
+    def config
+      Rails.application.config
+    end
+
+    def reload_lib?
+      Avo::IN_DEVELOPMENT || ENV['AVO_RELOAD_LIB_DIR']
+    end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.1.0"
+  VERSION = "2.1.2.pre2"
 end

data/public/avo-assets/avo.css

@@ -6685,8 +6685,8 @@ progress[value]::-moz-progress-bar{
   max-width:100%
 }
 
-.max-w-sm{
-  max-width:24rem
+.max-w-lg{
+  max-width:32rem
 }
 
 .max-w-xs{
@@ -7174,6 +7174,11 @@ progress[value]::-moz-progress-bar{
   border-color:rgb(87 93 102 / var(--tw-border-opacity))
 }
 
+.bg-red-600{
+  --tw-bg-opacity:1;
+  background-color:rgb(220 38 38 / var(--tw-bg-opacity))
+}
+
 .bg-white{
   --tw-bg-opacity:1;
   background-color:rgb(255 255 255 / var(--tw-bg-opacity))
@@ -7291,6 +7296,16 @@ progress[value]::-moz-progress-bar{
   padding:0.25rem
 }
 
+.px-1{
+  padding-left:0.25rem;
+  padding-right:0.25rem
+}
+
+.py-px{
+  padding-top:1px;
+  padding-bottom:1px
+}
+
 .px-2{
   padding-left:0.5rem;
   padding-right:0.5rem
@@ -7356,21 +7371,11 @@ progress[value]::-moz-progress-bar{
   padding-bottom:0px
 }
 
-.px-1{
-  padding-left:0.25rem;
-  padding-right:0.25rem
-}
-
 .py-4{
   padding-top:1rem;
   padding-bottom:1rem
 }
 
-.py-px{
-  padding-top:1px;
-  padding-bottom:1px
-}
-
 .py-24{
   padding-top:6rem;
   padding-bottom:6rem
@@ -7848,7 +7853,7 @@ html, body{
 
 .turbo-progress-bar{
   --tw-bg-opacity:1;
-  background-color:rgb(34 197 94 / var(--tw-bg-opacity))
+  background-color:rgb(44 164 247 / var(--tw-bg-opacity))
 }
 
 body.os-mac .mac\:hidden {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2.pre2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,9 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/assets/builds/avo.css
+- app/assets/builds/avo.js
+- app/assets/builds/avo.js.map
 - app/assets/config/avo_manifest.js
 - app/assets/stylesheets/avo.css
 - app/assets/stylesheets/css/active-storage.css
@@ -1085,6 +1088,7 @@ files:
 - app/views/avo/partials/_navbar.html.erb
 - app/views/avo/partials/_resource_search.html.erb
 - app/views/avo/partials/_scripts.html.erb
+- app/views/avo/partials/_sidebar_extra.html.erb
 - app/views/avo/partials/_sortable_component.html.erb
 - app/views/avo/partials/_table_header.html.erb
 - app/views/avo/partials/_view_toggle_button.html.erb
@@ -1120,12 +1124,13 @@ files:
 - lib/avo/action_model.rb
 - lib/avo/app.rb
 - lib/avo/base_action.rb
+- lib/avo/base_card.rb
 - lib/avo/base_resource.rb
 - lib/avo/configuration.rb
-- lib/avo/dashboards/base_card.rb
 - lib/avo/dashboards/base_dashboard.rb
 - lib/avo/dashboards/base_divider.rb
 - lib/avo/dashboards/chartkick_card.rb
+- lib/avo/dashboards/dashboard_card.rb
 - lib/avo/dashboards/metric_card.rb
 - lib/avo/dashboards/partial_card.rb
 - lib/avo/dynamic_router.rb
@@ -1188,6 +1193,7 @@ files:
 - lib/avo/loaders/fields_loader.rb
 - lib/avo/loaders/filters_loader.rb
 - lib/avo/loaders/loader.rb
+- lib/avo/reloader.rb
 - lib/avo/services/authorization_service.rb
 - lib/avo/tools_manager.rb
 - lib/avo/version.rb
@@ -1280,9 +1286,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.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: 

data/lib/avo/dashboards/base_card.rb

@@ -1,151 +0,0 @@
-module Avo
-  module Dashboards
-    class BaseCard
-      class_attribute :id
-      class_attribute :label
-      class_attribute :description
-      class_attribute :cols, default: 1
-      class_attribute :rows, default: 1
-      class_attribute :initial_range
-      class_attribute :ranges, default: []
-      class_attribute :refresh_every
-      class_attribute :display_header, default: true
-      # private
-      class_attribute :result_data
-      class_attribute :query_block
-
-      attr_accessor :dashboard
-      attr_accessor :params
-
-      delegate :context, to: ::Avo::App
-
-      class << self
-        def query(&block)
-          self.query_block = block
-        end
-      end
-
-      def initialize(dashboard:)
-        @dashboard = dashboard
-      end
-
-      def label
-        return self.class.label.to_s if self.class.label.to_s.present?
-
-        self.class.id.to_s.humanize
-      end
-
-      def translated_range(range)
-        return "#{range} days" if range.is_a? Integer
-
-        case range
-        when "MTD"
-          "Month to date"
-        when "QTD"
-          "Quarter to date"
-        when "YTD"
-          "Year to date"
-        when "TODAY"
-          "Today"
-        else
-          range
-        end
-      end
-
-      def parsed_ranges
-        return unless ranges.present?
-
-        ranges.map { |range| [translated_range(range), range] }
-      end
-
-      def turbo_frame
-        "#{dashboard.id}_#{id}"
-      end
-
-      def frame_url(enforced_range: nil)
-        enforced_range ||= initial_range || ranges.first
-        "#{Avo::App.root_path}/dashboards/#{dashboard.id}/cards/#{id}?turbo_frame=#{turbo_frame}&range=#{enforced_range}"
-      end
-
-      def card_classes
-        result = ""
-
-        result += case self.class.cols.to_i
-        when 1
-          " sm:col-span-1"
-        when 2
-          " sm:col-span-2"
-        when 3
-          " sm:col-span-3"
-        when 4
-          " sm:col-span-4"
-        when 5
-          " sm:col-span-5"
-        when 6
-          " sm:col-span-6"
-        else
-          " sm:col-span-1"
-        end
-
-        result += case self.class.rows.to_i
-        when 1
-          " h-36"
-        when 2
-          " h-72"
-        when 3
-          " h-[27rem]"
-        when 4
-          " h-[36rem]"
-        when 5
-          " h-[45rem]"
-        when 6
-          " h-[54rem]"
-        end
-
-        result
-      end
-
-      def type
-        return :metric if self.class.superclass == ::Avo::Dashboards::MetricCard
-        return :chartkick if self.class.superclass == ::Avo::Dashboards::ChartkickCard
-        return :partial if self.class.superclass == ::Avo::Dashboards::PartialCard
-      end
-
-      def compute_result
-        Avo::Hosts::DashboardCard.new(card: self, dashboard: dashboard, params: params, context: context, range: range)
-          .compute_result
-
-        self
-      end
-
-      def hydrate(dashboard: nil, params: nil)
-        @dashboard = dashboard if dashboard.present?
-        @params = params if params.present?
-
-        self
-      end
-
-      def range
-        return params[:range] if params.present? && params[:range].present?
-
-        return initial_range if initial_range.present?
-
-        ranges.first
-      end
-
-      def result(data)
-        self.result_data = data
-
-        self
-      end
-
-      def is_card?
-        true
-      end
-
-      def is_divider?
-        false
-      end
-    end
-  end
-end