avo 1.21.0.pre.1 → 1.22.0

data/lib/avo/fields/belongs_to_field.rb

@@ -1,10 +1,9 @@
 module Avo
   module Fields
     class BelongsToField < BaseField
-      attr_reader :searchable
       attr_reader :polymorphic_as
       attr_reader :relation_method
-      attr_reader :types
+      attr_reader :types # for Polymorphic associations
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -17,10 +16,28 @@ module Avo
         @relation_method = name.to_s.parameterize.underscore
       end
 
+      def searchable
+        @searchable && ::Avo::App.license.has_with_trial(:searchable_belongs_to)
+      end
+
       def value
         super(polymorphic_as)
       end
 
+      # The value
+      def field_value
+        value.send(database_value)
+      rescue
+        nil
+      end
+
+      # What the user sees in the text field
+      def field_label
+        value.send(target_resource.class.title)
+      rescue
+        nil
+      end
+
       def options
         ::Avo::Services::AuthorizationService.apply_policy(user, target_resource.class.query_scope).all.map do |model|
           {

data/lib/avo/fields/files_field.rb

@@ -1,14 +1,15 @@
 module Avo
   module Fields
     class FilesField < BaseField
+      attr_accessor :is_audio
       attr_accessor :is_image
       attr_accessor :direct_upload
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false
+        @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
       end
 

data/lib/avo/fields/key_value_field.rb

@@ -3,10 +3,6 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
-      attr_reader :key_label
-      attr_reader :value_label
-      attr_reader :action_text
-      attr_reader :delete_text
       attr_reader :disable_editing_keys
       attr_reader :disable_adding_rows
 
@@ -15,10 +11,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
+        @key_label = args[:key_label] if args[:key_label].present?
+        @value_label = args[:value_label]if args[:value_label].present?
+        @action_text = args[:action_text] if args[:action_text].present?
+        @delete_text = args[:delete_text] if args[:delete_text].present?
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)
@@ -32,6 +28,30 @@ module Avo
         @disable_deleting_rows = args[:disable_deleting_rows].present? ? args[:disable_deleting_rows] : false
       end
 
+      def key_label
+        return @key_label if @key_label.present?
+
+        I18n.translate('avo.key_value_field.key')
+      end
+
+      def value_label
+        return @value_label if @value_label.present?
+
+        I18n.translate('avo.key_value_field.value')
+      end
+
+      def action_text
+        return @action_text if @action_text.present?
+
+        I18n.translate('avo.key_value_field.add_row')
+      end
+
+      def delete_text
+        return @delete_text if @delete_text.present?
+
+        I18n.translate('avo.key_value_field.delete_row')
+      end
+
       def to_permitted_param
         [:"#{id}", "#{id}": {}]
       end

data/lib/avo/licensing/pro_license.rb

@@ -7,7 +7,8 @@ module Avo
           :custom_tools,
           :custom_fields,
           :global_search,
-          :enhanced_search_results
+          :enhanced_search_results,
+          :searchable_belongs_to,
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.21.0.pre.1"
+  VERSION = "1.22.0"
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -93,3 +93,5 @@ en:
       delete_row: 'Delete row'
     was_successfully_created: 'was successfully created'
     was_successfully_updated: 'was successfully updated'
+    clear_value: "Clear value"
+    tools: Tools

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -81,3 +81,4 @@ nb-NO:
     search_placeholder: 'Søk'
     search_cancel_button: 'Avbryt'
     sign_out: 'Logg ut'
+    tools: Redskapene

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -83,3 +83,4 @@ pt-BR:
       placeholder: 'Procurar'
       cancel_button: 'Cancelar'
     sign_out: 'sair'
+    tools: Ferramentas

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -78,3 +78,4 @@ ro:
       delete_row: 'Sterge rand'
     was_successfully_created: 'a fost creat'
     was_successfully_updated: 'a fost actualizat'
+    tools: Instrumente

data/public/avo-assets/avo.css

@@ -6402,6 +6402,14 @@ progress[value]::-moz-progress-bar{
   top:-1px
 }
 
+.left-auto{
+  left:auto
+}
+
+.right-3{
+  right:0.75rem
+}
+
 .z-10{
   z-index:10
 }
@@ -6571,6 +6579,14 @@ progress[value]::-moz-progress-bar{
   margin-left:0.5rem
 }
 
+.mr-px{
+  margin-right:1px
+}
+
+.-mt-2{
+  margin-top:-0.5rem
+}
+
 .ml-6{
   margin-left:1.5rem
 }
@@ -6635,6 +6651,10 @@ progress[value]::-moz-progress-bar{
   height:10rem
 }
 
+.h-16{
+  height:4rem
+}
+
 .h-full{
   height:100%
 }
@@ -6643,10 +6663,6 @@ progress[value]::-moz-progress-bar{
   height:3rem
 }
 
-.h-16{
-  height:4rem
-}
-
 .h-3{
   height:0.75rem
 }