dynamic_scaffold 1.8.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3125035e4f7e839f4277b447b187755759e3ee6cfcdc5c4c9a926bd78cbb9da5
-  data.tar.gz: 981d59b31ace4c0a528139b09a277347598d255de8ff31ef27e822198adeb77a
+  metadata.gz: c42e88067995f3753891fcc0e2a29aa8a8b8fd7ff9b093780f20455db67eb731
+  data.tar.gz: 1872ac09ed02e4a0524e7bc0d26900d1e493596bcafe47b177bfda380e741d9a
 SHA512:
-  metadata.gz: a8104becf673ebdfc863b1bd0d88bd148b68320c1d60068957dc1080640a4543a5c972562dc0713842dee33a21d405a2de61105b84bc78077a28e9db84ac7c33
-  data.tar.gz: 82c701212363527a4ec1b74c1401080a86286faf11708e55dd610364e98696d5c17748c44226010ca19d999549c3cfe16829af2145c66f84c5febd284c4e07c1
+  metadata.gz: 9f893ff9dbb40db07c63c6929c11ccae374ac17e82621bf8f878325b7b2393da1f7ffc12e354ccac152579b8f888d2c66780179c015be4cb361bfa9e7837835b
+  data.tar.gz: d2ce03bded48b344d364a737b38bed3a4aa4129b431189fcb213092c5385652cb148513aaef7bb4070ee62b53d3edd42225405335d1357947ddec65a7a374c42

data/README.md

@@ -157,6 +157,34 @@ You can customize the list through the `DynamicScaffold::Config#list` property.
 class ShopController < ApplicationController
   include DynamicScaffold::Controller
   dynamic_scaffold Shop do |config|
+    # Add button and new action to disabled, You can still post to create action.
+    config.list.add_button = false
+    # or
+    config.list.add_button do 
+      # This block is called in view scope
+      false if params[:foo] == 1
+    end
+
+    # Edit button and edit action to disabled, You can still post to update action.
+    config.list.edit_buttons = false
+    # or
+    config.list.edit_buttons do |record|
+      # This block is called in view scope
+      # You can disable only specific record's button.
+      false if record.id != 1
+    end
+
+    # Destroy button to disabled, You can still post to destroy action.
+    config.list.destroy_buttons = false
+    # or
+    config.list.destroy_buttons do |record|
+      # This block is called in view scope
+      # You can disable only specific record's button.
+      false if record.id != 1
+    end
+
+
+
     # If you want filtering that can not be handled by `config.scope`, you can use the filter method.
     # Please note that returning nil will be ignored.
     config.list.filter do |query|
@@ -253,6 +281,9 @@ class ShopController < ApplicationController
     config.form.item(:collection_check_boxes, :state_ids, State.all, :id, :name)
     config.form.item(:collection_radio_buttons, :status, Shop.statuses.map{|k, _v| [k, k.titleize]}, :first, :last)
 
+    # If you want to use parameters to get list, Pass Proc or Lambda to argument. It will be called in view scope.
+    config.form.item(:collection_select, :status, -> { Shop.where(area_id: params[:area_id]) }, :first, :last)
+
     # If you want to display more free form field, use block.
     # The block is executed in the context of view, so you can call the method of view.
     config.form.item :block, :free do |form, field|

data/app/assets/javascripts/dynamic_scaffold.js

@@ -3,3 +3,4 @@
 //= require dynamic_scaffold/pagination
 //= require dynamic_scaffold/sorter
 //= require dynamic_scaffold/image
+//= require dynamic_scaffold/auto_width

data/app/assets/javascripts/dynamic_scaffold/auto_width.js

@@ -0,0 +1,32 @@
+var calcWidth = function(){
+  var firstRow = document.querySelector('.js-ds-list-row:first-child')
+
+  var wrapperWidth = firstRow.clientWidth
+
+  var autoWidthItemIndexes = Array.prototype.filter.call(firstRow.querySelectorAll('.js-ds-list-item'), function(item){
+    return item.classList.contains('ds-auto-width')
+  }).map(function(item){
+    return parseInt(item.getAttribute('data-index'), 10)
+  })
+
+  autoWidthItemIndexes.forEach(function(index){
+    var items = document.querySelectorAll('.js-ds-list-item[data-index="' + index + '"]')
+
+    Array.prototype.forEach.call(items, function(item){
+      item.style.width = 'auto' 
+    })
+    
+    var maxWidth = Array.prototype.reduce.call(items, function(currentMax, item){
+      return Math.max(currentMax, item.offsetWidth)
+    }, 0)
+
+    maxWidth = Math.min(maxWidth, wrapperWidth)
+
+    Array.prototype.forEach.call(items, function(item){
+      item.style.width = maxWidth + 'px' 
+    })
+  })
+}
+
+document.addEventListener('dynamic_scaffold:load', calcWidth)
+document.addEventListener('dynamic_scaffold:window_resized', calcWidth)

data/app/assets/javascripts/dynamic_scaffold/common.js

@@ -13,6 +13,7 @@ if (window.Element && !Element.prototype.closest) {
   };
 }
 
+// dynamic_scaffold:load
 (function(){
   var fireEvent = function(){
     var event = document.createEvent("HTMLEvents");
@@ -25,7 +26,25 @@ if (window.Element && !Element.prototype.closest) {
     // Not fire after the initial page load
     if (e.data.timing.visitEnd) fireEvent()
   })
-})()
+})();
+
+
+// dynamic_scaffold:window_resized
+(function(){
+  var fireEvent = function(){
+    var event = document.createEvent("HTMLEvents");
+    event.initEvent('dynamic_scaffold:window_resized', false, false)
+    document.dispatchEvent(event)
+  }
+
+  var timeout = 0
+  window.addEventListener('resize', function(e){
+    this.clearTimeout(timeout)
+    timeout = setTimeout(function(){
+      fireEvent()
+    }, 300)
+  })
+})();
 
 // promise polyfill
 // IE 11 has no Promise? Are you kidding?

data/app/views/dynamic_scaffold/bootstrap/_list.html.erb

@@ -5,16 +5,18 @@
 <%end%>
 <input type="hidden" class="authenticity_param_name" value="<%= request_forgery_protection_token %>">
 <%= form_with method: :patch, url: dynamic_scaffold_path(:sort, request_queries(dynamic_scaffold.list.page_param_name)), local: true do%>
-<div class="ds-row">
-  <%= link_to dynamic_scaffold_path(:new, request_queries), class: class_names('btn btn-outline-primary btn-primary btn-sm spec-ds-add', 'disabled': dynamic_scaffold.max_count?(@count)) do%>
-    <%= dynamic_scaffold_icon(:add) %> <%= t('dynamic_scaffold.button.add') %>
-    <%- unless dynamic_scaffold.max_count.nil? -%>
-      &nbsp;<span class="badge badge-light">
-        <%= @count %>&nbsp;/&nbsp;<%= dynamic_scaffold.max_count%>
-      </span>
-    <% end %>
-  <%end%>
-</div>
+<%- if dynamic_scaffold.list.add_button -%>
+  <div class="ds-row">
+    <%= link_to dynamic_scaffold_path(:new, request_queries), class: class_names('btn btn-outline-primary btn-primary btn-sm spec-ds-add', 'disabled': dynamic_scaffold.max_count?(@count)) do%>
+      <%= dynamic_scaffold_icon(:add) %> <%= t('dynamic_scaffold.button.add') %>
+      <%- unless dynamic_scaffold.max_count.nil? -%>
+        &nbsp;<span class="badge badge-light">
+          <%= @count %>&nbsp;/&nbsp;<%= dynamic_scaffold.max_count%>
+        </span>
+      <% end %>
+    <%end%>
+  </div>
+<%- end -%>
 <%= render 'dynamic_scaffold/bootstrap/pagination' %>
 <div class="ds-row">
   <%= render 'dynamic_scaffold/bootstrap/save_order'%>
@@ -36,9 +38,9 @@
             <div class="ds-list-heading"><%= dynamic_scaffold.list.title(record) %></div>
           <% end %>
           <div class="ds-list-items">
-          <%dynamic_scaffold.list.items.each do |disp|%>
+          <%dynamic_scaffold.list.items.each_with_index do |disp, index|%>
             <%- if disp.show?(self, record) -%>
-              <%= content_tag :div, class: class_names('ds-list-item', disp.classnames), **disp.html_attributes do%>
+              <%= content_tag :div, class: class_names('ds-list-item js-ds-list-item', disp.classnames), **{**disp.html_attributes, 'data-index': index} do%>
                 <div class="ds-list-label"><%= disp.label %></div>
                 <div class="ds-list-value"><%= disp.value self, record %></div>
               <%end%>
@@ -47,11 +49,13 @@
           </div>
           <div class="ds-list-footer clearfix">
             <div class="float-right pull-right">
-              <div class="btn-group">
-                <%= link_to dynamic_scaffold_path(:edit, request_queries.merge(id: record[record.class.primary_key])), class: 'btn btn-primary btn-outline-primary btn-sm spec-ds-edit' do %>
-                  <%= dynamic_scaffold_icon(:edit) %> <%= t('dynamic_scaffold.button.edit') %>
-                <%end%>
-              </div>
+              <%- if dynamic_scaffold.list.edit_buttons(record) -%>
+                <div class="btn-group">
+                  <%= link_to dynamic_scaffold_path(:edit, request_queries.merge(id: record[record.class.primary_key])), class: 'btn btn-primary btn-outline-primary btn-sm spec-ds-edit' do %>
+                    <%= dynamic_scaffold_icon(:edit) %> <%= t('dynamic_scaffold.button.edit') %>
+                  <%end%>
+                </div>
+              <%- end -%>
               <% if dynamic_scaffold.list.sorter %>
               <%[*dynamic_scaffold.model.primary_key].each do |pkey|%>
                 <input type="hidden" name="pkeys[][<%=pkey%>]" value="<%= record[pkey] %>">
@@ -71,15 +75,17 @@
                 </button>
               </div>
               <% end %>
-              <div class="btn-group">
-                <button
-                  data-action="<%= dynamic_scaffold_path(:update, request_queries(dynamic_scaffold.list.page_param_name).merge(id: record[record.class.primary_key])) %>"
-                  data-confirm-message="<%= t('dynamic_scaffold.message.destroy_confirm') %>"
-                  class="btn btn-danger btn-sm js-ds-destory"
-                >
-                  <%= dynamic_scaffold_icon(:delete) %>
-                </button>
-              </div>
+              <%- if dynamic_scaffold.list.destroy_buttons(record) -%>
+                <div class="btn-group">
+                  <button
+                    data-action="<%= dynamic_scaffold_path(:update, request_queries(dynamic_scaffold.list.page_param_name).merge(id: record[record.class.primary_key])) %>"
+                    data-confirm-message="<%= t('dynamic_scaffold.message.destroy_confirm') %>"
+                    class="btn btn-danger btn-sm js-ds-destory spec-ds-destroy"
+                  >
+                    <%= dynamic_scaffold_icon(:delete) %>
+                  </button>
+                </div>
+              <%- end -%>
             </div>
           </div>
         </li>

data/app/views/dynamic_scaffold/bootstrap/form/_row.html.erb

@@ -1,4 +1,4 @@
-<% if elem.needs_rendering?(self)%>
+<% if elem.needs_rendering?(self, form.object)%>
   <% if !elem.label? && elem.type?(:hidden_field) %>
     <%= elem.render(self, form) %>
   <% else %>

data/lib/dynamic_scaffold/controller.rb

@@ -44,6 +44,8 @@ module DynamicScaffold
     end
 
     def new # rubocop:disable Metrics/AbcSize
+      raise ActionController::RoutingError, '`Add Button` is disabled.' unless dynamic_scaffold.list.add_button
+
       unless dynamic_scaffold.max_count.nil?
         count = dynamic_scaffold.list.build_sql(scope_params).count
         raise Error::InvalidOperation, 'You can not add any more.' if dynamic_scaffold.max_count?(count)
@@ -60,6 +62,8 @@ module DynamicScaffold
 
     def edit
       @record = find_record(edit_params)
+
+      raise ActionController::RoutingError, '`Edit Button` is disabled.' unless dynamic_scaffold.list.edit_buttons(@record)
     end
 
     def create

data/lib/dynamic_scaffold/form/item/base.rb

@@ -124,10 +124,10 @@ module DynamicScaffold
           self
         end
 
-        def needs_rendering?(view)
+        def needs_rendering?(view, record)
           return true unless @if_block || @unless_block
-          return view.instance_exec(view.controller.params, &@if_block) if @if_block
-          return !view.instance_exec(view.controller.params, &@unless_block) if @unless_block
+          return view.instance_exec(view.controller.params, record, &@if_block) if @if_block
+          return !view.instance_exec(view.controller.params, record, &@unless_block) if @unless_block
         end
 
         def proxy(attribute_name)
@@ -184,6 +184,14 @@ module DynamicScaffold
             options[:class] = classnames_list.join(' ') unless classnames_list.empty?
             options
           end
+
+          def build_args(view, args)
+            args.map do |arg|
+              next arg unless arg.is_a? Proc
+
+              view.instance_exec(&arg)
+            end
+          end
       end
     end
   end

data/lib/dynamic_scaffold/form/item/single_option.rb

@@ -9,11 +9,11 @@ module DynamicScaffold
           super(config, type, name, html_attributes)
         end
 
-        def render(_view, form, classnames = nil)
+        def render(view, form, classnames = nil)
           html_attributes = build_html_attributes(classnames)
           # Retain the value of the password field on error.
           html_attributes[:value] = form.object.public_send(@name) if @type == :password_field
-          form.public_send(@type, @name, *@args, html_attributes)
+          form.public_send(@type, @name, *build_args(view, @args), html_attributes)
         end
       end
     end

data/lib/dynamic_scaffold/form/item/two_options.rb

@@ -18,9 +18,9 @@ module DynamicScaffold
           super(config, type, name, html_attributes)
         end
 
-        def render(_view, form, classnames = nil)
+        def render(view, form, classnames = nil)
           html_attributes = build_html_attributes(classnames)
-          form.public_send(@type, @name, *@args, @options, html_attributes)
+          form.public_send(@type, @name, *build_args(view, @args), @options, html_attributes)
         end
       end
     end

data/lib/dynamic_scaffold/form/item/two_options_with_block.rb

@@ -2,11 +2,11 @@ module DynamicScaffold
   module Form
     module Item
       class TwoOptionsWithBlock < TwoOptions
-        def render(_view, form, classnames = nil)
+        def render(view, form, classnames = nil)
           form.public_send(
             @type,
             @name,
-            *@args,
+            *build_args(view, @args),
             @options,
             build_html_attributes(classnames)
           ) do |builder|

data/lib/dynamic_scaffold/list_builder.rb

@@ -1,5 +1,7 @@
 module DynamicScaffold
   class ListBuilder
+    attr_writer :add_button, :edit_buttons, :destroy_buttons
+
     def initialize(config)
       @config = config
       @items = []
@@ -8,6 +10,9 @@ module DynamicScaffold
       @title = nil
       @filter = nil
       @row_class_block = nil
+      @add_button = true
+      @edit_buttons = true
+      @destroy_buttons = true
     end
 
     def pagination(options = nil)
@@ -97,5 +102,35 @@ module DynamicScaffold
         @config.controller.view_context.instance_exec(record, &@row_class_block)
       end
     end
+
+    def add_button(&block)
+      if block_given?
+        @add_button_block = block
+      elsif @add_button_block
+        @config.controller.view_context.instance_exec(&@add_button_block)
+      else
+        @add_button
+      end
+    end
+
+    def edit_buttons(record = nil, &block)
+      if block_given?
+        @edit_buttons_block = block
+      elsif record.present? && @edit_buttons_block
+        @config.controller.view_context.instance_exec(record, &@edit_buttons_block)
+      else
+        @edit_buttons
+      end
+    end
+
+    def destroy_buttons(record = nil, &block)
+      if block_given?
+        @destroy_buttons_block = block
+      elsif record.present? && @destroy_buttons_block
+        @config.controller.view_context.instance_exec(record, &@destroy_buttons_block)
+      else
+        @destroy_buttons
+      end
+    end
   end
 end

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '1.8.1'.freeze
+  VERSION = '1.12.0'.freeze
 end

data/lib/generators/dynamic_scaffold/templates/controller.erb

@@ -62,7 +62,7 @@ class <%= @class_scope.present? ? "#{@class_scope}::" : '' %><%= @plural_model_n
     # Please see https://github.com/gomo/dynamic_scaffold#customize-list for details.
 
   <%- @model.column_names.each do |column| -%>
-    config.list.item(:<%= column %>, style: 'width: 120px;')
+    config.list.item(:<%= column %>, class: 'ds-auto-width')
   <%- end -%>
 
     # You can customize the form fields through `config.form`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view
@@ -252,6 +252,7 @@ files:
 - app/assets/images/dynamic_scaffold/fontawesome/step-forward.svg
 - app/assets/images/dynamic_scaffold/fontawesome/times.svg
 - app/assets/javascripts/dynamic_scaffold.js
+- app/assets/javascripts/dynamic_scaffold/auto_width.js
 - app/assets/javascripts/dynamic_scaffold/common.js
 - app/assets/javascripts/dynamic_scaffold/delete.js
 - app/assets/javascripts/dynamic_scaffold/image.js