avo 0.4.10 → 0.5.0.beta5

data/app/controllers/avo/home_controller.rb

@@ -3,6 +3,9 @@ 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
+      end
     end
   end
 end

data/app/controllers/avo/relations_controller.rb

@@ -1,34 +1,103 @@
-require_dependency 'avo/application_controller'
+require_dependency 'avo/base_controller'
 
 module Avo
-  class RelationsController < ApplicationController
-    before_action :authorize_user
+  class RelationsController < BaseController
+    before_action :set_model, only: [:show, :index, :new, :create, :destroy]
+    before_action :set_related_resource_name
+    before_action :set_related_resource
+    before_action :hydrate_related_resource
+    before_action :set_related_model, only: [:show]
+    before_action :set_attachment_class
+    before_action :set_attachment_resource
+    before_action :set_attachment_model, only: [:create, :destroy]
+    before_action :set_reflection, only: [:index]
 
-    def attach
-      resource.send(params[:attachment_name]) << attachment_model
+    def index
+      @parent_resource = @resource.dup
+      @resource = @related_resource
+      @parent_model = @parent_resource.model_class.find(params[:id])
+      @parent_resource.hydrate(model: @parent_model)
+      @query = @parent_model.public_send(params[:related_name])
 
-      render json: {
-        success: true,
-        message: I18n.t('avo.attachment_class_attached', attachment_class: attachment_class),
-      }
+      super
     end
 
-    def detach
-      resource.send(params[:attachment_name]).delete attachment_model
+    def show
+      @reflection = params[:related_name]
+      @resource, @model = @related_resource, @related_model
 
-      render json: {
-        success: true,
-        message: I18n.t('avo.attachment_class_detached', attachment_class: attachment_class),
-      }
+      super
+    end
+
+    def new
+      query = @authorization.apply_policy @attachment_class
+
+      @options = query.all.map do |model|
+        {
+          value: model.id,
+          label: model.send(@attachment_resource.class.title)
+        }
+      end
+    end
+
+    def create
+      if reflection_class == 'HasManyReflection'
+        @model.send("#{params[:related_name]}") << @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.json { render :show, status: :created, location: resource_path(@model) }
+        else
+          format.html { render :new }
+          format.json { render json: @model.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    def destroy
+      if reflection_class == 'HasManyReflection'
+        @model.send("#{params[:related_name]}").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) }
+      end
     end
 
     private
-      def attachment_class
-        App.get_model_class_by_name params[:attachment_name].pluralize 1
+      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_model
+        @attachment_model = @model._reflections[params[:related_name].to_s].klass.find attachment_id
       end
 
-      def attachment_model
-        resource._reflections[params[:attachment_name].to_s].klass.find params[:attachment_id]
+      def set_reflection
+        @reflection = @model._reflections[params[:related_name].to_s]
+      end
+
+      def attachment_id
+        params[:related_id] or params.require(:fields).permit(:related_id)[:related_id]
+      end
+
+      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
       end
   end
 end

data/app/controllers/avo/resources_controller.rb

@@ -1,263 +1,6 @@
-require_dependency 'avo/application_controller'
+require_dependency 'avo/base_controller'
 
 module Avo
-  class ResourcesController < ApplicationController
-    before_action :authorize_user
-
-    def index
-      params[:page] ||= 1
-      params[:per_page] ||= Avo.configuration.per_page
-      params[:sort_by] = params[:sort_by].present? ? params[:sort_by] : :created_at
-      params[:sort_direction] = params[:sort_direction].present? ? params[:sort_direction] : :desc
-
-      query = AuthorizationService.with_policy _current_user, resource_model
-
-      if params[:via_resource_name].present? and params[:via_resource_id].present? and params[:via_relationship].present?
-        # get the related resource (via_resource)
-        related_model = App.get_resource_by_name(params[:via_resource_name]).model
-
-        relation = related_model.find(params[:via_resource_id]).public_send(params[:via_relationship])
-        query = AuthorizationService.with_policy _current_user, relation
-
-        params[:per_page] = Avo.configuration.via_per_page
-      elsif ['has_many', 'has_and_belongs_to_many'].include? params[:for_relation]
-        # has_many searchable query
-        resources = resource_model.all.map do |model|
-          {
-            value: model.id,
-            label: model.send(avo_resource.title),
-          }
-        end
-
-        return render json: {
-          resources: resources
-        }
-      end
-
-      query = query.order("#{params[:sort_by]} #{params[:sort_direction]}")
-
-      applied_filters.each do |filter_class, filter_value|
-        query = filter_class.safe_constantize.new.apply_query request, query, filter_value
-      end
-
-      # Eager load the attachments
-      query = eager_load_files(query)
-
-      # Eager load the relations
-      if avo_resource.includes.present?
-        query = query.includes(*avo_resource.includes)
-      end
-
-      resources = query.page(params[:page]).per(params[:per_page])
-
-      resources_with_fields = []
-      resources.each do |resource|
-        resources_with_fields << Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :index, user: _current_user)
-      end
-
-      render json: {
-        success: true,
-        meta: build_meta,
-        resources: resources_with_fields,
-        per_page: params[:per_page],
-        total_pages: resources.total_pages,
-      }
-    end
-
-    def show
-      render json: {
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: @view || :show, user: _current_user),
-      }
-    end
-
-    def edit
-      @view = :edit
-
-      show
-    end
-
-    def update
-      update_file_fields
-
-      # Filter out the file params
-      regular_resource_params = resource_params.select do |id, value|
-        !avo_resource.attached_file_fields.map(&:id).to_s.include? id
-      end
-
-      if avo_resource.has_devise_password and regular_resource_params[:password].blank?
-        regular_resource_params.delete(:password_confirmation)
-        regular_resource_params.delete(:password)
-      end
-
-      casted_params = cast_nullable(regular_resource_params)
-      avo_resource.fill_model(resource, casted_params).save!
-
-      render json: {
-        success: true,
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :show, user: _current_user),
-        message: I18n.t('avo.resource_updated'),
-      }
-    end
-
-    def create
-      create_params = resource_params
-
-      # Update the foreign key for a belongs_to relation from a has_many via creation.
-      if params[:via_relationship].present?
-        relationship_foreign_key = params[:via_resource_name].singularize.camelize.safe_constantize.reflections[params[:via_relationship]].foreign_key
-        if create_params[relationship_foreign_key].blank?
-          create_params[relationship_foreign_key] = params[:via_resource_id]
-        end
-      end
-
-      casted_params = cast_nullable(create_params)
-
-      resource = resource_model.new(casted_params)
-      resource.save!
-
-      render json: {
-        success: true,
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :create, user: _current_user),
-        message: I18n.t('avo.resource_created'),
-      }
-    end
-
-    def new
-      render json: {
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource_model.new, resource: avo_resource, view: :create, user: _current_user),
-      }
-    end
-
-    def destroy
-      resource.destroy!
-
-      render json: {
-        message: I18n.t('avo.resource_destroyed'),
-      }
-    end
-
-    private
-      def permitted_params
-        permitted = avo_resource.get_fields.select(&:updatable).map do |field|
-          # If it's a relation
-          if field.methods.include? :foreign_key
-            database_id = field.foreign_key(avo_resource.model)
-          end
-
-          if database_id.present?
-            # Allow the database_id for belongs_to relation
-            database_id.to_sym
-          elsif field.is_array_param
-            # Allow array param if necessary
-            { "#{field.id}": [] }
-          elsif field.is_object_param
-            # Allow array param if necessary
-            [:"#{field.id}", "#{field.id}": {} ]
-          else
-            field.id.to_sym
-          end
-        end
-
-        permitted
-      end
-
-      def resource_params
-        params.require(:resource).permit(permitted_params)
-      end
-
-      def update_file_fields
-        # Pick and attach file fields
-        attached_file_fields = avo_resource.attached_file_fields
-        if attached_file_fields.present?
-          file_fields_params = {}
-
-          # Map params to fields
-          attached_file_fields.each do |field|
-            file_fields_params[field.id] = resource_params[field.id.to_sym]
-          end
-
-          file_fields_params.each do |id, attachment|
-            # Identify field to make it easier to work with
-            field = resource.send(id)
-
-            if file_fields_params[id].is_a? Array
-              # Get the ID's that we kept
-              file_ids_kept = file_fields_params[id].select { |attachment| attachment.is_a? String }.map(&:to_i)
-              # Compute the difference
-              to_remove = field.pluck(:id) - file_ids_kept
-              # Remove the missing ones
-              to_remove.map { |attachment_id| field.find(attachment_id).purge }
-            end
-
-            # Figure out what has been submitted
-            if attachment.is_a? Array
-              # Files have been attached
-              attachment.each do |attachment|
-                process_file_field field, attachment
-              end
-            else
-              process_file_field field, attachment
-            end
-          end
-        end
-      end
-
-      def process_file_field(field, attachment)
-        if attachment.is_a? ActionDispatch::Http::UploadedFile
-          # New file has been attached
-          field.attach attachment
-        elsif attachment.blank?
-          # File has been deleted
-          field.purge
-        elsif attachment.is_a? String
-          # Field is unchanged
-        end
-      end
-
-      def applied_filters
-        if params[:filters].present?
-          return JSON.parse(Base64.decode64(params[:filters]))
-        end
-
-        filter_defaults = {}
-
-        avo_resource.get_filters.each do |filter_class|
-          filter = filter_class.new
-
-          if filter.default.present?
-            filter_defaults[filter_class.to_s] = filter.default
-          end
-        end
-
-        filter_defaults
-      end
-
-      def cast_nullable(params)
-        fields = avo_resource.get_fields
-
-        nullable_fields = fields.filter { |field| field.nullable }
-                                .map { |field| [field.id, field.null_values] }
-                                .to_h
-
-        params.each do |key, value|
-          nullable = nullable_fields[key.to_sym]
-
-          if nullable.present? && value.in?(nullable)
-            params[key] = nil
-          end
-        end
-
-        params
-      end
-
-      def build_meta
-        {
-          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: AuthorizationService::authorized_methods(_current_user, avo_resource.model)
-        }
-      end
+  class ResourcesController < BaseController
   end
 end

data/app/controllers/avo/search_controller.rb

@@ -2,9 +2,10 @@ require_dependency 'avo/application_controller'
 
 module Avo
   class SearchController < ApplicationController
-    before_action :authorize_user
+    # before_action :authorize_user
 
     def index
+      @authorization.set_record(resource_model).authorize_action :index
       resources = []
 
       resources_to_search_through = App.get_resources
@@ -34,7 +35,7 @@ module Avo
         resources.map do |model|
           {
             id: model.id,
-            search_label: model.send(avo_resource.title),
+            search_label: model.send(avo_resource.class.title),
             link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}",
           }
         end
@@ -44,12 +45,12 @@ module Avo
         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/frontend/css/alerts.css

@@ -0,0 +1,35 @@
+#toast-container > div {
+  box-shadow: none;
+  background-size: 1.5rem;
+  background-position: 0.8rem 0.8rem;
+  width: 500px;
+
+  @apply shadow-md opacity-100 border border-gray-200 rounded-md pt-3 pr-3 pb-3 bg-white;
+
+  &:hover {
+    @apply shadow-xl;
+  }
+
+  .toast-title {
+    @apply text-gray-800;
+  }
+  .toast-message {
+    @apply text-gray-800;
+  }
+
+  &.toast-success {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0iIzM4YTE2OSI+CiAgPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNNi4yNjcgMy40NTVhMy4wNjYgMy4wNjYgMCAwMDEuNzQ1LS43MjMgMy4wNjYgMy4wNjYgMCAwMTMuOTc2IDAgMy4wNjYgMy4wNjYgMCAwMDEuNzQ1LjcyMyAzLjA2NiAzLjA2NiAwIDAxMi44MTIgMi44MTJjLjA1MS42NDMuMzA0IDEuMjU0LjcyMyAxLjc0NWEzLjA2NiAzLjA2NiAwIDAxMCAzLjk3NiAzLjA2NiAzLjA2NiAwIDAwLS43MjMgMS43NDUgMy4wNjYgMy4wNjYgMCAwMS0yLjgxMiAyLjgxMiAzLjA2NiAzLjA2NiAwIDAwLTEuNzQ1LjcyMyAzLjA2NiAzLjA2NiAwIDAxLTMuOTc2IDAgMy4wNjYgMy4wNjYgMCAwMC0xLjc0NS0uNzIzIDMuMDY2IDMuMDY2IDAgMDEtMi44MTItMi44MTIgMy4wNjYgMy4wNjYgMCAwMC0uNzIzLTEuNzQ1IDMuMDY2IDMuMDY2IDAgMDEwLTMuOTc2IDMuMDY2IDMuMDY2IDAgMDAuNzIzLTEuNzQ1IDMuMDY2IDMuMDY2IDAgMDEyLjgxMi0yLjgxMnptNy40NCA1LjI1MmExIDEgMCAwMC0xLjQxNC0xLjQxNEw5IDEwLjU4NiA3LjcwNyA5LjI5M2ExIDEgMCAwMC0xLjQxNCAxLjQxNGwyIDJhMSAxIDAgMDAxLjQxNCAwbDQtNHoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
+  }
+
+  &.toast-warning {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0icmdiYSgyMTcsIDExOSwgNiwgMSkiPgogIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTguMjU3IDMuMDk5Yy43NjUtMS4zNiAyLjcyMi0xLjM2IDMuNDg2IDBsNS41OCA5LjkyYy43NSAxLjMzNC0uMjEzIDIuOTgtMS43NDIgMi45OEg0LjQyYy0xLjUzIDAtMi40OTMtMS42NDYtMS43NDMtMi45OGw1LjU4LTkuOTJ6TTExIDEzYTEgMSAwIDExLTIgMCAxIDEgMCAwMTIgMHptLTEtOGExIDEgMCAwMC0xIDF2M2ExIDEgMCAwMDIgMFY2YTEgMSAwIDAwLTEtMXoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
+  }
+
+  &.toast-info {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0icmdiYSgzNywgOTksIDIzNSwgMSkiPgogIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTE4IDEwYTggOCAwIDExLTE2IDAgOCA4IDAgMDExNiAwem0tNy00YTEgMSAwIDExLTIgMCAxIDEgMCAwMTIgMHpNOSA5YTEgMSAwIDAwMCAydjNhMSAxIDAgMDAxIDFoMWExIDEgMCAxMDAtMnYtM2ExIDEgMCAwMC0xLTFIOXoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
+  }
+
+  &.toast-error {
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0icmdiYSgyMjAsIDM4LCAzOCwgMSkiPgogIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTE4IDEwYTggOCAwIDExLTE2IDAgOCA4IDAgMDExNiAwem0tNyA0YTEgMSAwIDExLTIgMCAxIDEgMCAwMTIgMHptLTEtOWExIDEgMCAwMC0xIDF2NGExIDEgMCAxMDIgMFY2YTEgMSAwIDAwLTEtMXoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
+  }
+}