avo 0.5.0.beta5 → 0.5.0.beta10

data/app/controllers/avo/application_controller.rb

@@ -11,7 +11,7 @@ module Avo
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path
     add_flash_types :info, :warning, :success, :error
 
     def init_app
@@ -23,11 +23,13 @@ module Avo
     def exception_logger(exception)
       respond_to do |format|
         format.html { raise exception }
-        format.json { render json: {
-          errors: exception.record.present? ? exception.record.errors : [],
-          message: exception.message,
-          traces: exception.backtrace,
-        }, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name) }
+        format.json {
+          render json: {
+            errors: exception.respond_to?(:record) && exception.record.present? ? exception.record.errors : [],
+            message: exception.message,
+            traces: exception.backtrace
+          }, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name)
+        }
       end
     end
 
@@ -48,20 +50,26 @@ module Avo
         if keep_query_params
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
-      rescue;end
-
+      rescue; end
       send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
     end
 
-    def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
+    def related_resources_path(parent_model, model, keep_query_params: false, **args)
+      return if model.nil?
+
       existing_params = {}
 
       begin
         if keep_query_params
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
-      rescue;end
+      rescue; end
+      Addressable::Template.new("#{Avo.configuration.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
+        .expand({query: {**existing_params, **args}})
+        .to_str
+    end
 
+    def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
       return send :"resources_#{model.model_name.route_key.singularize}_path", resource_id, **args if resource_id.present?
 
       send :"resources_#{model.model_name.route_key.singularize}_path", model, **args
@@ -92,146 +100,146 @@ module Avo
     end
 
     private
-      def set_resource_name
-        @resource_name = resource_name
-      end
 
-      def set_related_resource_name
-        @related_resource_name = related_resource_name
-      end
+    def set_resource_name
+      @resource_name = resource_name
+    end
 
-      def set_resource
-        @resource = resource.hydrate(params: params)
-      end
+    def set_related_resource_name
+      @related_resource_name = related_resource_name
+    end
 
-      def set_related_resource
-        @related_resource = related_resource.hydrate(params: params)
-      end
+    def set_resource
+      @resource = resource.hydrate(params: params)
+    end
 
-      def set_model
-        @model = eager_load_files(@resource, @resource.model_class).find params[:id]
-      end
+    def set_related_resource
+      @related_resource = related_resource.hydrate(params: params)
+    end
 
-      def set_related_model
-        @related_model = eager_load_files(@related_resource, @related_resource.model_class).find params[:related_id]
-      end
+    def set_model
+      @model = eager_load_files(@resource, @resource.model_class).find params[:id]
+    end
 
-      def hydrate_resource
-        @resource.hydrate(view: action_name.to_sym, user: _current_user)
-      end
+    def set_related_model
+      @related_model = eager_load_files(@related_resource, @related_resource.model_class).find params[:related_id]
+    end
 
-      def hydrate_related_resource
-        @related_resource.hydrate(view: action_name.to_sym, user: _current_user)
-      end
+    def hydrate_resource
+      @resource.hydrate(view: action_name.to_sym, user: _current_user)
+    end
 
-      def authorize_action
-        if @model.present?
-          @authorization.set_record(@model).authorize_action :index
-        else
-          @authorization.set_record(@resource.model_class).authorize_action :index
-        end
+    def hydrate_related_resource
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user)
+    end
+
+    def authorize_action
+      if @model.present?
+        @authorization.set_record(@model).authorize_action :index
+      else
+        @authorization.set_record(@resource.model_class).authorize_action :index
       end
+    end
 
-      # Get the pluralized resource name for this request
-      # Ex: projects, teams, users
-      def resource_name
-        return params[:resource_name] if params[:resource_name].present?
+    # Get the pluralized resource name for this request
+    # Ex: projects, teams, users
+    def resource_name
+      return params[:resource_name] if params[:resource_name].present?
 
-        return controller_name if controller_name.present?
+      return controller_name if controller_name.present?
 
-        begin
-          request.path
-            .match(/\/?#{Avo.configuration.root_path.gsub('/', '')}\/resources\/([a-z1-9\-_]*)\/?/mi)
-            .captures
-            .first
-        rescue => exception
-        end
+      begin
+        request.path
+          .match(/\/?#{Avo.configuration.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
+          .captures
+          .first
+      rescue
       end
+    end
 
-      def related_resource_name
-        params[:related_name]
-      end
+    def related_resource_name
+      params[:related_name]
+    end
 
-      # Gets the Avo resource for this request based on the request from the `resource_name` "param"
-      # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User
-      def resource
-        App.get_resource @resource_name.to_s.camelize.singularize
-      end
+    # Gets the Avo resource for this request based on the request from the `resource_name` "param"
+    # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User
+    def resource
+      resource = App.get_resource @resource_name.to_s.camelize.singularize
 
-      def related_resource
-        reflection = @model._reflections[params[:related_name]]
+      return resource if resource.present?
 
-        if reflection.is_a? ::ActiveRecord::Reflection::HasOneReflection
-          reflected_model = reflection.klass
-        else
-          reflected_model = reflection.klass
-        end
+      App.get_resource_by_controller_name @resource_name
+    end
 
-        App.get_resource_by_model_name reflected_model
-      end
+    def related_resource
+      reflection = @model._reflections[params[:related_name]]
+
+      reflected_model = reflection.klass
+
+      App.get_resource_by_model_name reflected_model
+    end
 
-      def eager_load_files(resource, query)
-        if resource.attached_file_fields.present?
-          resource.attached_file_fields.map do |field|
-            # abort "#{field.pluralize}".inspect
-            # abort field.class.inspect
-            attachment = case field.class.to_s
-            when 'Avo::Fields::FileField'
-              'attachment'
-            when 'Avo::Fields::FilesField'
-              'attachments'
-            else
-              'attachment'
-            end
-
-            return query.eager_load "#{field.id}_#{attachment}": :blob
-            # return query.send :"with_attached_#{field}"
+    def eager_load_files(resource, query)
+      if resource.attached_file_fields.present?
+        resource.attached_file_fields.map do |field|
+          # abort "#{field.pluralize}".inspect
+          # abort field.class.inspect
+          attachment = case field.class.to_s
+          when "Avo::Fields::FileField"
+            "attachment"
+          when "Avo::Fields::FilesField"
+            "attachments"
+          else
+            "attachment"
           end
-        end
 
-        query
+          return query.eager_load "#{field.id}_#{attachment}": :blob
+          # return query.send :"with_attached_#{field}"
+        end
       end
 
+      query
+    end
 
-      # def authorize_user
-      #   return if params[:controller] == 'avo/search'
+    # def authorize_user
+    #   return if params[:controller] == 'avo/search'
 
-      #   model = record = resource.model
+    #   model = record = resource.model
 
-      #   if ['show', 'edit', 'update'].include?(params[:action]) && params[:controller] == 'avo/resources'
-      #     record = resource
-      #   end
+    #   if ['show', 'edit', 'update'].include?(params[:action]) && params[:controller] == 'avo/resources'
+    #     record = resource
+    #   end
 
-      #   # AuthorizationService::authorize_action _current_user, record, params[:action] return render_unauthorized unless
-      # end
+    #   # AuthorizationService::authorize_action _current_user, record, params[:action] return render_unauthorized unless
+    # end
 
-      def _authenticate!
-        instance_eval(&Avo.configuration.authenticate)
-      end
+    def _authenticate!
+      instance_eval(&Avo.configuration.authenticate)
+    end
 
-      def render_unauthorized(exception)
-        if !exception.is_a? Pundit::NotDefinedError
-          flash[:notice] = t 'avo.not_authorized'
+    def render_unauthorized(exception)
+      if !exception.is_a? Pundit::NotDefinedError
+        flash[:notice] = t "avo.not_authorized"
 
-          redirect_url = if request.referrer.blank? or request.referrer == request.url
-            root_url
-          else
-            request.referrer
-          end
-
-          redirect_to(redirect_url)
+        redirect_url = if request.referrer.blank? || (request.referrer == request.url)
+          root_url
+        else
+          request.referrer
         end
-      end
 
-      def set_authorization
-        @authorization = Services::AuthorizationService.new _current_user
+        redirect_to(redirect_url)
       end
+    end
+
+    def set_authorization
+      @authorization = Services::AuthorizationService.new _current_user
+    end
 
-      def set_container_classes
-        contain = !Avo.configuration.full_width_container
-        contain = false if Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == 'Avo::ResourcesController'
+    def set_container_classes
+      contain = !Avo.configuration.full_width_container
+      contain = false if Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == "Avo::ResourcesController"
 
-        @container_classes = contain ? '2xl:container 2xl:mx-auto' : ''
-      end
+      @container_classes = contain ? "2xl:container 2xl:mx-auto" : ""
+    end
   end
 end

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,124 +103,117 @@ module Avo
       @model.destroy!
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(@model), 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
-
-        if cookies[:per_page].present?
-          @index_params[:per_page] = cookies[:per_page]
-        end
+      params
+    end
 
-        if params[:per_page].present?
-          @index_params[:per_page] = params[:per_page]
-        end
+    def set_index_params
+      @index_params = {}
 
-        if params[:per_page].present?
-          cookies[:per_page] = params[:per_page]
-        end
+      # Pagination
+      @index_params[:page] = params[:page] || 1
+      @index_params[:per_page] = Avo.configuration.per_page
 
-        if @parent_model.present?
-          @index_params[:per_page] = Avo.configuration.via_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
-      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_actions
-        if params[:resource_id].present?
-          model = @resource.model_class.find params[:resource_id]
-        end
+    def set_filters
+      @filters = @resource.get_filters.map do |filter_class|
+        filter = filter_class.new
 
-        @actions = @resource.get_actions.map do |action|
-          action = action.new
+        filter
+      end
+    end
 
-          action.hydrate(model: model, resource: @resource)
-          action.boot_fields request
+    def set_actions
+      if params[:resource_id].present?
+        model = @resource.model_class.find params[:resource_id]
+      end
 
-          action
-        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