express_admin 1.7.8 → 1.7.9

data/app/assets/stylesheets/express_admin/screen.sass

@@ -34,6 +34,7 @@
 @import 'shared/alerts'
 @import 'shared/progress'
 @import 'shared/reveal'
+@import 'shared/buttons'
 
 @import 'components/command_button'
 

data/app/assets/stylesheets/express_admin/shared/_buttons.sass

@@ -0,0 +1,2 @@
+.button-login
+  margin: .5em

data/app/assets/stylesheets/express_admin/shared/_forms.sass

@@ -39,4 +39,4 @@
   background: #fff
   border: 1px solid #ddd
   margin: 100px 0
-  padding: 40px 20px 0 20px
+  padding: 40px 20px

data/app/components/express_admin/file_upload.rb

@@ -0,0 +1,131 @@
+module ExpressAdmin
+  module Components
+    class FileUpload < ExpressTemplates::Components::Forms::FormComponent
+
+      has_option :action, 'The form action containing the resource path or url.'
+      has_option :max_file_size, 'The maximum file size a user can upload', type: :int
+
+      contains -> {
+        div(class: 'dropzone-previews') {
+          div(class: 'dz-default dz-message') {
+            span(class: 'dz-message-instruction') {'Drop files here or click to upload.'}
+          }
+        }
+
+        div(class: 'dz-preview dz-file-preview', id: 'preview-template'){
+          div(class: 'dz-error-message hide') {
+            span('data-dz-errormessage' => 'true')
+          }
+          div(class: 'dz-image'){
+            img('data-dz-thumbnail' => true)
+          }
+          div(class: 'dz-close hide') {
+            icon_link('close-round', 'data-dz-remove' => true)
+          }
+          div(class: 'dz-details hide'){
+            div(class: 'dz-filename'){
+              span('data-dz-name' => true)
+            }
+            div(class: 'dz-size', 'data-dz-size' => true)
+          }
+          div(class: 'dz-progress') {
+            span(class: 'dz-upload', 'data-dz-uploadprogress' => true)
+          }
+          div(class: 'dz-success-mark hide') {
+            icon('checkmark-circled')
+          }
+          div(class: 'dz-error-mark hide') {
+            icon('close-circled')
+          }
+        }
+
+        content_for(:page_javascript) {
+          script {
+            %Q(
+              $(function() {
+                previewNode = $('#preview-template').get(0).outerHTML;
+                $('#preview-template').remove();
+                var submitButton;
+                Dropzone.options.#{config[:id].to_s.camelize(:lower)} = {
+                  url: window.location.origin + '#{config[:action]}',
+                  paramName: '#{config[:id]}[file]',
+                  autoProcessQueue: false,
+                  uploadMultiple: false,
+                  maxFiles: 1,
+                  maxFilesize: #{max_file_size},
+                  previewTemplate: previewNode,
+                  previewsContainer: '.dropzone-previews',
+                  clickable: '.dropzone-previews',
+                  init: function() {
+                    var myDropzone = this;
+                    submitButton = this.element.querySelector('input[type=submit]');
+
+                    $(submitButton).on('click', function(e) {
+                      e.preventDefault();
+                      myDropzone.processQueue();
+                    });
+
+                    this.on('addedfile', function(file) {
+                      if (this.files[1]) {
+                        this.removeFile(this.files[0]);
+                      }
+                      $('.dz-message.dz-default').addClass('hide');
+                    });
+
+                    this.on('removedfile', function() {
+                      $('.dz-message.dz-default').removeClass('hide');
+                      $(submitButton).removeClass('disabled');
+                    });
+
+                    this.on('processing', function() {
+                      $('.dz-image').zIndex('-999');
+                      $('.dz-image > img').addClass('blur');
+                      $(submitButton).addClass('disabled');
+                    });
+
+                    this.on('maxfilesexceeded', function(file) {
+                      this.removeAllFiles();
+                      this.addFile(file);
+                    });
+
+                    this.on('success', function(file) {
+                      $('.dz-progress').css('opacity', 0);
+                      $('.dz-success-mark').removeClass('hide');
+                      setTimeout( function() {
+                        $('.dz-image').zIndex('999');
+                        $('.dz-image > img').removeClass('blur');
+                        location.reload();
+                      }, 2000);
+                    });
+
+                    this.on('complete', function(file) {
+                      if (file.accepted === false) {
+                        $('.dz-progress').css('opacity', 0);
+                        setTimeout(function() { $('.dz-error-mark').removeClass('hide') }, 500);
+
+                        setTimeout(function() {
+                          $('.dz-image').zIndex('999');
+                          $('.dz-image > img').removeClass('blur');
+                          $('.dz-error-message').removeClass('hide');
+                          $(submitButton).addClass('disabled');
+                        }, 3000);
+                      }
+                    });
+
+                    this.on('drop', function() {
+                      $('.dz-message.dz-default').addClass('hide');
+                    });
+                  },
+                }
+              });
+            ).html_safe
+          }
+        }
+      }
+
+      def max_file_size
+        config[:max_file_size]
+      end
+    end
+  end
+end

data/app/components/express_admin/media_form.rb

@@ -0,0 +1,27 @@
+module ExpressAdmin
+  module Components
+    class MediaForm < ExpressTemplates::Components::Configurable
+
+      has_option :max_file_size, 'The maximum file size a user can upload', type: :int, default: 3
+
+      contains -> {
+        express_form(config[:id], enctype: 'multipart/form-data', class: 'dropzone'){
+          text :title
+          text :description
+          label_tag('tags', "Tags")
+          select_tag("media_item[tags]", helpers.options_for_select(ExpressSite::Tag.all.map(&:name), media_item.tags.map(&:name)), class: 'select2', multiple: true)
+          file_upload config[:id], action: form_action, max_file_size: max_file_size
+          submit class: 'button', value: 'Upload'
+        }
+      }
+
+      def form_action
+        config[:action] || (resource.try(:persisted?) ? resource_path(resource) : collection_path)
+      end
+
+      def max_file_size
+        config[:max_file_size]
+      end
+    end
+  end
+end

data/app/components/express_admin/oauth_sign_in_links.rb

@@ -0,0 +1,28 @@
+module ExpressAdmin
+  class OauthSignInLinks < ExpressTemplates::Components::Configurable
+
+    has_argument :providers, "OAuth providers to generate links for", as: :providers, type: :array
+
+    contains -> {
+      span(class: 'text-gray') { "Login with:" }
+      providers.each do |provider|
+        sign_in_link(provider)
+      end
+    }
+
+    def sign_in_link(provider)
+      link_to "#{provider_name(provider)}", user_omniauth_authorize_path(provider), class: 'hollow button button-login'
+    end
+
+    private
+
+    def provider_name(provider)
+      provider.to_s.humanize
+    end
+
+    def providers
+      config[:providers]
+    end
+
+  end
+end

data/app/components/express_admin/smart_table.rb

@@ -8,6 +8,11 @@ module ExpressAdmin
 
         MAX_COLS_TO_SHOW_IDX = 5
         MAX_ROWS_TO_SHOW_IDX = 10
+        COLUMN_REGEX_LIST = {
+          link: /(\w+)_link$/,
+          checkmark: /(\w+)_checkmark/,
+          in_words: /(\w+)_in_words/
+        }
 
         attr :columns
 
@@ -33,6 +38,9 @@ module ExpressAdmin
                                end
                                options = options + resource_class.instance_methods.grep(/_count$/).map(&:to_s)
                              }
+        has_option :sortable, 'Specify the target column. Provide column sort with caret display to signify column is sortable',
+                              type: :array,
+                              default: nil
         has_option :rows, 'Specify the number of rows to show', type: :integer
 
         has_option :pagination, 'Add pagination to the bottom of the table', type: :string, default: 'bottom'
@@ -50,7 +58,7 @@ module ExpressAdmin
               tr {
                 display_columns.each do |column|
                   th(class: column.name) {
-                    column.title
+                    config[:sortable].present? ? sortable(column) : column.title
                   }
                 end
                 actions_header if should_show_actions?
@@ -82,6 +90,31 @@ module ExpressAdmin
           _initialize_columns
         }
 
+        def sortable(column)
+          table_column = column.table_column
+          if config[:sortable].include?(column.title) && table_column.present?
+            a(href: sort_link(column)) {
+              text_node column.title
+              if helpers.params[:asc].eql?(table_column)
+                i(class: 'icon ion-ios-arrow-up')
+              else
+                i(class: 'icon ion-ios-arrow-down')
+              end
+            }
+          else
+            column.title
+          end
+        end
+
+        def sort_link(column)
+          uri = URI.parse(config[:id].to_s)
+          table_column = column.table_column
+          param_asc = helpers.params[:asc]
+          sort_direction = param_asc.eql?(table_column) ? :desc : :asc
+          uri.query = { sort_direction => table_column }.to_param
+          uri.to_s
+        end
+
         def pagination
           paginate collection, :route_set => route_set
         end
@@ -154,12 +187,12 @@ module ExpressAdmin
                     rescue
                       'Error: '+$!.to_s
                     end
-                  elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
+                  elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:link]).try(:[], 1)
                     # TODO: only works with non-namespaced routes
                     helpers.link_to item.send(attrib), resource_path(item)
-                  elsif attrib = accessor.to_s.match(/(\w+)_checkmark/).try(:[], 1)
+                  elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:checkmark]).try(:[], 1)
                     "<i class='ion-checkmark-round'></i>".html_safe if item.send(attrib)
-                  elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
+                  elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:in_words]).try(:[], 1)
                     if item.send(attrib)
                       if item.send(attrib) < DateTime.now
                         "#{helpers.time_ago_in_words(item.send(attrib))} ago"
@@ -193,11 +226,24 @@ module ExpressAdmin
         end
 
         class Column
-          attr :name, :title, :accessor
+          attr :name, :title, :accessor, :table_column
           def initialize(accessor, title = nil)
             @name = accessor.kind_of?(Symbol) ? accessor.to_s.underscore : title.titleize.gsub(/\s+/,'').underscore
             @accessor = accessor
             @title = title || @name.titleize
+            @table_column = table_column
+          end
+
+          def table_column
+            if accessor.kind_of?(Symbol)
+              COLUMN_REGEX_LIST.map do |key, value|
+                accessor_match(COLUMN_REGEX_LIST[key])
+              end.compact.first
+            end
+          end
+
+          def accessor_match(regex)
+            accessor.to_s.match(regex).try(:[], 1)
           end
         end
 

data/app/helpers/express_admin/admin_helper.rb

@@ -1,9 +1,5 @@
 module ExpressAdmin
   module AdminHelper
-
-    # TODO move this out
-    #include ExpressMedia::Admin::MediaHelper if Kernel.const_defined?("ExpressMedia::Engine")
-
     def title_partial
       (ExpressAdmin::Engine.config.title_partial rescue nil) || 'shared/express_admin/title'
     end

data/app/views/devise/sessions/new.html.et

@@ -51,13 +51,10 @@ div(class: 'grid-container') {
             }
 
             hr
-            div(class: 'services container') {
-              a(href: "/users/auth/appexpress") { "Sign in with appexpress" }
-              br
-            }
+            oauth_sign_in_links(Devise.omniauth_providers)
           }
         }
       }
     }
   }
-}
+}

data/lib/express_admin/engine.rb

@@ -26,19 +26,19 @@ components.each {|component| require component }
 module ExpressAdmin
   class Engine < ::Rails::Engine
 
-   initializer :assets do |config|
-    engine_assets_path = File.join(File.dirname(__FILE__), '..', '..', 'app', 'assets')
-    all_assets = Dir.glob File.join(engine_assets_path, 'stylesheets', '**', '*.css*')
-    all_assets += Dir.glob File.join(engine_assets_path, 'javascripts', '**', '*.js*')
-    all_assets.each {|path| path.gsub!("#{engine_assets_path}/stylesheets/", '')}
-    all_assets.each {|path| path.gsub!("#{engine_assets_path}/javascripts/", '')}
-    all_assets.each {|path| path.gsub!("#{engine_assets_path}/fonts/", '')}
-    all_assets.each {|path| path.gsub!(/.(scss|coffee)$/, '')}
-    Rails.application.config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
-    Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf|png|jpg|jpeg|gif)$/
-    Rails.application.config.assets.precompile << /\.(?:mp4|webm|mp3)$/
-    Rails.application.config.assets.precompile += all_assets
-  end
+    initializer :assets do |config|
+      engine_assets_path = File.join(File.dirname(__FILE__), '..', '..', 'app', 'assets')
+      all_assets = Dir.glob File.join(engine_assets_path, 'stylesheets', '**', '*.css*')
+      all_assets += Dir.glob File.join(engine_assets_path, 'javascripts', '**', '*.js*')
+      all_assets.each {|path| path.gsub!("#{engine_assets_path}/stylesheets/", '')}
+      all_assets.each {|path| path.gsub!("#{engine_assets_path}/javascripts/", '')}
+      all_assets.each {|path| path.gsub!("#{engine_assets_path}/fonts/", '')}
+      all_assets.each {|path| path.gsub!(/.(scss|coffee)$/, '')}
+      Rails.application.config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
+      Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf|png|jpg|jpeg|gif)$/
+      Rails.application.config.assets.precompile << /\.(?:mp4|webm|mp3)$/
+      Rails.application.config.assets.precompile += all_assets
+    end
 
     def all_rails_engines
       Rails.application.eager_load!
@@ -59,4 +59,4 @@ module ExpressAdmin
   class Railtie < ::Rails::Railtie
     config.app_generators.template_engine :et
   end
-end
+end

data/lib/express_admin/standard_actions.rb

@@ -238,13 +238,25 @@ module ExpressAdmin
                     resource_class
                   end
           scope = search?(scope)
-          self.instance_variable_set(collection_ivar, instance_variable(scope))
+          scope = instance_variable(scope)
+          scope = params[:asc] || params[:desc] ? sort_table(scope) : scope
+          self.instance_variable_set(collection_ivar, scope)
         end
 
         def instance_variable(scope)
           scope.kind_of?(Array) ? scope : scope.all
         end
 
+        def sort_table(scope)
+          if params.keys.include?('asc')
+            scope.sort{ |a, b| a.send(params[:asc]) <=> b.send(params[:asc])}
+          elsif params.keys.include?('desc')
+            scope.sort{ |a, b| b.send(params[:desc]) <=> a.send(params[:desc])}
+          else
+            scope
+          end
+        end
+
         def search?(scope)
           params[:search_string].present? ? search(scope) : scope
         end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.8"
+  VERSION = "1.7.9"
 end

data/test/dummy/test/components/smart_table_test.rb

@@ -100,6 +100,42 @@ module Components
       assert_match /class="created_at.*less than a minute ago/, fragment
     end
 
-  end
+    test 'assign column to be sortable which generates a header link' do
+      fragment = arbre(widget: Widget.first, widgets: Widget.all){
+        smart_table(:widgets,
+          sortable: ['Created'],
+          columns: {
+            'Created' => :created_at_in_words
+          })
+      }
+
+      assert_match "href=\"widgets?asc=created_at\"", fragment
+    end
+
+    test 'assign unknown column to sortable which should not generate a header link' do
+      fragment = arbre(widget: Widget.first, widgets: Widget.all){
+        smart_table(:widgets,
+          sortable: ['Ghost'],
+          columns: {
+            'Created' => :created_at_in_words
+          })
+      }
 
+      assert_no_match "href=\"widgets?asc=ghost\"", fragment
+    end
+
+    test 'assign column with proc value to sortable which should not generate header link' do
+      fragment = arbre(widget: Widget.first, widgets: Widget.all){
+        smart_table(:widgets,
+          sortable: ['This column in will not be a link'],
+          columns: {
+            'Created' => :created_at_in_words,
+            "This column will not be a link" => -> (widget) { widget.column2.upcase },
+          })
+      }
+
+      assert_match 'This column will not be a link', fragment
+      assert_no_match 'href=', fragment
+    end
+  end
 end