avo 0.5.0.beta6 → 0.5.0.beta11

data/app/controllers/avo/home_controller.rb

@@ -1,10 +1,10 @@
-require_dependency 'avo/application_controller'
+require_dependency "avo/application_controller"
 
 module Avo
   class HomeController < ApplicationController
     def index
       unless Rails.env.development?
-        redirect_to resources_path Avo::App.get_resources.sort_by { |resource| resource.route_key }.first.model_class
+        redirect_to resources_path Avo::App.get_resources.min_by { |resource| resource.route_key }.model_class
       end
     end
   end

data/app/controllers/avo/relations_controller.rb

@@ -1,4 +1,4 @@
-require_dependency 'avo/base_controller'
+require_dependency "avo/base_controller"
 
 module Avo
   class RelationsController < BaseController
@@ -41,15 +41,15 @@ module Avo
     end
 
     def create
-      if reflection_class == 'HasManyReflection'
-        @model.send("#{params[:related_name]}") << @attachment_model
+      if reflection_class == "HasManyReflection"
+        @model.send(params[:related_name].to_s) << @attachment_model
       else
         @model.send("#{params[:related_name]}=", @attachment_model)
       end
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_to resource_path(@model), notice: t('avo.attachment_class_attached', attachment_class: @attachment_class) }
+          format.html { redirect_to resource_path(@model), notice: t("avo.attachment_class_attached", attachment_class: @attachment_class) }
           format.json { render :show, status: :created, location: resource_path(@model) }
         else
           format.html { render :new }
@@ -59,45 +59,46 @@ module Avo
     end
 
     def destroy
-      if reflection_class == 'HasManyReflection'
-        @model.send("#{params[:related_name]}").delete @attachment_model
+      if reflection_class == "HasManyReflection"
+        @model.send(params[:related_name].to_s).delete @attachment_model
       else
         @model.send("#{params[:related_name]}=", nil)
       end
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(@model), notice: t('avo.attachment_class_detached', attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resource_path(@model), notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
       end
     end
 
     private
-      def set_attachment_class
-        @attachment_class = @model._reflections[params[:related_name].to_s].klass
-      end
 
-      def set_attachment_resource
-        @attachment_resource = App.get_resource_by_model_name @attachment_class
-      end
+    def set_attachment_class
+      @attachment_class = @model._reflections[params[:related_name].to_s].klass
+    end
 
-      def set_attachment_model
-        @attachment_model = @model._reflections[params[:related_name].to_s].klass.find attachment_id
-      end
+    def set_attachment_resource
+      @attachment_resource = App.get_resource_by_model_name @attachment_class
+    end
 
-      def set_reflection
-        @reflection = @model._reflections[params[:related_name].to_s]
-      end
+    def set_attachment_model
+      @attachment_model = @model._reflections[params[:related_name].to_s].klass.find attachment_id
+    end
 
-      def attachment_id
-        params[:related_id] or params.require(:fields).permit(:related_id)[:related_id]
-      end
+    def set_reflection
+      @reflection = @model._reflections[params[:related_name].to_s]
+    end
+
+    def attachment_id
+      params[:related_id] || params.require(:fields).permit(:related_id)[:related_id]
+    end
 
-      def reflection_class
-        reflection = @model._reflections[params[:related_name]]
+    def reflection_class
+      reflection = @model._reflections[params[:related_name]]
 
-        klass = @model._reflections[params[:related_name]].class.name.demodulize.to_s
-        klass = @model._reflections[params[:related_name]].through_reflection.class.name.demodulize.to_s if klass == 'ThroughReflection'
+      klass = reflection.class.name.demodulize.to_s
+      klass = reflection.through_reflection.class.name.demodulize.to_s if klass == "ThroughReflection"
 
-        klass
-      end
+      klass
+    end
   end
 end

data/app/controllers/avo/resources_controller.rb

@@ -1,4 +1,4 @@
-require_dependency 'avo/base_controller'
+require_dependency "avo/base_controller"
 
 module Avo
   class ResourcesController < BaseController

data/app/controllers/avo/search_controller.rb

@@ -1,4 +1,4 @@
-require_dependency 'avo/application_controller'
+require_dependency "avo/application_controller"
 
 module Avo
   class SearchController < ApplicationController
@@ -8,9 +8,9 @@ module Avo
       @authorization.set_record(resource_model).authorize_action :index
       resources = []
 
-      resources_to_search_through = App.get_resources
+      App.get_resources
         .select { |resource| resource.search.present? }
-        .select { |resource| AuthorizationService.authorize_action _current_user, resource.model, 'index' }
+        .select { |resource| AuthorizationService.authorize_action _current_user, resource.model, "index" }
         .each do |resource_model|
           found_resources = add_link_to_search_results(search_resource(resource_model), resource_model)
           resources.push({
@@ -31,26 +31,27 @@ module Avo
     end
 
     private
-      def add_link_to_search_results(resources, avo_resource)
-        resources.map do |model|
-          {
-            id: model.id,
-            search_label: model.send(avo_resource.class.title),
-            link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}",
-          }
-        end
-      end
 
-      def search_resource(avo_resource)
-        avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: _current_user)
+    def add_link_to_search_results(resources, avo_resource)
+      resources.map do |model|
+        {
+          id: model.id,
+          search_label: model.send(avo_resource.class.title),
+          link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}"
+        }
       end
+    end
+
+    def search_resource(avo_resource)
+      avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: _current_user)
+    end
 
-      # def authorize_user
-      #   return if params[:action] == 'index'
+    # def authorize_user
+    #   return if params[:action] == 'index'
 
-      #   action = params[:action] == 'resource' ? :index : params[:action]
+    #   action = params[:action] == 'resource' ? :index : params[:action]
 
-      #   return render_unauthorized unless AuthorizationService::authorize_action _current_user, avo_resource.model, action
-      # end
+    #   return render_unauthorized unless AuthorizationService::authorize_action _current_user, avo_resource.model, action
+    # end
   end
 end

data/app/helpers/avo/application_helper.rb

@@ -8,32 +8,40 @@ module Avo
     end
 
     def render_logo
-      render partial: 'vendor/avo/partials/logo' rescue render partial: 'avo/partials/logo'
+      render partial: "vendor/avo/partials/logo"
+    rescue
+      render partial: "avo/partials/logo"
     end
 
     def render_header
-      render partial: 'vendor/avo/partials/header' rescue render partial: 'avo/partials/header'
+      render partial: "vendor/avo/partials/header"
+    rescue
+      render partial: "avo/partials/header"
     end
 
     def render_footer
-      render partial: 'vendor/avo/partials/footer' rescue render partial: 'avo/partials/footer'
+      render partial: "vendor/avo/partials/footer"
+    rescue
+      render partial: "avo/partials/footer"
     end
 
     def render_scripts
-      render partial: 'vendor/avo/partials/scripts' rescue ''
+      render partial: "vendor/avo/partials/scripts"
+    rescue
+      ""
     end
 
     def render_license_warnings
-      render partial: 'avo/sidebar/license_warnings', locals: {
-        license: Avo::App.license.properties,
+      render partial: "avo/sidebar/license_warnings", locals: {
+        license: Avo::App.license.properties
       }
     end
 
-    def render_license_warning(title: '', message: '', icon: 'exclamation')
-      render partial: 'avo/sidebar/license_warning', locals: {
+    def render_license_warning(title: "", message: "", icon: "exclamation")
+      render partial: "avo/sidebar/license_warning", locals: {
         title: title,
         message: message,
-        icon: icon,
+        icon: icon
       }
     end
 
@@ -44,7 +52,7 @@ module Avo
     end
 
     def empty_state(resource_name)
-      render partial: 'avo/partials/empty_state', locals: { resource_name: resource_name }
+      render partial: "avo/partials/empty_state", locals: {resource_name: resource_name}
     end
 
     def turbo_frame_start(name)
@@ -52,7 +60,7 @@ module Avo
     end
 
     def turbo_frame_end(name)
-      '</turbo-frame>'.html_safe if name.present?
+      "</turbo-frame>".html_safe if name.present?
     end
 
     def a_button(label = nil, **args, &block)
@@ -60,37 +68,37 @@ module Avo
 
       locals = {
         label: label,
-        args: args,
+        args: args
       }
 
-      if block_given?
-        render layout: 'avo/partials/a_button', locals: locals do
+      if block
+        render layout: "avo/partials/a_button", locals: locals do
           capture(&block)
         end
       else
-        render partial: 'avo/partials/a_button', locals: locals
+        render partial: "avo/partials/a_button", locals: locals
       end
     end
 
     def a_link(label, url = nil, **args, &block)
       args[:class] = button_classes(args[:class], color: args[:color], variant: args[:variant], size: args[:size])
 
-      if block_given?
+      if block
         url = label
       end
 
       locals = {
         label: label,
         url: url,
-        args: args,
+        args: args
       }
 
-      if block_given?
-        render layout: 'avo/partials/a_link', locals: locals do
+      if block
+        render layout: "avo/partials/a_link", locals: locals do
           capture(&block)
         end
       else
-        render partial: 'avo/partials/a_link', locals: locals
+        render partial: "avo/partials/a_link", locals: locals
       end
     end
 
@@ -98,27 +106,27 @@ module Avo
       classes = "inline-flex flex-grow-0 items-center text-sm font-bold leading-none fill-current whitespace-nowrap transition duration-100 rounded-lg shadow-xl transform transition duration-100 active:translate-x-px active:translate-y-px cursor-pointer disabled:cursor-not-allowed #{extra_classes}"
 
       if color.present?
-        if variant.present? and variant.to_sym == :outlined
-          classes += ' bg-white border'
+        if variant.present? && (variant.to_sym == :outlined)
+          classes += " bg-white border"
 
           classes += " hover:border-#{color}-700 border-#{color}-600 text-#{color}-600 hover:text-#{color}-700 disabled:border-gray-300 disabled:text-gray-600"
         else
           classes += " text-white bg-#{color}-500 hover:bg-#{color}-600 disabled:bg-#{color}-300"
         end
       else
-        classes += ' text-gray-700 bg-white hover:bg-gray-100 disabled:bg-gray-300'
+        classes += " text-gray-700 bg-white hover:bg-gray-100 disabled:bg-gray-300"
       end
 
       size = size.present? ? size.to_sym : :md
-      case size
+      classes += case size
       when :xs
-        classes += ' p-2 py-1'
+        " p-2 py-1"
       when :sm
-        classes += ' p-3'
+        " p-3"
       when :md
-        classes += ' p-4'
+        " p-4"
       else
-        classes += ' p-4'
+        " p-4"
       end
 
       classes
@@ -126,23 +134,23 @@ module Avo
 
     def svg(file_name, **args)
       options = {}
-      options[:class]  = args[:class].present? ? args[:class] : 'h-4 mr-1'
-      options[:class] += args[:extra_class].present? ? " #{args[:extra_class]}" : ''
+      options[:class] = args[:class].present? ? args[:class] : "h-4 mr-1"
+      options[:class] += args[:extra_class].present? ? " #{args[:extra_class]}" : ""
 
       # Create the path to the svgs directory
-      file_path = "#{Avo::Engine.root}/app/frontend/svgs/#{file_name}"
-      file_path = "#{file_path}.svg" unless file_path.end_with? '.svg'
+      file_path = "#{Avo::Engine.root}/app/packs/svgs/#{file_name}"
+      file_path = "#{file_path}.svg" unless file_path.end_with? ".svg"
 
       # Create a cache hash
-      hash = Digest::MD5.hexdigest "#{file_path.underscore}_#{options.to_s}"
+      hash = Digest::MD5.hexdigest "#{file_path.underscore}_#{options}"
 
       svg_content = Avo::App.cache_store.fetch "svg_file_#{hash}", expires_in: 1.year, cache_nils: false do
-        if File.exists?(file_path)
+        if File.exist?(file_path)
           file = File.read(file_path)
 
           # parse svg
           doc = Nokogiri::HTML::DocumentFragment.parse file
-          svg = doc.at_css 'svg'
+          svg = doc.at_css "svg"
 
           # attach options
           options.each do |attr, value|
@@ -151,23 +159,21 @@ module Avo
 
           # cast to html
           doc.to_html.html_safe
-        else
-          nil
         end
       end
 
-      return '(not found)' if svg_content.to_s.blank?
+      return "(not found)" if svg_content.to_s.blank?
 
       svg_content
     end
 
-    def input_classes(extra_classes = '', has_error: false)
-      classes = 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-700 rounded-md py-2 px-3 leading-tight border outline-none outline'
+    def input_classes(extra_classes = "", has_error: false)
+      classes = "appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
 
-      if has_error
-        classes += ' border-red-600'
+      classes += if has_error
+        " border-red-600"
       else
-        classes += ' border-blue-gray-300'
+        " border-blue-gray-300"
       end
 
       classes += " #{extra_classes}"

data/app/helpers/avo/resources_helper.rb

@@ -1,16 +1,16 @@
 module Avo
   module ResourcesHelper
     def resource_table(resources, resource)
-      render partial: 'avo/partials/resource_table', locals: {
+      render partial: "avo/partials/resource_table", locals: {
         resources: resources,
-        resource: resource,
+        resource: resource
       }
     end
 
     def resource_grid(resources, resource)
-      render partial: 'avo/partials/resource_grid', locals: {
+      render partial: "avo/partials/resource_grid", locals: {
         resources: resources,
-        resource: resource,
+        resource: resource
       }
     end
 
@@ -23,7 +23,7 @@ module Avo
         render partial: field.partial_path_for(:index), locals: {
           field: field,
           index: index,
-          resource: resource,
+          resource: resource
         }
       end
     end
@@ -37,7 +37,7 @@ module Avo
         render partial: field.partial_path_for(:show), locals: {
           field: field,
           index: index,
-          resource: resource,
+          resource: resource
         }
       end
     end
@@ -53,7 +53,7 @@ module Avo
           index: index,
           resource: resource,
           form: form,
-          displayed_in_modal: displayed_in_modal,
+          displayed_in_modal: displayed_in_modal
         }
       end
     end
@@ -77,9 +77,9 @@ module Avo
     end
 
     def filter_wrapper(name: nil, index: nil, **args, &block)
-      render layout: 'layouts/avo/filter_wrapper', locals: {
+      render layout: "layouts/avo/filter_wrapper", locals: {
         name: name,
-        index: index,
+        index: index
       } do
         capture(&block)
       end
@@ -91,9 +91,9 @@ module Avo
 
     def item_selector_input(floating: false, size: :md)
       "<input type='checkbox'
-        class='mx-3 #{'absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block' if floating} #{size.to_sym == :lg ? 'w-5 h-5' : 'w-4 h-4'}'
+        class='mx-3 #{"absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block" if floating} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}'
         data-action='input->item-selector#toggle'
-        title='#{t 'avo.select_item' }'
+        title='#{t "avo.select_item"}'
         data-tippy='tooltip'
       />"
     end