dorsale 3.9.6 → 3.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35bf78225914a8dfc322164de561790f97b6e49
-  data.tar.gz: 9fd0de39cdcbb701862e92777891924ad6669123
+  metadata.gz: 19154c764ac2dbbf08f847870a9e25551c745ea0
+  data.tar.gz: 401461784af4a331967feb30e8769623584ec539
 SHA512:
-  metadata.gz: 84dd08892c8727c90daa2b55f452b334a75e78a3e434dc2cc955fb3055efd83485850a4dc0908b463fa51b2ec2c8a277308db8a489c6bc2002c562f82819e1f9
-  data.tar.gz: ae773eb9c50e3a42460e7c59a0298e6f5db3ab515fc3c7ae1a7eda3e7ff5148f5009631a6e2cb8c2aa564240357cd77759f0337891e2a9b16179124083c23752
+  metadata.gz: cd9a9eba500e6e8d9941029c64cffca4b7165bad1f63b922e4a6297243df75e26759a305cd3799d31252cd869b5d430624142fef1461dcc4af7de162c7ce9caa
+  data.tar.gz: ece4ad04640bfeddd6b406a00233752b9c58c539952dcb74152346beb41976ea3b2fcd0dbcae21b21984d061063cb4a90724b1bde9c7579998bd30e2f1151103

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.9.7
+
+- Attachments : refactor + sorting
+
 ## 3.9.6
 
 - Tasks : add :on_warning_or_alert scope/filter

data/app/assets/javascripts/dorsale/common/upload.coffee

@@ -8,8 +8,6 @@ window.setupUploadInputs = (scope = document) ->
     submit    = form.find("[type=submit]")
     progress  = form.find(".progress")
 
-    progress.hide() if not xhr2_available()
-
     label.map ->
       this.dataset.defaultValue = $(this).html()
 

data/app/assets/javascripts/dorsale/engines/alexandrie.coffee

@@ -1,59 +1,24 @@
-window.xhr2_available = ->
-  !!window.ProgressEvent && !!window.FormData
-
 window.alexandrie =
-  enable_xhr_upload: true
-
-  load: ->
+  loadList: ->
     $("#dorsale-attachments").map ->
-      container = $(this)
-      url       = this.dataset.url
-
       $.ajax
-        url: url
+        url: this.dataset.url
         success: (data) ->
-          container.html(data)
-          setupUploadInputs(container)
-          alexandrie.setup()
+          alexandrie.replaceHTML(data)
 
-  reload: ->
-    alexandrie.load()
+  replaceHTML: (html) ->
+    $container =  $("#dorsale-attachments")
+    $container.html(html)
+    setupUploadInputs($container)
 
   setup: ->
-    alexandrie.setupForms()
-    alexandrie.setupFormsProgress()
-    alexandrie.setupEditButtons()
-    alexandrie.setupDeleteButtons()
-
-  setupForms: ->
-    $("#dorsale-attachments form").on("ajax:success", alexandrie.reload)
+    $(document).on "ajax:success", "#dorsale-attachments *", (e, data) ->
+      alexandrie.replaceHTML(data)
 
-  setupEditButtons: ->
-    $("#dorsale-attachments [href$=edit]").click ->
-      container = $("#dorsale-attachments")
-      url       = this.href
-
-      $.ajax
-        url: url
-        success: (data) ->
-          container.html(data)
-          setupUploadInputs(container)
-          alexandrie.setup()
+    $(document).on "submit", "#dorsale-attachments form", ->
+      # Ignore progress if no file input
+      return unless $(this).find("input[type=file]").length
 
-      return false
-
-  setupDeleteButtons: ->
-    $("#dorsale-attachments [data-method=delete]").map ->
-      $(this).on("ajax:success", alexandrie.reload)
-
-  setupFormsProgress: ->
-    return unless xhr2_available()
-    return unless alexandrie.enable_xhr_upload
-
-    # Ignore progress if no file input
-    return unless $("#dorsale-attachments form input[type=file]").length
-
-    $("#dorsale-attachments form").submit ->
       form = $(this)
       xhr  = new XMLHttpRequest()
       data = new FormData(this)
@@ -73,10 +38,12 @@ window.alexandrie =
         bar.attr "aria-valuenow": percentComplete
 
       xhr.addEventListener "load", (e) ->
-        alexandrie.reload()
+        alexandrie.replaceHTML(e.target.responseText)
 
       xhr.open("POST", this.action, true)
       xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest")
       xhr.send(data)
 
       return false
+
+alexandrie.setup()

data/app/controllers/dorsale/alexandrie/attachments_controller.rb

@@ -1,7 +1,7 @@
 class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationController
   layout false
 
-  before_action :set_objects, only: [
+  before_action :set_attachment, only: [
     :edit,
     :update,
     :destroy,
@@ -10,12 +10,11 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
   before_action :set_attachment_types
 
   def index
-    @attachable = find_attachable
-    skip_policy_scope
+    @attachable = find_attachable_from_params
 
     authorize @attachable, :read?
 
-    @attachment = scope.new(attachment_params_for_create)
+    render_list
   end
 
   def create
@@ -25,20 +24,17 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
 
     if @attachment.save
       notify_attachable
-      # flash[:notice] = t("messages.attachments.create_ok")
     else
-      flash[:alert] = t("messages.attachments.create_error")
+      flash.now[:alert] = t("messages.attachments.create_error")
     end
 
-    render_or_redirect
+    render_list
   end
 
   def edit
     authorize @attachment, :update?
 
-    @attachable = @attachment.attachable
-
-    render :index
+    render_list
   end
 
   def update
@@ -46,12 +42,11 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
 
     if @attachment.update(attachment_params_for_update)
       notify_attachable
-      # flash[:notice] = t("messages.attachments.update_ok")
     else
-      flash[:alert] = t("messages.attachments.update_error")
+      flash.now[:alert] = t("messages.attachments.update_error")
     end
 
-    render_or_redirect
+    render_list
   end
 
   def destroy
@@ -59,12 +54,11 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
 
     if @attachment.destroy
       notify_attachable
-      # flash[:notice] = t("messages.attachments.delete_ok")
     else
-      flash[:alert] = t("messages.attachments.delete_error")
+      flash.now[:alert] = t("messages.attachments.delete_error")
     end
 
-    render_or_redirect
+    render_list
   end
 
   private
@@ -73,7 +67,7 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     ::Dorsale::Alexandrie::Attachment
   end
 
-  def set_objects
+  def set_attachment
     @attachment = scope.find(params[:id])
   end
 
@@ -81,16 +75,8 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     @attachment_types = policy_scope(::Dorsale::Alexandrie::AttachmentType).all
   end
 
-  def attachable_type
-    params[:attachable_type] || @attachment.attachable_type
-  end
-
-  def attachable_id
-    params[:attachable_id] || @attachment.attachable_id
-  end
-
-  def find_attachable
-    attachable_type.to_s.constantize.find(attachable_id)
+  def find_attachable_from_params
+    params[:attachable_type].to_s.constantize.find(params[:attachable_id])
   rescue NameError
     raise ActiveRecord::RecordNotFound
   end
@@ -99,6 +85,7 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     [
       :name,
       :attachment_type_id,
+      :file,
     ]
   end
 
@@ -106,14 +93,11 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     common_permitted_params + [
       :attachable_id,
       :attachable_type,
-      :file,
     ]
   end
 
   def attachment_params_for_create
-    params
-      .fetch(:attachment, {})
-      .permit(permitted_params_for_create)
+    params.fetch(:attachment, {}).permit(permitted_params_for_create)
       .merge(sender: current_user)
   end
 
@@ -122,17 +106,15 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
   end
 
   def attachment_params_for_update
-    params
-      .fetch(:attachment, {})
-      .permit(permitted_params_for_update)
+    params.fetch(:attachment, {}).permit(permitted_params_for_update)
   end
 
-  def render_or_redirect
-    if request.xhr?
-      head :ok
-    else
-      redirect_to back_url
-    end
+  def render_list
+    @new_attachment = scope.new
+    @attachable = @attachment.attachable if @attachable.nil?
+    @attachments = scope.where(attachable: @attachable).preload(:attachment_type)
+    @attachments = Dorsale::Alexandrie::AttachmentsSorter.call(@attachments, params["sort"])
+    render :index
   end
 
   def notify_attachable

data/app/models/dorsale/alexandrie/attachment.rb

@@ -11,12 +11,6 @@ class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
 
   mount_uploader :file, ::Dorsale::Alexandrie::FileUploader
 
-  default_scope -> {
-    all
-      .order(created_at: :desc, id: :desc)
-      .preload(:attachment_type)
-  }
-
   def download_filename
     if File.extname(file_identifier) == File.extname(name)
       name

data/app/sorters/dorsale/alexandrie/attachments_sorter.rb

@@ -0,0 +1,22 @@
+class Dorsale::Alexandrie::AttachmentsSorter < Agilibox::Sorter
+  def sort
+    case column
+    when :created_at, :updated_at
+      {column => direction}
+    when :name
+      %(LOWER(#{model.table_name}.#{column}) #{direction})
+    when :attachment_type_name
+      @collection = @collection.joins(:attachment_type)
+      table = Dorsale::Alexandrie::AttachmentType.table_name
+      %(LOWER(#{table}.name) #{direction})
+    else
+      {created_at: :desc, id: :desc}
+    end
+  end
+
+  private
+
+  def model
+    Dorsale::Alexandrie::Attachment
+  end
+end

data/app/views/dorsale/alexandrie/attachments/_attachment.html.slim

@@ -8,7 +8,7 @@ tr.attachment
 
   td.attachment-actions
     - if policy(attachment).update?
-      = update_button dorsale.edit_alexandrie_attachment_path(attachment)
+      = update_button dorsale.edit_alexandrie_attachment_path(attachment), remote: true
 
     - if policy(attachment).delete?
       = delete_button dorsale.alexandrie_attachment_path(attachment), remote: true

data/app/views/dorsale/alexandrie/attachments/_loader.html.slim

@@ -1,5 +1,4 @@
 div#dorsale-attachments data-url=dorsale.alexandrie_attachments_path(attachable_type: attachable.class, attachable_id: attachable.id)
 
-coffee:
-  $ ->
-    alexandrie.load()
+javascript:
+  alexandrie.loadList()

data/app/views/dorsale/alexandrie/attachments/index.html.slim

@@ -3,7 +3,8 @@
 .panel.panel-default
   .panel-heading: .panel-title = ::Dorsale::Alexandrie::Attachment.ts
 
-  = form_for(@attachment, as: :attachment, remote: true) do |f|
+  - url = params[:action] == "edit" ? @attachment : @new_attachment
+  = form_for(url, as: :attachment, remote: true) do |f|
     = hidden_field_tag :authenticity_token, form_authenticity_token
 
     table
@@ -12,13 +13,13 @@
       tbody
         - if policy(::Dorsale::Alexandrie::Attachment).create?
           / Create only on index
-          - if params[:action] == "index"
-            = render "dorsale/alexandrie/attachments/new", attachable: @attachable
-          - else
+          - if params[:action] == "edit"
             = render "dorsale/alexandrie/attachments/new_disabled"
+          - else
+            = render "dorsale/alexandrie/attachments/new", attachable: @attachable
 
-        - ::Dorsale::Alexandrie::Attachment.where(attachable: @attachable).each do |attachment|
-          - if request.path == url_for(action: :edit, id: attachment)
+        - @attachments.each do |attachment|
+          - if params[:action] == "edit" && attachment == @attachment
             = render "dorsale/alexandrie/attachments/edit", attachment: attachment
           - else
             = render "dorsale/alexandrie/attachments/attachment", attachment: attachment

data/app/views/dorsale/flyboy/tasks/_filters.html.slim

@@ -1,8 +1,11 @@
 = filters_form do |f|
-  = f.input :fb_state, collection: flyboy_status_for_filters_select, include_blank: Dorsale::Flyboy::Task.t("state.all")
+  = f.input :fb_state,
+    :collection    => flyboy_status_for_filters_select,
+    :include_blank => Dorsale::Flyboy::Task.t("state.all")
 
-  - if @filters.class::STRATEGIES.include?("fb_owner")
-  = f.input :fb_owner, collection: flyboy_tasks_owners_for_filters_select, include_blank: t("filters.all_owners")
+  = f.input :fb_owner,
+    :collection    => flyboy_tasks_owners_for_filters_select,
+    :include_blank => t("filters.all_owners")
 
   = f.input :fb_tags,
     :collection    => flyboy_tasks_tags_for_filters_select,

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.6"
+  VERSION = "3.9.7"
 end

data/spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb

@@ -22,30 +22,124 @@ describe Dorsale::Alexandrie::AttachmentsController, type: :controller do
 
   before(:each) { sign_in(user) }
 
+  let(:attachment) { create(:alexandrie_attachment) }
+
+  describe "sorting" do
+    let!(:attachable) { create(:billing_machine_quotation) }
+
+    let!(:attachment1) {
+      create(:alexandrie_attachment,
+        :attachable      => attachable,
+        :name            => "AAA",
+        :created_at      => "2010-01-01",
+        :updated_at      => "2010-01-01",
+        :attachment_type => create(:alexandrie_attachment_type, name: "AAA"),
+      )
+    }
+
+    let!(:attachment2) {
+      create(:alexandrie_attachment,
+        :attachable      => attachable,
+        :name            => "ZZZ",
+        :created_at      => "2020-01-01",
+        :updated_at      => "2020-01-01",
+        :attachment_type => create(:alexandrie_attachment_type, name: "ZZZ"),
+      )
+    }
+
+    before do
+      allow_any_instance_of(described_class).to \
+        receive(:find_attachable_from_params).and_return(attachable)
+    end
+
+    it "should sort by name" do
+      get :index, params: {sort: "name"}
+      expect(assigns :attachments).to eq [attachment1, attachment2]
+    end
+
+    it "should sort by -name" do
+      get :index, params: {sort: "-name"}
+      expect(assigns :attachments).to eq [attachment2, attachment1]
+    end
+
+    it "should sort by created_at" do
+      get :index, params: {sort: "created_at"}
+      expect(assigns :attachments).to eq [attachment1, attachment2]
+    end
+
+    it "should sort by -created_at" do
+      get :index, params: {sort: "-created_at"}
+      expect(assigns :attachments).to eq [attachment2, attachment1]
+    end
+
+    it "should sort by updated_at" do
+      get :index, params: {sort: "updated_at"}
+      expect(assigns :attachments).to eq [attachment1, attachment2]
+    end
+
+    it "should sort by -updated_at" do
+      get :index, params: {sort: "-updated_at"}
+      expect(assigns :attachments).to eq [attachment2, attachment1]
+    end
+
+    it "should sort by attachment_type_name" do
+      get :index, params: {sort: "attachment_type_name"}
+      expect(assigns :attachments).to eq [attachment1, attachment2]
+    end
+
+    it "should sort by -attachment_type_name" do
+      get :index, params: {sort: "-attachment_type_name"}
+      expect(assigns :attachments).to eq [attachment2, attachment1]
+    end
+  end # describe "sorting"
+
   describe "create" do
     it "should create attachment" do
-      post :create, params: {attachment: valid_attributes, back_url: "/"}
+      post :create, params: {attachment: valid_attributes}
       expect(assigns(:attachment)).to be_persisted
     end
 
-    it "should redirect to back_url" do
-      post :create, params: {attachment: valid_attributes, back_url: "/"}
-      expect(response).to redirect_to("/")
+    it "should render list" do
+      post :create, params: {attachment: valid_attributes}
+      expect(response).to be_ok
+      expect(response).to render_template :index
+    end
+  end
+
+  describe "edit" do
+    it "should render list" do
+      get :edit, params: {id: attachment}
+      expect(response).to be_ok
+      expect(response).to render_template :index
+    end
+  end
+
+  describe "update" do
+    it "should update attachment" do
+      patch :update, params: {id: attachment, attachment: {name: "new_name"}}
+      expect(attachment.reload.name).to eq "new_name"
+    end
+
+    it "should render list" do
+      patch :update, params: {id: attachment}
+      expect(response).to be_ok
+      expect(response).to render_template :index
     end
   end
 
   describe "destroy" do
+    let!(:attachment) { create(:alexandrie_attachment) }
+
     it "should delete attachment" do
-      attachment = create(:alexandrie_attachment)
       expect {
-        delete :destroy, params: {id: attachment, back_url: "/"}
+        delete :destroy, params: {id: attachment}
       }.to change(::Dorsale::Alexandrie::Attachment, :count).by(-1)
     end
 
-    it "should redirect to back_url" do
-      attachment = create(:alexandrie_attachment)
-      delete :destroy, params: {id: attachment, back_url: "/"}
-      expect(response).to redirect_to("/")
+    it "should render list" do
+      delete :destroy, params: {id: attachment}
+      expect(response).to be_ok
+      expect(response).to render_template :index
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.9.6
+  version: 3.9.7
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -643,6 +643,7 @@ files:
 - app/services/dorsale/flyboy/task/snoozer.rb
 - app/services/dorsale/service.rb
 - app/services/dorsale/tag_list_for_model.rb
+- app/sorters/dorsale/alexandrie/attachments_sorter.rb
 - app/sorters/dorsale/flyboy/task_comments_sorter.rb
 - app/sorters/dorsale/flyboy/tasks_sorter.rb
 - app/uploaders/dorsale/alexandrie/file_uploader.rb
@@ -774,7 +775,6 @@ files:
 - app/views/dorsale/expense_gun/expenses/index.html.slim
 - app/views/dorsale/expense_gun/expenses/new.html.slim
 - app/views/dorsale/expense_gun/expenses/show.html.slim
-- app/views/dorsale/flyboy/_filters.html.slim
 - app/views/dorsale/flyboy/task_comments/_form.html.slim
 - app/views/dorsale/flyboy/task_comments/_list.html.slim
 - app/views/dorsale/flyboy/task_comments/_task_comment.html.slim

data/app/views/dorsale/flyboy/_filters.html.slim

@@ -1,13 +0,0 @@
-= filters_form do |f|
-  = f.input :fb_state,
-    :collection    => flyboy_status_for_filters_select,
-    :include_blank => Dorsale::Flyboy::Task.t("state.all")
-
-  = f.input :fb_owner,
-    :collection    => flyboy_tasks_owners_for_filters_select,
-    :include_blank => t("filters.all_owners")
-
-  = f.input :fb_tags,
-    :collection    => flyboy_tasks_tags_for_filters_select,
-    :input_html    => {multiple: true},
-    :placeholder => ::Dorsale::Flyboy::Task.t(:all_tags)