kadmin 0.6.21 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98456b6564d2ed7360237ee63add4224c3657332
-  data.tar.gz: b5ab9f55d662438bd78d20a773fd1d6e9f0d69f5
+  metadata.gz: 7efabe35025636546f2808580039dda4b4644cc6
+  data.tar.gz: a17851a34c29e7b9fcf54032837636870b10ce11
 SHA512:
-  metadata.gz: 492c06c2e1de2da68377bd30d0da378dadd9b2d8306525d2899ac879d8a5b13c412c7dab2aab020318fcc8edaa5ef7fe14799a264733aee19f6cf643044f81c7
-  data.tar.gz: c51a21974ec0d7cd74fb3bba05c11e7b1c8100cd3783b084032a5385a7615bfb884261a759c408403e1728a4a2c7cef40a4c9980d8052e67db1bedb0e409f8b2
+  metadata.gz: 9e3dfa3064c02e13c4c8f90de06863c4ecffaaaf9b3770a2187e43fde85d5411330e5bffbc15418fb29d9b895c9e3f7ec13a15c39885ddb8e3fdf710fe75e223
+  data.tar.gz: 9b772293e19afd36b3d2d3042b6d6135f1953ec7771d56b273ce1c5732dad371edc6b2a3a1459c2caebe42fa0782000fd77d3aafecd3c9b9e410f8b2c69bc457

data/app/assets/javascripts/kadmin/select2.js

@@ -28,6 +28,8 @@ jQuery(document).ready(function() {
   }
 
   function transformResponse(data, params) {
+    data = transform(data, this.$element.data("kadmin--transform-response"));
+
     var items = data.data || data.items;
     var options = this.options.options.kadmin || {}; // weird but it is what it is
     var displayProperty = options.displayProperty || "text";
@@ -39,12 +41,10 @@ jQuery(document).ready(function() {
       results.push({ text: item[displayProperty], id: item[valueProperty] });
     });
 
-    response = {
+    return {
       results: results,
       pagination: { more: data.more }
     };
-
-    return transform(response, this.$element.data("kadmin--transform-response"));
   }
 
   function optionsForSelect2(element) {

data/app/controllers/kadmin/application_controller.rb

@@ -46,6 +46,7 @@ module Kadmin
         status: :internal_server_error,
         error: error
       }.merge(options)
+      binding.pry
       render 'kadmin/error', status: options[:status], locals: options
     end
 
@@ -53,10 +54,11 @@ module Kadmin
 
     # @!group Helpers
 
+    protected
+
     def set_default_format
       params[:format] = 'html' if params[:format].blank?
     end
-    protected :set_default_format
 
     # @!endgroup
   end

data/app/controllers/kadmin/concerns/resources.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Kadmin
+  module Concerns
+    module Resources
+      extend ActiveSupport::Concern
+
+      # Default finder page size
+      DEFAULT_FINDER_PAGE_SIZE = 100
+
+      # Does not return anything, but will modify your finder instance.
+      # @param [Kadmin::Finder] finder the finder to respond with
+      # @param [Array<String>] filters an array of filters, of format: { name:, column:, param: }
+      def resources_finder(scope, filters = [])
+        filters = Array.wrap(filters)
+        filter_params = filters.map { |hash| hash[:param] }
+        permitted = params.permit(:page_size, :page_offset, :format, *filter_params)
+
+        page_size = permitted.fetch(:page_size, DEFAULT_FINDER_PAGE_SIZE).to_i
+        page_offset = permitted.fetch(:page_offset, 0).to_i
+
+        finder = Kadmin::Finder.new(scope)
+        finder.paginate(size: page_size, offset: page_offset)
+        filters.each do |filter|
+          finder.filter(name: filter[:name], column: filter[:column], value: permitted[filter[:param]])
+        end
+
+        return finder.present
+      end
+    end
+  end
+end

data/app/views/kadmin/components/_finder.html.erb

@@ -1,7 +1,6 @@
-<% hide_create_button = false if local_assigns[:hide_create_button].nil? %>
 <div class='card finder'>
   <div class='card-block'>
-    <%= render partial: 'kadmin/components/finder/header', locals: { finder: finder, hide_create_button: hide_create_button } %>
+    <%= render partial: 'kadmin/components/finder/header', locals: local_assigns %>
     <div class='container-fluid'>
       <div class='row' style='padding-top: 15px'>
         <%= yield(finder.results) %>

data/app/views/kadmin/components/_finder.js.erb

@@ -0,0 +1,9 @@
+{
+  "more": <%= finder.pager.next_page? %>,
+  "items":
+    <% if block_given? %>
+      [ <%= safe_join(finder.results.map { |object| capture { yield(object) } }, ',') %> ]
+    <% else %>
+      <%= raw(finder.results.map(&:attributes).to_json) %>
+    <% end %>
+}

data/app/views/kadmin/components/finder/_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag(request.fullpath, method: 'get', class: 'form-inline pull-right') do %>
   <div class='form-group'>
-    <% unless hide_create_button %>
+    <% unless local_assigns.fetch(:hide_create_button, false) %>
       <%= link_to(t('kadmin.components.finder.create'), url_for(action: :new), class: 'btn btn-primary', style: 'margin-right: 20px') %>
     <% end %>
     <% finder.filters.each do |name, filter| %>

data/app/views/kadmin/components/finder/_header.html.erb

@@ -8,7 +8,7 @@
         )
       <% end %>
       <% if finder.filters.present? %>
-        <%= render partial: 'kadmin/components/finder/form', locals: { finder: finder, hide_create_button: hide_create_button } %>
+        <%= render partial: 'kadmin/components/finder/form', locals: local_assigns %>
       <% end %>
   </h3>
 </div>

data/app/views/kadmin/error.js.erb

@@ -0,0 +1,5 @@
+{
+  "title": "<%= title %>",
+  "message": "<%= message %>",
+  "status": <%= status %>
+}

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '0.6.21'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 0.6.21
+  version: 0.7.0
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,16 +119,19 @@ files:
 - app/controllers/kadmin/application_controller.rb
 - app/controllers/kadmin/auth_controller.rb
 - app/controllers/kadmin/concerns/authorized_user.rb
+- app/controllers/kadmin/concerns/resources.rb
 - app/controllers/kadmin/dash_controller.rb
 - app/helpers/kadmin/alert_helper.rb
 - app/helpers/kadmin/application_helper.rb
 - app/helpers/kadmin/bootstrap_helper.rb
 - app/views/kadmin/auth/login.html.erb
 - app/views/kadmin/components/_finder.html.erb
+- app/views/kadmin/components/_finder.js.erb
 - app/views/kadmin/components/finder/_form.html.erb
 - app/views/kadmin/components/finder/_header.html.erb
 - app/views/kadmin/dash/index.html.erb
 - app/views/kadmin/error.html.erb
+- app/views/kadmin/error.js.erb
 - app/views/kadmin/helpers/_alerts.html.erb
 - app/views/kadmin/helpers/_form_errors.html.erb
 - app/views/layouts/kadmin/application.html.erb