boxroom 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e9f11bc948549ad833330da41139124099fa51
-  data.tar.gz: 6fcbc3e5f900ad2c032aa8562cb7ebd2d08a1465
+  metadata.gz: 2425f21a20fb62edbadae39129d71297a13297dd
+  data.tar.gz: b28cc4abc23332bbe28439304d2b9003873aa4d7
 SHA512:
-  metadata.gz: a4c1fd13840b7a5aed4e3c496188fad9e7d0a3302fd853728cc17e13d5292fe2fdf546db8c8b01596059a7d97986e7b0d032c334d395f5999103479fe353fd44
-  data.tar.gz: a1349db39a6ef79da9dce7e9ef0ea125065e8df19b54dea8f27fed7ff661829d5396a2652c139dcf588acfd402cf1ef8a1e8d73225b598ecc4cf92193058ca09
+  metadata.gz: aea5a38bcf464ca445bf742d30c7296664e8e02c234dc26c1b5641a11cf8835ced66f2d9f9281349131142a2df8de3f48a00178f4a4c1a5af4c94611cb5fc14e
+  data.tar.gz: 9d6fca592719fc908a0efa10ff09bb032c96def05880cc14dc72af49533821f4c80d15e8be2c949d8cb4e088a6f2d50deaca3a8b4a5fcf0860b1c2fc16689646

data/README.md

@@ -81,6 +81,7 @@ Please feel free to leave an issue or PR.
 The engine is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 ## Roadmap:
+- tests for sort
 - support s3
 - batch actions
 - tag files

data/app/concepts/boxroom/folder/cell/show.rb

@@ -20,6 +20,23 @@ module Boxroom
         model
       end
 
+      def sort_link(field)
+        if @options[:sort_field] == field
+          sort_dir = @options[:sort_dir] == 'desc' ? 'asc' : 'desc'
+          icon_class = sort_dir == 'asc' ? 'fa-caret-up' : 'fa-caret-down'
+        else
+          sort_dir = 'asc'
+          icon_class = 'fa-caret-down'
+        end
+        span_class = @options[:sort_field] == field ? 'has-text-link' : 'has-text-grey-lighter'
+        path = if request.original_url.include? 'search'
+                 search_path(folder_id: folder.id, term: params[:term], sort_field: field, sort_dir: sort_dir)
+               else
+                 folder_path(folder, sort_field: field, sort_dir: sort_dir)
+               end
+        link_to "<span class=\"icon is-small #{span_class}\"><i class=\"fa #{icon_class}\"></i></span>", path
+      end
+
     end
   end
 end

data/app/concepts/boxroom/folder/contract/files_and_folders.rb

@@ -0,0 +1,9 @@
+module Boxroom::Folder::Contract
+  class FilesAndFolders < Reform::Form
+    property :folder_id, virtual: true
+    property :sort_field, virtual: true
+    property :sort_dir, virtual: true
+
+    validates :folder_id, presence: true
+  end
+end

data/app/concepts/boxroom/folder/operations/files_and_folders.rb

@@ -0,0 +1,28 @@
+module Boxroom
+  class Folder < ActiveRecord::Base
+    class FilesAndFolders < ::Trailblazer::Operation
+      step Trailblazer::Operation::Contract::Build(constant: Boxroom::Folder::Contract::FilesAndFolders)
+      step Trailblazer::Operation::Contract::Validate()
+      step :get_lists
+
+      def get_lists(options, params:, **)
+        folder = Boxroom::Folder.find(params[:folder_id])
+        sort_field, sort_dir = params[:sort_field], params[:sort_dir]
+        sort_dir = sort_dir == 'asc' ? 'asc' : 'desc'
+        options['folders'] = folder.children
+        options['files'] = folder.user_files
+        case sort_field
+          when 'name'
+            options['folders'] = options['folders'].reorder("name #{sort_dir}")
+            options['files'] = options['files'].reorder("attachment_file_name #{sort_dir}")
+          when 'size'
+            options['files'] = options['files'].reorder("attachment_file_size #{sort_dir}")
+          when 'date'
+            options['folders'] = options['folders'].reorder("updated_at #{sort_dir}")
+            options['files'] = options['files'].reorder("updated_at #{sort_dir}")
+        end
+        true
+      end
+    end
+  end
+end

data/app/concepts/boxroom/folder/view/show.erb

@@ -2,9 +2,9 @@
   <thead>
   <tr>
     <th></th>
-    <th><%= t :name %></th>
-    <th><%= t :size %></th>
-    <th><%= t :date_modified %></th>
+    <th><%= t :name %> <%= sort_link 'name' %> </th>
+    <th><%= t :size %> <%= sort_link 'size' %> </th>
+    <th><%= t :date_modified %> <%= sort_link 'date' %> </th>
     <th></th>
   </tr>
   </thead>

data/app/concepts/boxroom/search/contract/files_and_folders.rb

@@ -2,6 +2,8 @@ module Boxroom::Search::Contract
   class FilesAndFolders < Reform::Form
     property :term, virtual: true
     property :folder_id, virtual: true
+    property :sort_field, virtual: true
+    property :sort_dir, virtual: true
 
     validates :folder_id, presence: true
     validates :term, length: {minimum: 3}

data/app/concepts/boxroom/search/operations/files_and_folders.rb

@@ -3,6 +3,7 @@ module Boxroom::Search
     step Trailblazer::Operation::Contract::Build(constant: Boxroom::Search::Contract::FilesAndFolders)
     step Trailblazer::Operation::Contract::Validate()
     step :search_tree
+    step :sort_results
 
     def search_tree(options, params:, **)
       options['files'], options['folders'] = [], []
@@ -17,5 +18,24 @@ module Boxroom::Search
         search_folder(term, f, options)
       end
     end
+
+    def sort_results(options, params:, **)
+      sort_field, sort_dir = params[:sort_field], params[:sort_dir]
+      sort_dir = sort_dir == 'asc' ? 'asc' : 'desc'
+      case sort_field
+        when 'name'
+          options['folders'] = options['folders'].sort_by {|f| f.name}
+          options['files'] = options['files'].sort_by {|f| f.attachment_file_name}
+          options['folders'] = options['folders'].reverse if sort_dir == 'desc'
+        when 'size'
+          options['files'] = options['files'].sort_by {|f| f.attachment_file_size}
+        when 'date'
+          options['folders'] = options['folders'].sort_by {|f| f.updated_at}
+          options['files'] = options['files'].sort_by {|f| f.updated_at}
+          options['folders'] = options['folders'].reverse if sort_dir == 'desc'
+      end
+      options['files'] = options['files'].reverse if sort_dir == 'desc'
+      true
+    end
   end
 end

data/app/controllers/boxroom/folders_controller.rb

@@ -17,6 +17,10 @@ module Boxroom
 
     # Note: @folder is set in require_existing_folder
     def show
+      result = Boxroom::Folder::FilesAndFolders.(params: {folder_id: @folder.id, sort_field: params[:sort_field], sort_dir: params[:sort_dir]})
+      if result.success?
+        @files, @folders = result['files'], result['folders']
+      end
     end
 
     # Note: @target_folder is set in require_existing_target_folder

data/app/controllers/boxroom/search_controller.rb

@@ -5,7 +5,7 @@ module Boxroom
     def show
       @folder = get_folder_or_redirect(params[:folder_id])
       @term = params[:term]
-      result = Search::FilesAndFolders.(params: {term: @term, folder_id: @folder.id})
+      result = Search::FilesAndFolders.(params: {term: @term, folder_id: @folder.id, sort_field: params[:sort_field]})
       if result.success?
         @folders = result['folders']
         @files = result['files']

data/app/views/boxroom/folders/show.html.erb

@@ -56,9 +56,12 @@
 
 <div id="files_and_folders">
   <%= concept(Boxroom::Folder::Cell::Show, @folder,
-              folders: @folder.children,
-              files: @folder.user_files,
-              current_user: boxroom_current_user) %>
+              folders: @folders,
+              files: @files,
+              current_user: boxroom_current_user,
+              sort_field: params[:sort_field],
+              sort_dir: params[:sort_dir]
+      ) %>
 </div>
 
 <% if boxroom_current_user.member_of_admins? -%>

data/app/views/boxroom/search/show.html.erb

@@ -2,10 +2,12 @@
 
 <h1 class="title"><%= "Search `#{@term}` in #{@folder.name}" %></h1>
 
-<%= concept(Boxroom::Folder::Cell::Show, nil,
+<%= concept(Boxroom::Folder::Cell::Show, @folder,
             folders: @folders,
             files: @files,
-            current_user: boxroom_current_user
+            current_user: boxroom_current_user,
+            sort_field: params[:sort_field],
+            sort_dir: params[:sort_dir]
     ) %>
 
 <div class="field">

data/lib/boxroom/version.rb

@@ -1,3 +1,3 @@
 module Boxroom
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxroom
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Serge Koba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -333,6 +333,8 @@ files:
 - app/assets/stylesheets/boxroom/application.scss
 - app/concepts/boxroom/base_cell.rb
 - app/concepts/boxroom/folder/cell/show.rb
+- app/concepts/boxroom/folder/contract/files_and_folders.rb
+- app/concepts/boxroom/folder/operations/files_and_folders.rb
 - app/concepts/boxroom/folder/view/show.erb
 - app/concepts/boxroom/search/contract/files_and_folders.rb
 - app/concepts/boxroom/search/operations/files_and_folders.rb