standard_view 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b47dc891219d4f611bacd257c6524cefa49cd5000fd567602b7e1875bdd212
-  data.tar.gz: 0bc34d4c60ac97fb29d70790379cf7e93f89ca32a5e477c872e217f23e603d72
+  metadata.gz: 62f8b997437730cd005a5e84de2037af5d588cf589f6ef412fedfd1ac3eb4714
+  data.tar.gz: 730047005e6d791328033a9dc2e938e97cc9c071c407d72465d43201cd5689fd
 SHA512:
-  metadata.gz: 63c859ba9522261002df6aba53ac7af4572390d7494984cad8805a604079741d2563a94772cbf60006f61f02c135e90c8a12c56013a69872541b0660bd8b42ee
-  data.tar.gz: 39afb75ab28fefc64022ee6e9d05c930588dbe239aab507bf592e0e34a795570582e87b39537c38df25efd1fa4f0a3f8e5cc283c602f614e0580b6ed048bdb14
+  metadata.gz: 97e68d3e09d2aef86136217f922758a993b9d98743bf3b9901824a9b620331bd386b226ddbef020688ddb99b8cb977a7939808e351ab0e8ac86b3d8eebdff5b0
+  data.tar.gz: 8052a5f7456591ffe524025c086786c7405502da3d800082542eaaad8511887ec806676c08801c11d225145a6744b9741047219f5fe494cd8cfd859bbfac0fe2

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/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.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard_view
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Eric Garside
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,7 +31,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -41,7 +41,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.9
     - - "<"
       - !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