avo 2.0.0 → 2.1.0

data/bin/dev

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-if ! command -v foreman &> /dev/null
-then
-  echo "Installing foreman..."
-  gem install foreman
-fi
+PORT="${PORT:-3030}"
+export PORT
 
-foreman start -f Procfile.dev
+if command -v overmind &> /dev/null; then
+  overmind start -f Procfile.dev "$@"
+else
+  foreman start -f Procfile.dev "$@"
+fi

data/lib/avo/app.rb

@@ -10,6 +10,8 @@ module Avo
     class_attribute :current_user, default: nil
     class_attribute :root_path, default: nil
     class_attribute :view_context, default: nil
+    class_attribute :params, default: {}
+    class_attribute :translation_enabled, default: false
 
     class << self
       def boot
@@ -24,14 +26,16 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:, root_path:, view_context:)
+      def init(request:, context:, current_user:, root_path:, view_context:, params:)
         self.request = request
         self.context = context
         self.current_user = current_user
         self.root_path = root_path
         self.view_context = view_context
+        self.params = params
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+        self.translation_enabled = license.has(:localization)
 
         # Set the current host for ActiveStorage
         begin
@@ -89,6 +93,9 @@ module Avo
           .select do |dashboard|
             dashboard != Dashboards::BaseDashboard
           end
+          .uniq do |dashboard|
+            dashboard.id
+          end
       end
 
       # Returns the Avo dashboard by id

data/lib/avo/base_action.rb

@@ -27,16 +27,16 @@ module Avo
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
-          { 'turbo': false }
+          {turbo: false, remote: false}
         else
-          { 'turbo-frame': '_top', 'action-target': 'form' }
+          {"turbo-frame": "_top", "action-target": "form"}
         end
       end
 
       # We can't respond with a file download from Turbo se we disable close the modal manually after a while (it's a hack, we know)
       def submit_button_data_attributes
         if may_download_file
-          { action: 'click->modal#delayedClose' }
+          {action: "click->modal#delayedClose"}
         else
           {}
         end
@@ -109,7 +109,7 @@ module Avo
       args = {
         fields: processed_fields,
         current_user: current_user,
-        resource: resource,
+        resource: resource
       }
 
       args[:models] = models unless standalone

data/lib/avo/base_resource.rb

@@ -11,6 +11,7 @@ module Avo
     delegate :avo, to: :view_context
     delegate :resource_path, to: :view_context
     delegate :resources_path, to: :view_context
+    delegate :t, to: ::I18n
 
     attr_accessor :view
     attr_accessor :model
@@ -26,7 +27,7 @@ module Avo
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
-    class_attribute :translation_enabled
+    class_attribute :translation_enabled, default: false
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
     class_attribute :actions_loader
@@ -38,8 +39,11 @@ module Avo
     class_attribute :resolve_query_scope
     class_attribute :resolve_find_scope
     class_attribute :ordering
+    class_attribute :search_hide_from_global_search, default: false
 
     class << self
+      delegate :t, to: ::I18n
+
       def grid(&block)
         grid_collector = GridCollector.new
         grid_collector.instance_eval(&block)
@@ -96,6 +100,8 @@ module Avo
           self.class.model_class = model_class.base_class
         end
       end
+
+      self.class.translation_enabled = ::Avo::App.translation_enabled
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -215,7 +221,7 @@ module Avo
       when :edit
         model_title
       when :new
-        I18n.t("avo.create_new_item", item: name.downcase).upcase_first
+        t("avo.create_new_item", item: name.downcase).upcase_first
       end
     end
 
@@ -244,9 +250,18 @@ module Avo
       class_name_without_resource.safe_constantize
     end
 
+    def model_id
+      @model.send id
+    end
+
     def model_title
-      return @model.send title if @model.present?
+      return name if @model.nil?
 
+      the_title = @model.send title
+      return the_title if the_title.present?
+
+      model_id
+    rescue
       name
     end
 
@@ -267,11 +282,13 @@ module Avo
     end
 
     def name
+      default = class_name_without_resource.titlecase
+
       return @name if @name.present?
 
-      return I18n.t(translation_key, count: 1).capitalize if translation_key
+      return t(translation_key, count: 1, default: default).capitalize if translation_key
 
-      class_name_without_resource.titlecase
+      default
     end
 
     def singular_name
@@ -279,9 +296,11 @@ module Avo
     end
 
     def plural_name
-      return I18n.t(translation_key, count: 2).capitalize if translation_key
+      default = name.pluralize
+
+      return t(translation_key, count: 2, default: default).capitalize if translation_key
 
-      name.pluralize
+      default
     end
 
     def underscore_name

data/lib/avo/configuration.rb

@@ -28,6 +28,7 @@ module Avo
     attr_accessor :current_user_resource_name
     attr_accessor :raise_error_on_missing_policy
     attr_accessor :disabled_features
+    attr_accessor :buttons_on_form_footers
 
     def initialize
       @root_path = "/avo"
@@ -68,6 +69,7 @@ module Avo
       @current_user_resource_name = "user"
       @raise_error_on_missing_policy = false
       @disabled_features = []
+      @buttons_on_form_footers = false
     end
 
     def locale_tag

data/lib/avo/dashboards/base_dashboard.rb

@@ -8,6 +8,7 @@ module Avo
       class_attribute :description
       class_attribute :items_holder
       class_attribute :grid_cols, default: 3
+      class_attribute :visible, default: true
 
       class << self
         def card(klass)
@@ -48,6 +49,22 @@ module Avo
         def navigation_path
           "#{Avo::App.root_path}/dashboards/#{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/chartkick_card.rb

@@ -24,7 +24,7 @@ module Avo
 
       def chartkick_options
         card_height = 144
-        card_heading = 32
+        card_heading = 40
 
         default = {
           # figure our the available height for the chart

data/lib/avo/fields/base_field.rb

@@ -10,6 +10,7 @@ module Avo
       delegate :view_context, to: "Avo::App"
       delegate :main_app, to: :view_context
       delegate :avo, to: :view_context
+      delegate :t, to: ::I18n
 
       attr_reader :id
       attr_reader :block
@@ -48,7 +49,7 @@ module Avo
         @id = id
         @name = args[:name]
         @translation_key = args[:translation_key]
-        @translation_enabled = false
+        @translation_enabled = ::Avo::App.translation_enabled
         @block = block
         @required = args[:required] || false
         @readonly = args[:readonly] || false
@@ -94,18 +95,26 @@ module Avo
         @translation_key
       end
 
+      # Getting the name of the resource (user/users, post/posts)
+      # We'll first check to see if the user passed a name
+      # Secondly we'll try to find a translation key
+      # We'll fallback to humanizing the id
       def name
+        default = @id.to_s.humanize(keep_id_suffix: true)
+
         return @name if @name.present?
 
-        return I18n.t(translation_key, count: 1).capitalize if translation_key
+        return t(translation_key, count: 1, default: default).capitalize if @translation_key
 
-        @id.to_s.humanize(keep_id_suffix: true)
+        default
       end
 
       def plural_name
-        return I18n.t(translation_key, count: 2).capitalize if translation_key
+        default = name.pluralize
+
+        return t(translation_key, count: 2, default: default).capitalize if @translation_key
 
-        name.pluralize
+        default
       end
 
       def placeholder
@@ -181,8 +190,12 @@ module Avo
         "#{type.camelize}Field"
       end
 
+      # Try and build the component class or fallback to a blank one
       def component_for_view(view = :index)
-        "Avo::Fields::#{view_component_name}::#{view.to_s.camelize}Component".safe_constantize
+        component_class = "::Avo::Fields::#{view_component_name}::#{view.to_s.camelize}Component"
+        component_class.constantize
+      rescue
+        ::Avo::BlankFieldComponent
       end
 
       def model_errors

data/lib/avo/fields/belongs_to_field.rb

@@ -70,7 +70,7 @@ module Avo
         @searchable = args[:searchable] == true
         @polymorphic_as = args[:polymorphic_as]
         @types = args[:types]
-        @relation_method = name.to_s.parameterize.underscore
+        @relation_method = id.to_s.parameterize.underscore
       end
 
       def searchable

data/lib/avo/fields/external_image_field.rb

@@ -11,8 +11,8 @@ module Avo
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
 
-        @width = args[:width].present? ? args[:width] : 32
-        @height = args[:height].present? ? args[:height] : 32
+        @width = args[:width].present? ? args[:width] : 40
+        @height = args[:height].present? ? args[:height] : 40
         @radius = args[:radius].present? ? args[:radius] : 0
       end
 

data/lib/avo/hosts/dashboard_visibility.rb

@@ -0,0 +1,19 @@
+require "dry-initializer"
+
+module Avo
+  module Hosts
+    class DashboardVisibility
+      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 :dashboard
+      option :params, default: proc { ::Avo::App.params }
+
+      def handle
+        instance_exec(&block)
+      end
+    end
+  end
+end

data/lib/avo/licensing/pro_license.rb

@@ -4,6 +4,7 @@ module Avo
       def abilities
         [
           :authorization,
+          :localization,
           :custom_tools,
           :custom_fields,
           :global_search,

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/generators/avo/templates/dashboards/dashboard.tt

@@ -3,7 +3,10 @@ class <%= class_name.camelize %> < Avo::Dashboards::BaseDashboard
   self.name = "<%= name.underscore.humanize %>"
   # self.description = "Tiny dashboard description"
   # self.grid_cols = 3
+  # self.visible = -> do
+  #   true
+  # end
 
   # cards go here
-  # card metric: UsersCount
+  # card UsersCount
 end

data/public/avo-assets/avo.css

@@ -6220,10 +6220,6 @@ progress[value]::-moz-progress-bar{
   left:0px
 }
 
-.bottom-0{
-  bottom:0px
-}
-
 .left-1\/2{
   left:50%
 }
@@ -6232,6 +6228,10 @@ progress[value]::-moz-progress-bar{
   top:50%
 }
 
+.bottom-0{
+  bottom:0px
+}
+
 .left-auto{
   left:auto
 }
@@ -6377,14 +6377,6 @@ progress[value]::-moz-progress-bar{
   margin-top:0.25rem
 }
 
-.mb-4{
-  margin-bottom:1rem
-}
-
-.mr-1{
-  margin-right:0.25rem
-}
-
 .-ml-20{
   margin-left:-5rem
 }
@@ -6413,6 +6405,14 @@ progress[value]::-moz-progress-bar{
   margin-top:-2.5rem
 }
 
+.mb-4{
+  margin-bottom:1rem
+}
+
+.mr-1{
+  margin-right:0.25rem
+}
+
 .mr-4{
   margin-right:1rem
 }
@@ -6437,6 +6437,10 @@ progress[value]::-moz-progress-bar{
   margin-bottom:0.5rem
 }
 
+.mt-6{
+  margin-top:1.5rem
+}
+
 .mt-3{
   margin-top:0.75rem
 }
@@ -6545,10 +6549,6 @@ progress[value]::-moz-progress-bar{
   height:100%
 }
 
-.h-6{
-  height:1.5rem
-}
-
 .h-40{
   height:10rem
 }
@@ -6561,6 +6561,10 @@ progress[value]::-moz-progress-bar{
   height:2rem
 }
 
+.h-6{
+  height:1.5rem
+}
+
 .h-\[250px\]{
   height:250px
 }
@@ -6991,6 +6995,10 @@ progress[value]::-moz-progress-bar{
   border-width:1px
 }
 
+.border-b-2{
+  border-bottom-width:2px
+}
+
 .border-b{
   border-bottom-width:1px
 }
@@ -7007,6 +7015,10 @@ progress[value]::-moz-progress-bar{
   border-left-width:1px
 }
 
+.border-dashed{
+  border-style:dashed
+}
+
 .border-slate-500{
   --tw-border-opacity:1;
   border-color:rgb(100 116 139 / var(--tw-border-opacity))
@@ -7314,6 +7326,11 @@ progress[value]::-moz-progress-bar{
   padding-right:0px
 }
 
+.py-12{
+  padding-top:3rem;
+  padding-bottom:3rem
+}
+
 .py-6{
   padding-top:1.5rem;
   padding-bottom:1.5rem
@@ -7324,11 +7341,6 @@ progress[value]::-moz-progress-bar{
   padding-right:1.5rem
 }
 
-.py-12{
-  padding-top:3rem;
-  padding-bottom:3rem
-}
-
 .py-0\.5{
   padding-top:0.125rem;
   padding-bottom:0.125rem
@@ -8712,6 +8724,10 @@ trix-editor {
 }
 
 @media (min-width: 1280px){
+  .xl\:right-0{
+    right:0px
+  }
+
   .xl\:mt-0{
     margin-top:0px
   }