avo 0.5.0.beta1 → 0.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26cae03c309f786a7018713503e33b0ea96e75b5278463ce9cded4307d20bb0d
-  data.tar.gz: d0d793758868c352618f43c069ecbc49c2c7dbb1d5ab96599a43cf14035f1eae
+  metadata.gz: 714d80a0c55444d87252f30e9233fe5db432136e9cd4ba0ad9851a57fd73b37e
+  data.tar.gz: 184d84ab6338864f1b0479c344278544422cb3967acff3dd6063148a446211fc
 SHA512:
-  metadata.gz: 7b6f1f9f93603229f785f99e6d9e3ee7e245b40fd2c1c55c3dadb6ccfe5a046c04bff9ad1dadc110f9b9f71323345445a4e9af0c7d8e647fd1b3311ca4de54ee
-  data.tar.gz: 01ca7b5578089f3635292bb57cef8da1916b183ada89973182d66492227cdb45fc61135487f5110a59c0c63eeb430965ea85b2b9583a20751a559e52dd47bbce
+  metadata.gz: bc03e6bcd02b5f628e063f94188cf3293f747ee0f53bfcae46cf198bd1074c5da9304c94024e7a3fbcada4a6ee7342f0f20e9c9659dd57e2a6cd8d4d3bd686c2
+  data.tar.gz: b7a1c8fdf844e0064eef6df2449b501a75e0ed4f06499c6f74187654f16b02f316690076c00f3bafe98641a651b05c722cabd1c81f080eac0ffab03302754ac3

data/Gemfile

@@ -60,7 +60,6 @@ gem 'listen', '>= 3.0.5', '< 3.2'
 gem 'spring'
 
 gem 'factory_bot_rails'
-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]
 
@@ -79,6 +78,7 @@ group :development do
   # Release helper
   gem 'bump', require: false
   gem 'gem-release', require: false
+  gem 'faker', require: false
 
   # gem 'rack-mini-profiler'
   # gem 'memory_profiler'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta1)
+    avo (0.5.0.beta2)
       active_link_to
       countries
       hotwire-rails

data/README.md

@@ -50,3 +50,7 @@ $ bundle install
 # Contributing
 
 Please read [CONTRIBUTING.MD](./CONTRIBUTING.MD)
+
+# Upgrade guide
+
+Please read the [UPGRADE_GUIDE.MD](https://docs.avohq.io/0.5.x/upgrade.html)

data/app/components/avo/index/resource_controls_component.html.erb

@@ -24,7 +24,7 @@
 
   <% if can_detach? %>
     <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
-      <%= form.button helpers.svg('trash', class: 'text-gray-400 h-6 hover:text-gray-600'),
+      <%= form.button helpers.svg('trash-sm', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.detach_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
         data: {

data/app/controllers/avo/actions_controller.rb

@@ -35,6 +35,7 @@ module Avo
         end
 
         @action = action_name.safe_constantize.new
+        @action.configure
         @action.hydrate(model: model, resource: resource, user: _current_user)
         @action.boot_fields request
       end

data/app/controllers/avo/base_controller.rb

@@ -169,6 +169,10 @@ module Avo
           cookies[:per_page] = params[:per_page]
         end
 
+        if @parent_model.present?
+          @index_params[:per_page] = Avo.configuration.via_per_page
+        end
+
         # Sorting
         @index_params[:sort_by] = params[:sort_by] || :created_at
         @index_params[:sort_direction] = params[:sort_direction] || :desc
@@ -179,7 +183,13 @@ module Avo
       end
 
       def set_filters
-        @filters = @resource.get_filters.map(&:new)
+        @filters = @resource.get_filters.map do |filter_class|
+          filter = filter_class.new
+
+          filter.configure
+
+          filter
+        end
       end
 
       def set_actions
@@ -206,6 +216,7 @@ module Avo
 
         @resource.get_filters.each do |filter_class|
           filter = filter_class.new
+          filter.configure
 
           if filter.default.present?
             filter_defaults[filter_class.to_s] = filter.default

data/app/views/avo/base/_actions.html.erb

@@ -28,7 +28,7 @@
           'data-turbo-frame': 'actions_show',
           'data-action': 'click->actions-picker#visitAction',
           class: 'flex items-center w-full py-2 px-4 font-bold text-gray-700 hover:text-white hover:bg-blue-500' do %>
-          <%= svg 'play', extra_class: 'inline' %> <%= action.name %>
+          <%= svg 'play', class: 'h-5 mr-1 inline' %> <%= action.name %>
         <% end %>
       <% end %>
     </div>

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

@@ -6,7 +6,7 @@
 
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">
-        <%= render Avo::NavigationLinkComponent.new label: t('avo.dashboard'), path: '/avo', active: :exclusive if Rails.env.development? %>
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: '/avo', active: :exclusive if Rails.env.development? %>
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 
         <div class="w-full">

data/lib/avo/app/action.rb

@@ -35,8 +35,8 @@ module Avo
         @message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
         @default ||= ''
         @fields ||= []
-        @confirm_text = I18n.t('avo.run')
-        @cancel_text = I18n.t('avo.cancel')
+        @confirm_text ||= I18n.t('avo.run')
+        @cancel_text ||= I18n.t('avo.cancel')
         @response ||= {}
         @response[:message_type] ||= :notice
         @response[:message] ||= I18n.t('avo.action_ran_successfully')
@@ -64,23 +64,6 @@ module Avo
         end
       end
 
-      def render_response
-        fields = get_fields.map { |field| field.fetch_for_action(model, resource) }
-
-        {
-          id: id,
-          name: name,
-          fields: fields,
-          message: message,
-          theme: theme,
-          confirm_text: confirm_text,
-          cancel_text: cancel_text,
-          default: default,
-          action_class: self.class.to_s,
-          no_confirmation: no_confirmation,
-        }
-      end
-
       def hydrate(model: nil, resource: nil, user: nil)
         @model = model if model.present?
         @resource = resource if resource.present?

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

@@ -14,9 +14,10 @@ module Avo
         super(name, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
-        @width = 32
-        @height = 32
-        @radius = 0
+
+        @width = args[:width].present? ? args[:width] : 32
+        @height = args[:height].present? ? args[:height] : 32
+        @radius = args[:radius].present? ? args[:radius] : 0
       end
     end
   end

data/lib/avo/app/filter.rb

@@ -10,17 +10,6 @@ module Avo
       @default ||= ''
     end
 
-    def render_response
-      {
-        id: id,
-        name: name,
-        options: options,
-        component: component,
-        default: default,
-        filter_class: self.class.to_s,
-      }
-    end
-
     def apply_query(request, query, value)
       value.symbolize_keys! if value.is_a? Hash
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = '0.5.0.beta1'
+  VERSION = '0.5.0.beta2'
 end

data/lib/generators/avo/locales_generator.rb

@@ -0,0 +1,12 @@
+require 'rails/generators/base'
+
+class InstallGenerator < Rails::Generators::Base
+  source_root File.expand_path('templates', __dir__)
+
+  namespace 'avo:locales'
+  desc 'Creates an Avo initializer adds the route to the routes file.'
+
+  def create_files
+    template 'locales/avo.en.yml', 'config/locales/avo.en.yml'
+  end
+end

data/lib/generators/avo/partials_generator.rb

@@ -0,0 +1,8 @@
+class PartialsGenerator < Rails::Generators::Base
+  source_root File.expand_path('templates', __dir__)
+  namespace 'avo:partials'
+
+  def generate
+    directory 'partials', Rails.root.join('app', 'views', 'vendor', 'avo', 'partials')
+  end
+end

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

@@ -1,8 +1,8 @@
 module Avo
   module Actions
     class <%= class_name.camelize %> < Action
-      def name
-        '<%= name.underscore.humanize %>'
+      def configure
+        @name = '<%= name.underscore.humanize %>'
       end
 
       def handle(request, models, fields)
@@ -11,7 +11,7 @@ module Avo
         end
       end
 
-      fields do
+      def fields(request)
         # Add desired fields here.
       end
     end

data/lib/generators/avo/templates/filters/boolean_filter.rb

@@ -1,8 +1,8 @@
 module Avo
   module Filters
     class <%= class_name.camelize %> < BooleanFilter
-      def name
-        '<%= name.underscore.humanize %>'
+      def configure
+        @name = '<%= name.underscore.humanize %>'
       end
 
       def apply(request, query, value)

data/lib/generators/avo/templates/filters/select_filter.rb

@@ -1,8 +1,8 @@
 module Avo
   module Filters
     class <%= class_name.camelize %> < SelectFilter
-      def name
-        '<%= name.underscore.humanize %>'
+      def configure
+        @name = '<%= name.underscore.humanize %>'
       end
 
       def apply(request, query, value)

data/lib/generators/avo/templates/initializer/avo.rb

@@ -37,8 +37,4 @@ Avo.configure do |config|
   # config.id_links_to_resource = false
   # config.full_width_container = false
   # config.full_width_index_view = false
-
-  ## == Beta version ==
-  # config.hide_resource_overview_component = false
-  # config.hide_documentation_link = false
 end

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

@@ -16,11 +16,18 @@ en:
     resource_updated: 'Resource updated'
     resource_created: 'Resource created'
     resource_destroyed: 'Resource destroyed'
+    switch_to_view: "Switch to %{view_type} view"
+    click_to_reveal_filters: "Click to reveal filters"
+    attachment_destroyed: 'Attachment destroyed'
+    failed_to_find_attachment: 'Failed to find attachment'
+    you_missed_something_check_form: 'You might have missed something. Please check the form.'
     remove_selection: 'Remove selection'
+    select_item: 'Select item'
     delete_file: 'Delete file'
     delete: 'delete'
     delete_item: 'Delete %{item}'
     download_item: 'Download %{item}'
+    download_file: 'Download file'
     download: 'Download'
     view: 'View'
     view_item: 'view %{item}'
@@ -60,5 +67,15 @@ en:
     next_page: 'Next page'
     prev_page: 'Previous page'
     list_is_empty: 'List is empty'
+    field_translations:
+      file:
+        zero: 'files'
+        one: 'file'
+        other: 'files'
+    resource_translations:
+      user:
+        zero: 'users'
+        one: 'user'
+        other: 'users'
     reset_filters: 'Reset filters'
     not_authorized: 'You are not authorized to perform this action.'

data/lib/generators/avo/templates/partials/_footer.html.erb

@@ -0,0 +1,3 @@
+<div class="text-center text-sm text-gray-700">
+  <a href="https://avohq.io/" target="_blank" title="The most beautiful, easy-to-use Ruby on Rails admin framework">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · v<%= Avo::VERSION %>
+</div>

data/lib/generators/avo/templates/partials/_header.html.erb

@@ -0,0 +1 @@
+<%= link_to Avo.configuration.app_name, '/', class: 'text-green-600 font-semibold', target: :_blank, title: 'Navigate to the homepage' %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0.beta2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -393,7 +393,6 @@ files:
 - app/controllers/avo/base_controller.rb
 - app/controllers/avo/home_controller.rb
 - app/controllers/avo/relations_controller.rb
-- app/controllers/avo/resource_overview_controller.rb
 - app/controllers/avo/resources_controller.rb
 - app/controllers/avo/search_controller.rb
 - app/frontend/css/alerts.css
@@ -612,19 +611,20 @@ files:
 - lib/generators/avo/controller_generator.rb
 - lib/generators/avo/filter_generator.rb
 - lib/generators/avo/install_generator.rb
+- lib/generators/avo/locales_generator.rb
+- lib/generators/avo/partials_generator.rb
 - lib/generators/avo/resource_generator.rb
 - lib/generators/avo/templates/action.rb
 - lib/generators/avo/templates/filters/boolean_filter.rb
 - lib/generators/avo/templates/filters/select_filter.rb
 - lib/generators/avo/templates/initializer/avo.rb
 - lib/generators/avo/templates/locales/avo.en.yml
+- lib/generators/avo/templates/partials/_footer.html.erb
+- lib/generators/avo/templates/partials/_header.html.erb
+- lib/generators/avo/templates/partials/_logo.html.erb
+- lib/generators/avo/templates/partials/_scripts.html.erb
 - lib/generators/avo/templates/resource/%plural_name%_controller.tt
 - lib/generators/avo/templates/resource/%singular_name%.tt
-- lib/generators/avo/templates/views/_footer.html.erb
-- lib/generators/avo/templates/views/_header.html.erb
-- lib/generators/avo/templates/views/_logo.html.erb
-- lib/generators/avo/templates/views/_scripts.html.erb
-- lib/generators/avo/views_generator.rb
 - lib/tasks/avo_tasks.rake
 - public/avo-packs/css/application-3598cfbb.css
 - public/avo-packs/css/application-3598cfbb.css.br

data/app/controllers/avo/resource_overview_controller.rb

@@ -1,26 +0,0 @@
-require_dependency 'avo/application_controller'
-
-module Avo
-  class ResourceOverviewController < ApplicationController
-    def index
-      resources = App.get_resources
-        .select do |resource|
-          AuthorizationService::authorize _current_user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index']
-        end
-        .sort_by(&:name)
-        .map do |resource|
-          {
-            name: resource.name,
-            url: resource.url,
-            count: resource.model.count,
-          }
-        end
-
-      render json: {
-        resources: resources,
-        hidden: Avo.configuration.hide_resource_overview_component,
-        hide_docs: Avo.configuration.hide_documentation_link,
-      }
-    end
-  end
-end

data/lib/generators/avo/templates/views/_footer.html.erb

@@ -1,3 +0,0 @@
-<div class="text-center text-sm text-gray-700">
-  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · v<%= Avo::VERSION %>
-</div>

data/lib/generators/avo/templates/views/_header.html.erb

@@ -1 +0,0 @@
-<%= link_to Avo.configuration.app_name, '/', class: 'text-green-600 font-semibold', target: :_blank %>

data/lib/generators/avo/views_generator.rb

@@ -1,8 +0,0 @@
-class ViewsGenerator < Rails::Generators::Base
-  source_root File.expand_path('templates', __dir__)
-  namespace 'avo:views'
-
-  def generate
-    directory 'views', Rails.root.join('app', 'views', 'vendor', 'avo', 'partials')
-  end
-end