slash_admin 0.1.0 → 1.0

data/app/assets/stylesheets/slash_admin/colors.scss

@@ -1,17 +1,20 @@
 // Bootstrap override
-$blue: #659be0 !default;
-$yellow: #f1c40f !default;
-$green: #36c6d3 !default;
-$red: #ed6b75 !default;
+$blue: #6798ff !default;
+$yellow: #fad961 !default;
+$green: #57ca85 !default;
+$red: #F36265 !default;
+$pink: #ff3466 !default;
 
-$success: #26c281;
-$info: #4b77be;
-$error: #e7505a;
-$notice: #f7ca18;
+$info: #6798ff;
+$notice: #fad961;
+$success: #57ca85;
+$error: #F36265;
 
-// Dasboard
-$primary: #18cdc4;
-$secondary: #26344b;
-$tertiary: #eef1f5;
-$grey: #666;
+$primary: #2e5bff;
+$blueIcon: #9ddbff;
+$secondary: #120731;
+$sidebar: #33375b;
+$textColor: #c5a6ee;
+$tertiary: #f8f8fd;
+$grey: #7985A6;
 $lightgrey: #e1e5ec;

data/app/controllers/slash_admin/models_controller.rb

@@ -2,6 +2,7 @@ require 'csv'
 
 module SlashAdmin
   class ModelsController < SlashAdmin::BaseController
+    skip_before_action :verify_authenticity_token, only: :nestable
     before_action :handle_internal_default
     before_action :handle_default
     before_action :nestable_config
@@ -21,7 +22,16 @@ module SlashAdmin
       column = @model_class.arel_table[params[:order_field].to_sym]
       order = params[:order].downcase
       if %w(asc desc).include?(order)
-        @models = @models_export.order(column.send(params[:order].downcase)).page(params[:page]).per(params[:per])
+        if @models_export.is_a? Array
+          if order == 'asc'
+            @models = @models_export.sort { |m1, m2| m1.send(params[:order_field]) <=> m2.send(params[:order_field]) }
+          else
+            @models = @models_export.sort { |m1, m2| m2.send(params[:order_field]) <=> m1.send(params[:order_field]) }
+          end
+          @models = Kaminari.paginate_array(@models).page(params[:page]).per(params[:per])
+        else
+          @models = @models_export.order(column.send(params[:order].downcase)).page(params[:page]).per(params[:per])
+        end
       end
 
       @fields = if @use_export_params
@@ -32,8 +42,8 @@ module SlashAdmin
 
       respond_to do |format|
         format.html
-        format.csv { send_data export_csv.encode('iso-8859-1'), filename: "#{@model_name.pluralize.upcase}_#{Date.today}.csv", type: 'text/csv; charset=iso-8859-1; header=present' }
-        format.xls { send_data render_to_string, filename: "#{@model_name.pluralize.upcase}_#{Date.today}.xls" }
+        format.csv { stream_csv_report }
+        format.xls { send_data render_to_string, filename: "#{@model_class.model_name.plural.upcase}_#{Date.today}.xls" }
         format.js { @models }
       end
     end
@@ -44,25 +54,31 @@ module SlashAdmin
     end
 
     def before_validate_on_create; end
+    def after_save_on_create; end
     def create
       authorize! :new, @model_class
+      handle_has_one
+
       @model = @model_class.new(permit_params)
 
       before_validate_on_create
+      handle_specific_fields
 
       if @model.valid?
         if @model.save!
+          after_save_on_create
           respond_to do |format|
             format.html do
               flash[:success] = t('slash_admin.controller.create.success', model_name: @model_name)
               redirect_to handle_redirect_after_submit and return
             end
-            format.js { render json: @model and return }
+            format.js { render json: { id: @model.id, name: helpers.show_object(@model) } and return }
           end
         end
       else
         flash[:error] = t('slash_admin.controller.create.error', model_name: @model_name)
       end
+
       respond_to do |format|
         format.html { render :new }
         format.js { render json: { errors: @model.errors.full_messages } }
@@ -74,23 +90,30 @@ module SlashAdmin
       @model = @model_class.find(params[:id])
     end
 
-    def before_validate_on_update; end
     def update
       authorize! :edit, @model_class
       @model = @model_class.find(params[:id])
 
+      handle_has_one
+
+      @model.assign_attributes(permit_params)
+
       before_validate_on_update
+      handle_specific_fields
 
-      if @model.update(permit_params)
-        flash[:success] = t('slash_admin.controller.update.success', model_name: @model_name)
-        respond_to do |format|
-          format.html { redirect_to handle_redirect_after_submit and return }
-          format.js
+      if @model.valid?
+        if @model.save!
+          after_save_on_update
+          flash[:success] = t('slash_admin.controller.update.success', model_name: @model_name)
+          respond_to do |format|
+            format.html { redirect_to handle_redirect_after_submit and return }
+            format.js
+          end
         end
       else
         flash[:error] = t('slash_admin.controller.update.error', model_name: @model_name)
       end
-      render :edit and return
+      render :edit
     end
 
     def show
@@ -112,6 +135,49 @@ module SlashAdmin
       end
     end
 
+    def before_validate_on_update; end
+    def after_save_on_update; end
+
+    def handle_has_one
+      @has_one = {}
+      Array.wrap(update_params + create_params).uniq.each do |p|
+        if helpers.guess_field_type(@model_class.new, p) == 'has_one' && !@model_class.nested_attributes_options.key?(p.to_sym)
+          @has_one[p] = permit_params[p]
+          permit_params.delete(p)
+        end
+      end
+    end
+
+    def handle_specific_fields
+      # has_one
+      if @has_one.present?
+        @has_one.each do |k, v|
+          if v.present?
+            @model.send("#{k}=", helpers.class_name_from_association(@model, k).constantize.find(v))
+          else
+            @model.send("#{k}=", nil)
+          end
+        end
+      end
+
+      # JSON
+      @model_class.columns_hash.each do |k, v|
+        if permit_params[k].is_a? String
+          if v.type == :json || v.type == :jsonb || helpers.serialized_json_field?(@model_class, k.to_s)
+            begin
+              @model.send("#{k}=", JSON.parse(permit_params[k]))
+            rescue
+              # Handle case when single string passed, we transform it into array to have a valid json
+              json = permit_params[k].split(',').to_json
+              @model.send("#{k}=", JSON.parse(json))
+            end
+          end
+        end
+      end
+
+      # Other
+    end
+
     def nestable
       unless @is_nestable
         flash[:error] = t('slash_admin.controller.nestable.error', model_name: @model_name)
@@ -135,16 +201,39 @@ module SlashAdmin
     end
 
     def handle_filtered_search
-      search = @model_class.all
+      if @model_class.respond_to? :translated_attribute_names
+        search = @model_class.with_translations(I18n.locale).all
+      else
+        search = @model_class.all
+      end
+
+      virtual_fields = []
 
       params[:filters].each do |attr, query|
         unless query.blank?
-          # column = @model_class.arel_table[attr.to_sym]
-          case helpers.guess_field_type(@model_class, attr)
+          attr_type = helpers.guess_field_type(@model_class, attr)
+          if @model_class.respond_to?(:translated_attribute_names) && @model_class.translated_attribute_names.include?(attr.to_sym)
+            attr = "#{@model_class.name.singularize.underscore}_translations.#{attr}"
+          end
+          case attr_type
+          when 'belongs_to'
+            search = search.eager_load(attr.to_s)
+            search = search.where(attr.to_s + '_id IN (' + query.join(',') + ')')
+          when 'has_one'
+            search = search.eager_load(attr.to_s)
+            search = search.where(attr.to_s.pluralize + '.id IN (' + query.join(',') + ')')
           when 'string', 'text'
-            # TODO: handle unnaccent if postgres and extensions installed
-            # search = search.where("unaccent(lower(#{attr})) LIKE unaccent(lower(:query))", query: "%#{query}%")
-            search = search.where("lower(#{attr}) LIKE lower(:query)", query: "%#{query}%")
+            query.strip! unless query.strip!.nil?
+            attributes = @model_class.new.attributes.keys
+            if !attributes.include?(attr.to_s) && @model_class.method_defined?(attr.to_s)
+              virtual_fields << attr.to_s
+            else
+              begin
+                search = search.where("unaccent(lower(#{attr})) LIKE unaccent(lower(:query))", query: "%#{query}%")
+              rescue
+                search = search.where("lower(#{attr}) LIKE lower(:query)", query: "%#{query}%")
+              end
+            end
           when 'date', 'datetime'
             if query.is_a?(String)
               search = search.where("#{attr} = :query", query: query)
@@ -163,12 +252,31 @@ module SlashAdmin
               end
             end
           when 'decimal', 'number', 'integer'
-            search = search.where("#{attr} >= :query", query: query['from']) if query['from'].present?
-            search = search.where("#{attr} <= :query", query: query['to']) if query['to'].present?
+            if query.instance_of?(ActionController::Parameters)
+              if query['from'].present? || query['to'].present?
+                search = search.where("#{attr} >= :query", query: query['from']) if query['from'].present?
+                search = search.where("#{attr} <= :query", query: query['to']) if query['to'].present?
+              end
+            else
+              if attr_type == 'decimal' || attr_type == 'number'
+                query = query.to_f
+              elsif attr_type == 'integer'
+                query = query.to_i
+              end
+              search = search.where("#{attr} = :query", query: query)
+            end
           when 'boolean'
             search = search.where("#{attr} = :query", query: to_boolean(query))
-          when 'belongs_to', 'has_one'
-            search = search.where(attr.to_s + '_id IN (' + query.join(',') + ')')
+          else
+            raise Exception.new("Unable to query for attribute_type : #{attr_type}")
+          end
+        end
+      end
+
+      params[:filters].each do |attr, query|
+        unless query.blank?
+          if virtual_fields.present? && virtual_fields.include?(attr.to_s)
+            search = search.select { |s| s.send(attr).present? ? s.send(attr).downcase.include?(query.downcase) : nil }
           end
         end
       end
@@ -178,14 +286,7 @@ module SlashAdmin
 
     # Export CSV
     def export_csv(options = {})
-      CSV.generate(options) do |csv|
-        header = @fields.map { |f| @model_class.human_attribute_name(f) }
-        csv << header
-        @models_export.each do |m|
-          csv << m.attributes.values_at(*@fields)
-        end
-        csv
-      end
+      @models_export.to_sql
     end
 
     def update_params(options = {})
@@ -228,9 +329,9 @@ module SlashAdmin
     def handle_default
       @title = @model_name.present? ? @model_class.model_name.human(count: 2) : nil
       @sub_title = nil
-      @per = 10
+      @per = 20
       @page = 1
-      @per_values = [10, 20, 50, 100, 150]
+      @per_values = [20, 30, 50, 100, 150]
       @use_export_params = false
       @order_field = :id
       @order = 'DESC'
@@ -312,7 +413,31 @@ module SlashAdmin
 
     # Exclude default params for edit and create
     def exclude_default_params(params)
-      params - %w(id created_at updated_at slug position)
+      params = params - %w(id created_at updated_at slug position)
+      if @model_class.try(:translated_attribute_names).present?
+        params = params - @model_class.translated_attribute_names.map(&:to_s)
+      end
+      params
+    end
+
+    def stream_file(filename, extension)
+      response.headers['Content-Type'] = 'application/octet-stream'
+      response.headers['Content-Disposition'] = "attachment; filename=#{filename}.#{extension}"
+
+      yield response.stream
+    ensure
+      response.stream.close
+    end
+
+    def stream_csv_report
+      query = @models_export.limit(5000).to_sql
+      query_options = 'WITH CSV HEADER'
+
+      stream_file("#{@model_class.model_name.plural.upcase}_#{Date.today}", 'csv') do |stream|
+        stream_query_rows(query, query_options) do |row_from_db|
+          stream.write row_from_db
+        end
+      end
     end
 
   private
@@ -321,5 +446,14 @@ module SlashAdmin
     def export_params
       list_params
     end
+
+    def stream_query_rows(sql_query, options = 'WITH CSV HEADER')
+      conn = ActiveRecord::Base.connection.raw_connection
+      conn.copy_data "COPY (#{sql_query}) TO STDOUT #{options};" do
+        while row = conn.get_copy_data
+          yield row
+        end
+      end
+    end
   end
 end

data/app/controllers/slash_admin/security/sessions_controller.rb

@@ -12,7 +12,7 @@ module SlashAdmin
         admin = Admin.where('username = :value OR lower(email) = lower(:value)', value: params[:admin][:login]).first
         if admin&.authenticate(params[:admin][:password])
           session[:admin_id] = admin.id
-          flash[:notice] = 'Vous êtes à présent connecté.'
+          flash[:success] = 'Vous êtes à présent connecté.'
           redirect_to slash_admin.dashboard_path
         else
           @error_messages = 'Merci de vérifier vos identifiants'

data/app/controllers/slash_admin/selectize_controller.rb

@@ -16,20 +16,40 @@ module SlashAdmin
 
       duplicate_for_orwhere = results
 
+      virtual_fields = []
+
       params[:fields].each_with_index do |f, index|
         if model_class.respond_to? :translated_attribute_names
           if model_class.translated_attribute_names.include?(f.to_sym)
             f = "#{params[:model_class].singularize.underscore}_translations.#{f}"
           end
+        else
+          unless model_class.column_names.include?(f) || model_class.respond_to?(f)
+            raise Exception.new("Unable to find attribute: #{f} in model_column: #{model_class}, you may need to override autocomplete_params in you target's model controller")
+          end
         end
 
         if index == 0
-          results = results.where("lower(#{f}) LIKE lower(:query)", query: "%#{params[:q]}%")
+          if model_class.column_names.include?(f)
+            results = results.where("lower(#{f}) LIKE lower(:query)", query: "%#{params[:q]}%")
+          else
+            virtual_fields << f
+          end
         else
           results = results.or(duplicate_for_orwhere.where("lower(#{f}) LIKE lower(:query)", query: "%#{params[:q]}%"))
         end
       end
 
+      params[:fields].each do |f|
+        unless params[:q].blank?
+          if virtual_fields.present? && virtual_fields.include?(f)
+            results = results.select { |s| s.send(f).present? ? s.send(f).downcase.include?(params[:q].downcase) : nil }
+          end
+        end
+      end
+
+
+
       formatted_result = []
       results.each do |r|
         formatted_result << { id: r.id, name: helpers.show_object(r) }

data/app/helpers/slash_admin/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SlashAdmin
   module ApplicationHelper
     def page_title(content)
@@ -18,10 +19,17 @@ module SlashAdmin
         end
       end
 
-      # Direct Link temp TODO
       if s[:path].present?
-        access = true
+        if can? s[:role], s[:role]
+          access = true
+        end
+        if s[:role].present?
+          if can? s[:role], s[:role]
+            access = true
+          end
+        end
       end
+
       access
     end
 
@@ -79,6 +87,7 @@ module SlashAdmin
       return true unless object.errors.messages[field_name].blank?
     end
 
+    # Type must be 'warning' or 'success' or 'error'
     def toastr_bootstrap
       flash_messages = []
       flash.each do |type, message|
@@ -150,6 +159,8 @@ module SlashAdmin
       has_many_fields = object_class.reflect_on_all_associations(:has_many).map(&:name)
       has_one_fields = object_class.reflect_on_all_associations(:has_one).map(&:name)
 
+      return if attr.is_a? Hash
+
       type = if object_class&.uploaders&.key?(attr.to_sym)
         'image'
       elsif belongs_to_fields.include?(attr.to_sym)
@@ -170,6 +181,28 @@ module SlashAdmin
       type
     end
 
+    # From shoulda-matchers https://github.com/thoughtbot/shoulda-matchers/blob/da4e6ddd06de54016e7c2afd953120f0f6529c70/lib/shoulda/matchers/rails_shim.rb
+    # @param model @model_class
+    def serialized_attributes_for(model)
+      serialized_columns = model.columns.select do |column|
+        model.type_for_attribute(column.name).is_a?(
+          ::ActiveRecord::Type::Serialized,
+          )
+      end
+
+      serialized_columns.inject({}) do |hash, column|
+        hash[column.name.to_s] = model.type_for_attribute(column.name).coder
+        hash
+      end
+    end
+
+    # @param model @model_class
+    # @param attribute String
+    def serialized_json_field?(model, attribute)
+      hash = serialized_attributes_for(model)
+      hash.key?(attribute) && hash[attribute] == ::ActiveRecord::Coders::JSON
+    end
+
     def admin_custom_field(form, attribute)
       type = attribute[attribute.keys.first][:type].to_s
       render partial: "slash_admin/custom_fields/#{type}", locals: { f: form, a: attribute }
@@ -186,7 +219,11 @@ module SlashAdmin
       if attribute.is_a?(Hash)
         admin_custom_field(form, attribute)
       elsif belongs_to_fields.include?(attribute.to_sym)
-        render partial: 'slash_admin/fields/belongs_to', locals: { f: form, a: attribute }
+        if form.object.class.nested_attributes_options.key?(attribute.to_sym)
+          render partial: 'slash_admin/fields/nested_belongs_to', locals: { f: form, a: attribute }
+        else
+          render partial: 'slash_admin/fields/belongs_to', locals: { f: form, a: attribute }
+        end
       elsif has_many_fields.include?(attribute.to_sym)
         # if has nested_attributes_options for has_many field
         if form.object.class.nested_attributes_options.key?(attribute.to_sym)
@@ -195,7 +232,11 @@ module SlashAdmin
           render partial: 'slash_admin/fields/has_many', locals: { f: form, a: attribute }
         end
       elsif has_one_fields.include?(attribute.to_sym)
-        render partial: 'slash_admin/fields/has_one', locals: { f: form, a: attribute }
+        if form.object.class.nested_attributes_options.key?(attribute.to_sym)
+          render partial: 'slash_admin/fields/nested_has_one', locals: { f: form, a: attribute }
+        else
+          render partial: 'slash_admin/fields/has_one', locals: { f: form, a: attribute }
+        end
       elsif form.object.class&.uploaders&.key?(attribute.to_sym)
         render partial: 'slash_admin/fields/carrierwave', locals: { f: form, a: attribute }
       else