standard_view 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b3fad18e54a169d20a3455742961fd1f2a5271baa992a9a07d6b778e918823
-  data.tar.gz: 3684724e01df8912cbaf462705c477bb20c60fc7f2e6275bee4d5a40c48574d6
+  metadata.gz: 51c904e4d438e76f030d241f215de0063171eeabdfc915457fc3bba4356f6ca9
+  data.tar.gz: 61e5e74edd4d058d7888c3446f1070d28de5c85b8b89a6ad04a335f0dcb426e5
 SHA512:
-  metadata.gz: 387a758ad516068f3c0f5601bc1a113d7c222cf5507c4792cde5d1cfc699114a6e2baea19843588f1ce33ad8e5b91229c6b557584f956b024c14ebaf60af41a5
-  data.tar.gz: 36d00e8cab5f2ebf65066aa0e29bc55e2ce1b131c8b896551209a3d79cf0d4456e3b90858c8c2225f3963db8b075f0a8894fd6f44815eb9de1ca43c9e9372c41
+  metadata.gz: c655aa24f0863119509f25b5a050e6bd8a7bbbf0074b846282044dca9f8be9c175aeba8e12bfc52bb5128874697c7b5896fcfc36dea6f27582136337031e1a87
+  data.tar.gz: b0b056f51997e082eebe4901b0f0ddc324b1273debb04fa7d89b5385d87bf92b1307f2c6ce157d947cf02f4b929b859c49aa7d2cc05548d13cd5a15555b54b12

data/app/helpers/standard_view/application_helper.rb

@@ -38,7 +38,7 @@ module StandardView
     end
 
     def current_page
-      params[:page]
+      params[:page].try(:to_i)
     end
 
     def icon_tag(name = nil, style = nil, spin: false)

data/app/views/application/_filter.html.erb

@@ -0,0 +1,20 @@
+<% has_default = facet.default_filter? %>
+<% without_filter = params[:filter].blank? %>
+<% is_all = has_default ? params[:all].present? : without_filter %>
+<ul class="nav nav-pills justify-content-end">
+  <li class="nav-item">
+    <span class="nav-link"><%= icon_for(:filter) %></span>
+  </li>
+  <li class="nav-item">
+    <% all_params = {}.tap { |h| h[:all] = true if has_default } %>
+    <%= link_to t("common.all"), params.permit(:page).merge(all_params), class: "nav-link #{"active" if is_all}" %>
+  </li>
+  <% list.filter_values.each do |value, label| %>
+    <% is_default = value == facet.default_filter.to_s %>
+    <% is_active = is_default ? (without_filter && !is_all) : params[:filter] == value %>
+    <% filter_params = {}.tap { |h| h[:filter] = value unless is_default } %>
+    <li class="nav-item">
+      <%= link_to label, params.permit(:page).merge(filter_params), class: "nav-link #{"active" if is_active}" %>
+    </li>
+  <% end %>
+</ul>

data/app/views/standard_view/_index.html.erb

@@ -9,7 +9,8 @@
 <% if local_assigns[:facet].nil? %>
   <% facet_name = is_nested ? action_name : controller_name %>
   <% facet_class = local_assigns[:facet_class].presence || "#{facet_name.singularize.camelize}Facet".constantize %>
-  <% facet = facet_class.new(current_page: current_page, source: facet_source) %>
+  <% filter_arguments = { filter_by: params[:filter], all: params[:all].present? } %>
+  <% facet = facet_class.new(current_page: current_page, source: facet_source, **filter_arguments) %>
 <% end %>
 
 <% if local_assigns[:list].nil? %>
@@ -52,26 +53,15 @@
 
     <% unless content_for?(:page_content) %>
       <% content_for(:page_content) do %>
-        <%# if content_for?(:subnav_content) || uses_filter %>
-          <%#= content_for(:subnav_content) if content_for?(:subnav_content) %>
+        <% if content_for?(:subnav_content) || list.filter_field? %>
+          <%= content_for(:subnav_content) if content_for?(:subnav_content) %>
+          <%= render "filter", list: list, facet: facet if list.filter_field? %>
 
-          <%# if uses_filter %>
-            <%#= render "filter", field: filter_by, default: local_assigns[:filter_default], model: collection.model %>
-          <%# end %>
-<!--          <hr>-->
-        <%# end %>
+          <hr>
+        <% end %>
 
         <div class="row">
           <div class="col-12">
-            <%# filtered_collection = collection %>
-            <%# if uses_filter %>
-              <%# if params[:filter].present? %>
-                <%# filtered_collection = filtered_collection.public_send(params[:filter].to_sym) %>
-              <%# elsif has_filter_default && !params[:all].present? %>
-                <%# filtered_collection = filtered_collection.public_send(filter_default) %>
-              <%# end %>
-            <%# end %>
-
             <%= render "standard_view/paginated_collection", list: list, is_filtered: facet.filtered? %>
           </div>
         </div>

data/app/views/standard_view/_model_form.html.erb

@@ -1,5 +1,5 @@
 <% material_law = law(material) %>
-<%= simple_form_for [ material.parent, material ], wrapper: :horizontal_form do |form| %>
+<%= simple_form_for (actionable_name == "new" ? [ material.parent, material ] : material), wrapper: :horizontal_form do |form| %>
   <div class="card">
     <div class="card-header">
       <h4 class="mb-0"><%= t(".#{actionable_name}.title", title: material.title) %></h4>

data/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   common:
+    all: All
     new: New
     edit: Edit
     overview: Overview
@@ -27,3 +28,4 @@ en:
         title: Edit %{title}
   icons:
     masthead_nav_menu: user
+    filter: filter

data/lib/standard_view/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StandardView
-  VERSION = "0.1.12"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard_view
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Eric Garside
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,21 +17,21 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.3.7
 - !ruby/object:Gem::Dependency
   name: material
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -41,7 +41,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.7
+        version: 0.26.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.7
+        version: 0.26.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -71,7 +71,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -81,7 +81,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -195,21 +195,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rspice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.3.1
+        version: 0.26.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -219,7 +219,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.3.1
+        version: 0.26.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -229,7 +229,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.3.1
+        version: 0.26.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -239,7 +239,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.3.1
+        version: 0.26.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -276,6 +276,7 @@ files:
 - app/helpers/standard_view/navigation_helper.rb
 - app/views/application/_attribute_card_value.html.erb
 - app/views/application/_attributes_card.html.erb
+- app/views/application/_filter.html.erb
 - app/views/application/_flash_messages.html.erb
 - app/views/application/_icon.html.erb
 - app/views/application/_javascripts.html.erb
@@ -338,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A highly functional and largely automated presentation layer.