avo 1.16.2 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391b29088645004eb4d4f3c2f6bc01ab86695aaf85f4d076004b08730ab2f8ff
-  data.tar.gz: d062bfc791119e31a8c3868cfe2842b3835a4bfc52668a6252e5f7c85fe064e0
+  metadata.gz: f979b13adfa02e58a8d2b3b4f6463d0fcef9200cdc4a4dee76b268ebc5a5e8b0
+  data.tar.gz: acdddcbb5516ffd36f1538877472f4f8a4ec5f2423a4ddea69b7eed5b156c308
 SHA512:
-  metadata.gz: e8c30ba4c563d73564be81cdc2391f0a1f88cb435aff55ba1e01ac196c835d9e77ffbf265a7ef1a9721dc91569dbb5744af3d3c72688ebf2e5453b12b4edf644
-  data.tar.gz: 1525ced018fb96312cd7317e424124e31021dbf37b42c505aecce07ac151a1a27a932fdc9553ceb882ba434db877fa3f2f3dd0f6dd6ca92094304eee986649bc
+  metadata.gz: '050786326a44c661a9c3467cf9f5b3ed5df27a8b713040a9126be15f96b3fcf553b8cd7c7f23fe01339665eac1f41d2a203fca4c3c671676c28b9c6efaf18cb9'
+  data.tar.gz: 417a94817cdad9255904bbff41dc5aa911b2dfa02c31ac2f1d2deb46c6038e7a563d802ad0d2b4533e6001e06d455b2fd9cf48a47c2556539e143f48b95ff6ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.16.2)
+    avo (1.17.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/controllers/avo/actions_controller.rb

@@ -19,7 +19,9 @@ module Avo
       end
 
       args = {
-        fields: fields
+        fields: fields,
+        current_user: _current_user,
+        resource: resource,
       }
 
       args[:models] = models unless @action.standalone

data/app/packs/js/controllers/filter_controller.js

@@ -21,6 +21,23 @@ export default class extends Controller {
     return param
   }
 
+  b64EncodeUnicode(str) {
+    // first we use encodeURIComponent to get percent-encoded UTF-8,
+    // then we convert the percent encodings into raw bytes which
+    // can be fed into btoa.
+    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
+      function toSolidBytes(match, p1) {
+        return String.fromCharCode('0x' + p1);
+      }));
+  }
+
+  b64DecodeUnicode(str) {
+    // Going backwards: from bytestream, to percent-encoding, to original string.
+    return decodeURIComponent(atob(str).split('').map(function(c) {
+      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+    }).join(''));
+  }
+
   changeFilter() {
     const value = this.getFilterValue()
     const filterClass = this.getFilterClass()
@@ -28,7 +45,7 @@ export default class extends Controller {
     let filters = this.uriParams()[this.uriParam('filters')]
 
     if (filters) {
-      filters = JSON.parse(atob(filters))
+      filters = JSON.parse(this.b64DecodeUnicode(filters))
     } else {
       filters = {}
     }
@@ -46,7 +63,7 @@ export default class extends Controller {
     let encodedFilters
 
     if (filtered && Object.keys(filtered).length > 0) {
-      encodedFilters = btoa(JSON.stringify(filtered))
+      encodedFilters = this.b64EncodeUnicode(JSON.stringify(filtered))
     }
 
     const url = new URI(this.urlRedirectTarget.href)

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

@@ -17,7 +17,7 @@
 
   <% if main_app.respond_to?(:destroy_user_session_path) %>
     <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-      <%= button_to "Sign out", main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+      <%= button_to t('avo.sign_out'), main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
     </div>
   <% end %>
 </div>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -11,8 +11,8 @@
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 
         <div class="w-full">
-          <% Avo::App.resources_navigation(_current_user).each do |resource| %>
-            <%= render Avo::NavigationLinkComponent.new label: resource.plural_name.humanize, path: resources_path(resource.model_class) %>
+          <% Avo::App.resources_navigation(_current_user).sort_by { |r| r.navigation_label }.each do |resource| %>
+            <%= render Avo::NavigationLinkComponent.new label: resource.navigation_label, path: resources_path(resource.model_class) %>
           <% end %>
 
           <% sidebar_partials = Avo::App.get_sidebar_partials %>

data/lib/avo/base_action.rb

@@ -70,7 +70,7 @@ module Avo
     end
 
     def handle_action(**args)
-      models, fields = args.values_at(:models, :fields)
+      models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
       avo_fields = get_fields.map { |field| [field.id, field] }.to_h
 
       if fields.present?
@@ -84,7 +84,9 @@ module Avo
       end
 
       args = {
-        fields: processed_fields
+        fields: processed_fields,
+        current_user: current_user,
+        resource: resource,
       }
 
       args[:models] = models unless standalone

data/lib/avo/base_resource.rb

@@ -16,6 +16,7 @@ module Avo
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
+    class_attribute :translation_enabled
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
     class_attribute :actions_loader
@@ -94,7 +95,7 @@ module Avo
       return [] if self.class.fields.blank?
 
       fields = self.class.fields.map do |field|
-        field.hydrate(resource: self, panel_name: default_panel_name, user: user)
+        field.hydrate(resource: self, panel_name: default_panel_name, user: user, translation_enabled: translation_enabled)
       end
 
       if Avo::App.license.lacks_with_trial(:custom_fields)
@@ -192,12 +193,16 @@ module Avo
       ]
     end
 
+    def class_name_without_resource
+      self.class.name.demodulize.chomp("Resource")
+    end
+
     def model_class
       return self.class.model_class if self.class.model_class.present?
 
       return @model.class if @model.present?
 
-      self.class.name.demodulize.chomp("Resource").safe_constantize
+      class_name_without_resource.safe_constantize
     end
 
     def model_title
@@ -206,12 +211,18 @@ module Avo
       name
     end
 
+    def translation_key
+      return "avo.resource_translations.#{class_name_without_resource.underscore}" if self.class.translation_enabled
+
+      self.class.translation_key
+    end
+
     def name
       return @name if @name.present?
 
-      return I18n.t(self.class.translation_key, count: 1).capitalize if self.class.translation_key
+      return I18n.t(translation_key, count: 1).capitalize if translation_key
 
-      self.class.name.demodulize.chomp("Resource").titlecase
+      class_name_without_resource.titlecase
     end
 
     def singular_name
@@ -219,7 +230,7 @@ module Avo
     end
 
     def plural_name
-      return I18n.t(self.class.translation_key, count: 2).capitalize if self.class.translation_key
+      return I18n.t(translation_key, count: 2).capitalize if translation_key
 
       name.pluralize
     end
@@ -230,6 +241,10 @@ module Avo
       self.class.name.demodulize.underscore
     end
 
+    def navigation_label
+      plural_name.humanize
+    end
+
     def available_view_types
       view_types = [:table]
 

data/lib/avo/fields/base_field.rb

@@ -6,8 +6,6 @@ module Avo
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
       attr_reader :id
-      attr_reader :name
-      attr_reader :translation_key
       attr_reader :block
       attr_reader :required
       attr_reader :readonly
@@ -43,8 +41,9 @@ module Avo
         super(id, **args, &block)
 
         @id = id
-        @name = args[:name] || id.to_s.humanize(keep_id_suffix: true)
+        @name = args[:name]
         @translation_key = args[:translation_key]
+        @translation_enabled = false
         @block = block
         @required = args[:required] || false
         @readonly = args[:readonly] || false
@@ -72,20 +71,35 @@ module Avo
         except_on args[:except_on] if args[:except_on].present?
       end
 
-      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
+      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil, translation_enabled: nil)
         @model = model if model.present?
         @view = view if view.present?
         @resource = resource if resource.present?
         @action = action if action.present?
         @user = user if user.present?
         @panel_name = panel_name if panel_name.present?
+        @translation_enabled = translation_enabled if translation_enabled.present?
 
         self
       end
 
+      def translation_key
+        return "avo.field_translations.#{@id}" if @translation_enabled
+
+        @translation_key
+      end
+
+      def name
+        return @name if @name.present?
+
+        return I18n.t(translation_key, count: 1).capitalize if translation_key
+
+        @id.to_s.humanize(keep_id_suffix: true)
+      end
+
       def visible?
         if visible.present? && visible.respond_to?(:call)
-          visible.call resource: resource
+          visible.call resource: @resource
         else
           visible
         end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.16.2"
+  VERSION = "1.17.1"
 end

data/lib/generators/avo/templates/action.tt

@@ -1,7 +1,9 @@
 class <%= class_name.camelize %> < Avo::BaseAction
   self.name = '<%= name.underscore.humanize %>'
 
-  def handle(models:, fields:)
+  def handle(**args)
+    models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
+
     models.each do |model|
       # Do something with your models.
     end

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

@@ -83,3 +83,4 @@ en:
     search:
       placeholder: 'Search'
       cancel_button: 'Cancel'
+    sign_out: 'Sign out'

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

@@ -80,3 +80,4 @@ nb-NO:
     not_authorized: 'Du er ikke autorisert til å gjøre denne handlingen.'
     search_placeholder: 'Søk'
     search_cancel_button: 'Avbryt'
+    sign_out: 'Logg ut'

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

@@ -82,3 +82,4 @@ pt-BR:
     search:
       placeholder: 'Procurar'
       cancel_button: 'Cancelar'
+    sign_out: 'sair'

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

@@ -70,3 +70,4 @@ ro:
     search:
       placeholder: 'Cauta'
       cancel_button: 'Anulare'
+    sign_out: 'Delogare'