avo 0.3.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fc8f29ce910c3eeb8bb2d80e61bc7b65385fd0b4bbb71ef9cf85556cf943bc3
-  data.tar.gz: 277415ac5daec5c8985d3ee62e2ec3dd779ea23df8b5fbc0993fb64da774a54a
+  metadata.gz: 9cab03834ddaad490fcd3f0eb64f9ac2006dacb235c2ffb34a451139da31444a
+  data.tar.gz: 20c9770b7b259b0207857e4b70450b73748c5d30b7dd405662b720e5f97499ba
 SHA512:
-  metadata.gz: e44bf33db4a90366e85780d500d0d476b22b74a8cdec88bb39c1da5e86e5dad6c866bef3f5ab8386f6a51b382aa1ec19ec2f8d20e3aa940ced316d8ca3558701
-  data.tar.gz: 2365d6464818c443ccb4808c041c084d1cfa5a795e63419e90524be642c64c817249e59b69b27d569ba97247c50089a58511c8f45d2106716f1d028bb506c3d6
+  metadata.gz: e024dbbb67133f849c0b45b65694ba6322bf8e07d5ae399280e9e233b54bf26ee954aaabf8eebdfd81e33db79b007ce78a73be5fc99e5fb3b5089b4a75121d81
+  data.tar.gz: 1d52cf19ca6a8a831222fd36762862de3e88f8f02c4469eaa19e98844da6f707677120e0f92d13bb47caed37fa3e7cf3f24b6f7f10a049805cbe222a3653fb42

data/Gemfile

@@ -59,8 +59,7 @@ gem 'spring'
 gem 'spring-watcher-listen', '~> 2.0.0'
 
 gem 'factory_bot_rails'
-gem 'faker'
-
+gem 'faker', require: false
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
@@ -94,3 +93,7 @@ gem 'zeitwerk', '~> 2.3'
 gem 'kaminari'
 
 gem 'httparty'
+
+gem 'iso'
+
+gem 'i18n-js'

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    avo (0.3.2)
+    avo (0.4.5)
       countries
       httparty
+      i18n-js
       inline_svg
       kaminari
       pundit
@@ -132,10 +133,14 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
+    i18n-js (3.8.0)
+      i18n (>= 0.6.6)
     i18n_data (0.10.0)
     inline_svg (1.7.1)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
+    iso (0.3.0)
+      i18n
     jbuilder (2.10.1)
       activesupport (>= 5.0.0)
     kaminari (1.2.1)
@@ -341,7 +346,9 @@ DEPENDENCIES
   fuubar
   gem-release
   httparty
+  i18n-js
   inline_svg
+  iso
   jbuilder (~> 2.7)
   kaminari
   listen (>= 3.0.5, < 3.2)

data/app/controllers/avo/application_controller.rb

@@ -5,7 +5,7 @@ module Avo
     before_action :init_app
 
     def init_app
-      Avo::App.boot unless Rails.env.production?
+      Avo::App.boot if Avo::IN_DEVELOPMENT
       Avo::App.init request
 
       @license = Avo::App.license
@@ -58,7 +58,7 @@ module Avo
       end
 
       def render_unauthorized
-        render json: { message: 'Unauthorized' }, status: 403
+        render json: { message: I18n.t('avo.unauthorized') }, status: 403
       end
   end
 end

data/app/controllers/avo/relations_controller.rb

@@ -9,7 +9,7 @@ module Avo
 
       render json: {
         success: true,
-        message: "#{attachment_class} attached.",
+        message: I18n.t('avo.attachment_class_attached', attachment_class: attachment_class),
       }
     end
 
@@ -18,7 +18,7 @@ module Avo
 
       render json: {
         success: true,
-        message: "#{attachment_class} attached.",
+        message: I18n.t('avo.attachment_class_detached', attachment_class: attachment_class),
       }
     end
 
@@ -28,7 +28,7 @@ module Avo
       end
 
       def attachment_model
-        attachment_class.safe_constantize.find params[:attachment_id]
+        resource._reflections[params[:attachment_name].to_s].klass.find params[:attachment_id]
       end
   end
 end

data/app/controllers/avo/resource_overview_controller.rb

@@ -5,6 +5,7 @@ module Avo
     def index
       resources = App.get_resources
         .select { |resource| AuthorizationService::authorize session_user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'] }
+        .sort_by(&:name)
         .map do |resource|
           {
             name: resource.name,

data/app/controllers/avo/resources_controller.rb

@@ -95,7 +95,7 @@ module Avo
       render json: {
         success: true,
         resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :show, user: current_user),
-        message: 'Resource updated',
+        message: I18n.t('avo.resource_updated'),
       }
     end
 
@@ -118,7 +118,7 @@ module Avo
       render json: {
         success: true,
         resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :create, user: current_user),
-        message: 'Resource created',
+        message: I18n.t('avo.resource_created'),
       }
     end
 
@@ -132,7 +132,7 @@ module Avo
       resource.destroy!
 
       render json: {
-        message: 'Resource destroyed',
+        message: I18n.t('avo.resource_destroyed'),
       }
     end
 
@@ -224,8 +224,8 @@ module Avo
         avo_resource.get_filters.each do |filter_class|
           filter = filter_class.new
 
-          if filter.default_value.present?
-            filter_defaults[filter_class.to_s] = filter.default_value
+          if filter.default.present?
+            filter_defaults[filter_class.to_s] = filter.default
           end
         end
 
@@ -252,11 +252,13 @@ module Avo
 
       def build_meta
         {
-          per_page_steps: Avo.configuration.per_page_steps,
+          per_page_steps: [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i].sort.uniq,
           available_view_types: avo_resource.available_view_types,
           default_view_type: avo_resource.default_view_type || Avo.configuration.default_view_type,
+          translation_key: avo_resource.translation_key,
           authorization: {
             create: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['create']),
+            edit: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['edit']),
             update: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['update']),
             show: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['show']),
             destroy: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['destroy']),

data/app/views/layouts/avo/_javascript.html.erb

@@ -1,6 +1,8 @@
-<script>
+<%= javascript_tag nonce: true do %>
   var rootPath = '<%= Avo.configuration.root_path %>';
   var timezone = '<%= Avo.configuration.timezone %>';
+  var locale = '<%= Avo.configuration.locale %>';
   var defaultViewType = '<%= Avo.configuration.default_view_type %>';
   var license = <%= Avo::App.license.properties.to_json.html_safe %>;
-</script>
+  var avoResources = <%= Avo::App.get_available_resources(current_user).as_json.html_safe %>;
+<% end %>

data/app/views/layouts/avo/_translations.html.erb

@@ -0,0 +1,5 @@
+<%= javascript_tag nonce: true do %>
+  I18n.defaultLocale = 'en';
+  I18n.locale = "<%= Avo.configuration.language_code %>";
+<% end %>
+<%= javascript_include_tag 'translations', skip_pipeline: true %>

data/app/views/layouts/avo/application.html.erb

@@ -8,8 +8,10 @@
 
   <%= javascript_pack_tag 'application' %>
   <%= stylesheet_pack_tag 'application', media: 'all' %>
+  <%= render partial: 'layouts/avo/translations' %>
   <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap" rel="stylesheet">
 </head>
+
 <body class="bg-gray-200">
 
 <div id="app" class="flex min-h-screen flex-row h-full">
@@ -19,7 +21,7 @@
     inline-template
   >
     <div>
-      <application-sidebar :resources='<%= Avo::App.get_resources_navigation(current_user).as_json.html_safe %>' v-if="layout !== 'blank'">
+      <application-sidebar v-if="layout !== 'blank'">
         <template #logo>
           <%= render_logo %>
         </template>
@@ -28,8 +30,8 @@
         </template>
       </application-sidebar>
 
-      <div class="flex-1 h-full overflow-auto">
-        <div class="relative bg-white p-2 shadow-md h-16 w-full flex items-center z-40" v-if="layout !== 'blank'">
+      <div class="flex-1 flex flex-col h-full overflow-auto">
+        <div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50" v-if="layout !== 'blank'">
           <div class="ml-6">
             <%= render_header %>
           </div>
@@ -43,7 +45,8 @@
         <div v-if="layout === 'blank'" class="h-full w-full flex justify-center items-center">
           <%= yield %>
         </div>
-        <div class="content p-8" v-else>
+
+        <div class="content p-8 flex-1 flex flex-col justify-between items-stretch" v-else>
           <%= yield %>
           <%= render_footer %>
         </div>
@@ -51,6 +54,8 @@
     </div>
   </app-layout>
 </div>
+
 <%= render_scripts %>
+
 </body>
 </html>

data/avo.gemspec

@@ -40,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'countries'
   spec.add_dependency 'pundit'
   spec.add_dependency 'httparty'
+  spec.add_dependency 'i18n-js'
 end

data/lib/avo.rb

@@ -15,6 +15,8 @@ require_relative 'avo/app/licensing/license_manager'
 
 module Avo
   ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
+  IN_DEVELOPMENT = ENV['AVO_IN_DEVELOPMENT'] == '1'
+  PACKED = !IN_DEVELOPMENT
 
   class << self
     def webpacker

data/lib/avo/app/action.rb

@@ -15,6 +15,7 @@ module Avo
       #   filename: String
       # }
       attr_accessor :response
+      attr_accessor :no_confirmation
 
       @@default = nil
 
@@ -37,15 +38,16 @@ module Avo
 
       def initialize
         @name ||= name
-        @message ||= 'Are you sure you want to run this action?'
+        @message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
         @default ||= ''
         @fields ||= []
-        @confirm_text = 'Run'
-        @cancel_text = 'Cancel'
+        @confirm_text = I18n.t('avo.run')
+        @cancel_text = I18n.t('avo.cancel')
         @response ||= {}
         @response[:message_type] ||= :success
-        @response[:message] ||= 'Action ran successfully!'
+        @response[:message] ||= I18n.t('avo.action_ran_successfully')
         @theme ||= 'success'
+        @no_confirmation ||= false
       end
 
       def render_response(model, resource)
@@ -61,6 +63,7 @@ module Avo
           cancel_text: cancel_text,
           default: default,
           action_class: self.class.to_s,
+          no_confirmation: no_confirmation,
         }
       end
 
@@ -87,7 +90,7 @@ module Avo
       end
 
       def name
-        self.class.name.demodulize.underscore.humanize
+        self.class.name.demodulize.underscore.humanize(keep_id_suffix: true)
       end
 
       def succeed(text)

data/lib/avo/app/app.rb

@@ -4,7 +4,7 @@ require_relative 'filters/select_filter'
 require_relative 'filters/boolean_filter'
 require_relative 'resource'
 require_relative 'tool'
-require_relative 'authorization_service'
+require_relative 'services/authorization_service'
 
 module Avo
   class App
@@ -12,6 +12,7 @@ module Avo
       root_path: '',
       resources: [],
       field_names: {},
+      cache_store: nil
     }
     @@license = nil
 
@@ -19,6 +20,13 @@ module Avo
       def boot
         @@app[:root_path] = Pathname.new(File.join(__dir__, '..', '..'))
         init_fields
+        I18n.locale = Avo.configuration.language_code
+
+        if Rails.cache.class == ActiveSupport::Cache::NullStore
+          @@app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
+        else
+          @@app[:cache_store] = Rails.cache
+        end
       end
 
       def init(current_request = nil)
@@ -34,6 +42,10 @@ module Avo
         @@license
       end
 
+      def cache_store
+        @@app[:cache_store]
+      end
+
       # This method will take all fields available in the Avo::Fields namespace and create a method for them.
       #
       # If the field has their `def_method` set up it will follow that convention, if not it will snake_case the name:
@@ -120,6 +132,16 @@ module Avo
         self.get_resource name.singularize.camelize
       end
 
+      # This returns the Avo resource by singular snake_cased name
+      #
+      # get_resource_by_name('User') => Avo::Resources::User
+      # get_resource_by_name(User) => Avo::Resources::User
+      def get_resource_by_model_name(name)
+        get_resources.find do |resource|
+          resource.class.name.demodulize == name.to_s
+        end
+      end
+
       # This returns the Rails model class by singular snake_cased name
       #
       # get_model_class_by_name('user') => User
@@ -127,10 +149,16 @@ module Avo
         name.to_s.camelize.singularize
       end
 
-      def get_resources_navigation(user)
+      def get_available_resources(user)
         App.get_resources
           .select { |resource| AuthorizationService::authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'] }
-          .map { |resource| { label: resource.resource_name_plural.humanize, resource_name: resource.url.pluralize } }
+          .map do |resource|
+            {
+              label: resource.plural_name.humanize(keep_id_suffix: true),
+              resource_name: resource.url.pluralize,
+              translation_key: resource.translation_key
+            }
+          end
           .reject { |i| i.blank? }
           .to_json
           .to_s

data/lib/avo/app/fields/belongs_to.rb

@@ -7,7 +7,7 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           component: 'belongs-to-field',
-          placeholder: "Choose #{name.downcase}",
+          placeholder: I18n.t('avo.choose_an_option')
         }
 
         @searchable = args[:searchable] == true ? true : false
@@ -22,7 +22,8 @@ module Avo
         fields[:searchable] = @searchable
         fields[:is_relation] = true
         fields[:database_id] = foreign_key model
-        target_resource = App.get_resources.find { |r| r.class == "Avo::Resources::#{name}".safe_constantize }
+
+        target_resource = get_target_resource model
 
         relation_model = model.public_send(@relation_method)
 
@@ -49,7 +50,7 @@ module Avo
           end
         end
 
-        fields[:resource_name_plural] = target_resource.resource_name_plural
+        fields[:plural_name] = target_resource.plural_name
 
         fields
       end
@@ -61,6 +62,16 @@ module Avo
           model.class.reflections[@relation_method].foreign_key
         end
       end
+
+      def get_target_resource(model)
+        if model._reflections[id.to_s].klass.present?
+          App.get_resource_by_model_name model._reflections[id.to_s].klass.to_s
+        elsif model._reflections[id.to_s].options[:class_name].present?
+          App.get_resource_by_model_name model._reflections[id.to_s].options[:class_name]
+        else
+          App.get_resource_by_name class_name.to_s
+        end
+      end
     end
   end
 end

data/lib/avo/app/fields/code_field.rb

@@ -12,12 +12,14 @@ module Avo
 
         @language = args[:language].present? ? args[:language].to_s : 'javascript'
         @theme = args[:theme].present? ? args[:theme].to_s : 'material-darker'
+        @height = args[:height].present? ? args[:height].to_s : 'auto'
       end
 
       def hydrate_field(fields, model, resource, view)
         {
           language: @language,
           theme: @theme,
+          height: @height,
         }
       end
     end

data/lib/avo/app/fields/country_field.rb

@@ -5,7 +5,7 @@ module Avo
         @defaults = {
           sortable: true,
           component: 'country-field',
-          placeholder: 'Choose a country',
+          placeholder: I18n.t('avo.choose_a_country'),
         }
 
         super(name, **args, &block)