avo 0.5.0.beta9 → 0.5.0.beta14

data/app/controllers/avo/attachments_controller.rb

@@ -1,4 +1,4 @@
-require_dependency 'avo/application_controller'
+require_dependency "avo/application_controller"
 
 module Avo
   class AttachmentsController < ApplicationController
@@ -16,9 +16,9 @@ module Avo
       if attachment.present?
         attachment.destroy
 
-        redirect_to params[:referrer] || resource_path(@model), notice: t('avo.attachment_destroyed')
+        redirect_to params[:referrer] || resource_path(@model), notice: t("avo.attachment_destroyed")
       else
-        redirect_back fallback_location: resource_path(@model), notice: t('avo.failed_to_find_attachment')
+        redirect_back fallback_location: resource_path(@model), notice: t("avo.failed_to_find_attachment")
       end
     end
   end

data/app/controllers/avo/base_controller.rb

@@ -1,4 +1,4 @@
-require_dependency 'avo/application_controller'
+require_dependency "avo/application_controller"
 
 module Avo
   class BaseController < ApplicationController
@@ -66,16 +66,16 @@ module Avo
 
       respond_to do |format|
         if saved
-          if params[:via_relation_class].present? && params[:via_resource_id].present?
-            redirect_path = resource_path(params[:via_relation_class].safe_constantize, resource_id: params[:via_resource_id])
+          redirect_path = if params[:via_relation_class].present? && params[:via_resource_id].present?
+            resource_path(params[:via_relation_class].safe_constantize, resource_id: params[:via_resource_id])
           else
-            redirect_path = resource_path(@model)
+            resource_path(@model)
           end
 
           format.html { redirect_to redirect_path, notice: "#{@model.class.name} was successfully created." }
           format.json { render :show, status: :created, location: @model }
         else
-          flash[:error] = t 'avo.you_missed_something_check_form'
+          flash[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
           format.json { render json: @model.errors, status: :unprocessable_entity }
         end
@@ -92,7 +92,7 @@ module Avo
           format.html { redirect_to params[:referrer] || resource_path(@model), notice: "#{@model.class.name} was successfully updated." }
           format.json { render :show, status: :ok, location: @model }
         else
-          flash[:error] = t 'avo.you_missed_something_check_form'
+          flash[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
           format.json { render json: @model.errors, status: :unprocessable_entity }
         end
@@ -103,116 +103,117 @@ module Avo
       @model.destroy!
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(@model, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t('avo.resource_destroyed', attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resources_path(@model, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
         format.json { head :no_content }
       end
     end
 
     private
-      def model_route_key
-        @resource.model_class.model_name.route_key.singularize
-      end
 
-      def model_params
-        request_params = params.require(model_route_key).permit(permitted_params)
+    def model_route_key
+      @resource.model_class.model_name.route_key.singularize
+    end
 
-        if @resource.devise_password_optional and request_params[:password].blank? and request_params[:password_confirmation].blank?
-          request_params.delete(:password_confirmation)
-          request_params.delete(:password)
-        end
+    def model_params
+      request_params = params.require(model_route_key).permit(permitted_params)
 
-        request_params
+      if @resource.devise_password_optional && request_params[:password].blank? && request_params[:password_confirmation].blank?
+        request_params.delete(:password_confirmation)
+        request_params.delete(:password)
       end
 
-      def permitted_params
-        @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param)
-      end
+      request_params
+    end
 
-      def cast_nullable(params)
-        fields = @resource.get_field_definitions
+    def permitted_params
+      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param)
+    end
 
-        nullable_fields = fields.filter do |field|
-          field.nullable
-        end
+    def cast_nullable(params)
+      fields = @resource.get_field_definitions
+
+      nullable_fields = fields.filter do |field|
+        field.nullable
+      end
         .map do |field|
-          [field.id, field.null_values]
-        end
+        [field.id, field.null_values]
+      end
         .to_h
 
-        params.each do |key, value|
-          nullable = nullable_fields[key.to_sym]
+      params.each do |key, value|
+        nullable = nullable_fields[key.to_sym]
 
-          if nullable.present? && value.in?(nullable)
-            params[key] = nil
-          end
+        if nullable.present? && value.in?(nullable)
+          params[key] = nil
         end
-
-        params
       end
 
-      def set_index_params
-        @index_params = {}
-
-        # Pagination
-        @index_params[:page] = params[:page] || 1
-        @index_params[:per_page] = Avo.configuration.per_page
+      params
+    end
 
-        if cookies[:per_page].present?
-          @index_params[:per_page] = cookies[:per_page]
-        end
+    def set_index_params
+      @index_params = {}
 
-        if @parent_model.present?
-          @index_params[:per_page] = Avo.configuration.via_per_page
-        end
+      # Pagination
+      @index_params[:page] = params[:page] || 1
+      @index_params[:per_page] = Avo.configuration.per_page
 
-        if params[:per_page].present?
-          @index_params[:per_page] = params[:per_page]
-          cookies[:per_page] = params[:per_page]
-        end
+      if cookies[:per_page].present?
+        @index_params[:per_page] = cookies[:per_page]
+      end
 
-        # Sorting
-        @index_params[:sort_by] = params[:sort_by] || :created_at
-        @index_params[:sort_direction] = params[:sort_direction] || :desc
+      if @parent_model.present?
+        @index_params[:per_page] = Avo.configuration.via_per_page
+      end
 
-        # View types
-        @index_params[:view_type] = params[:view_type] || @resource.default_view_type || Avo.configuration.default_view_type
-        @index_params[:available_view_types] = @resource.available_view_types
+      if params[:per_page].present?
+        @index_params[:per_page] = params[:per_page]
+        cookies[:per_page] = params[:per_page]
       end
 
-      def set_filters
-        @filters = @resource.get_filters.map do |filter_class|
-          filter = filter_class.new
+      # Sorting
+      @index_params[:sort_by] = params[:sort_by] || :created_at
+      @index_params[:sort_direction] = params[:sort_direction] || :desc
 
-          filter
-        end
+      # View types
+      @index_params[:view_type] = params[:view_type] || @resource.default_view_type || Avo.configuration.default_view_type
+      @index_params[:available_view_types] = @resource.available_view_types
+    end
+
+    def set_filters
+      @filters = @resource.get_filters.map do |filter_class|
+        filter = filter_class.new
+
+        filter
       end
+    end
 
-      def set_actions
-        if params[:resource_id].present?
-          model = @resource.model_class.find params[:resource_id]
-        end
+    def set_actions
+      if params[:resource_id].present?
+        model = @resource.model_class.find params[:resource_id]
+      end
 
-        @actions = @resource.get_actions.map do |action|
-          action.new(model: model, resource: @resource)
-        end
+      @actions = @resource.get_actions.map do |action|
+        action.new(model: model, resource: @resource)
       end
+    end
 
-      def applied_filters
-        if params[:filters].present?
-          return JSON.parse(Base64.decode64(params[:filters]))
-        end
+    def applied_filters
+      if params[:filters].present?
+        return JSON.parse(Base64.decode64(params[:filters]))
+      end
 
-        filter_defaults = {}
+      filter_defaults = {}
 
-        @resource.get_filters.each do |filter_class|
-          filter = filter_class.new
+      @resource.get_filters.each do |filter_class|
+        filter = filter_class.new
 
-          if filter.default.present?
-            filter_defaults[filter_class.to_s] = filter.default
-          end
+        if filter.default.present?
+          filter_defaults[filter_class.to_s] = filter.default
         end
-
-        filter_defaults
       end
+
+      filter_defaults
+    end
   end
 end

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] || resource_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/packs/svgs/#{file_name}"
-      file_path = "#{file_path}.svg" unless file_path.end_with? '.svg'
+      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}"