super 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0389f2e0c768f0d9518a4bee3a7a1ec28431186ab2f2c1eae04c67cb7a0d1c
-  data.tar.gz: df8188eb7e770f833f000e2e53968cd161f72f5fd3f533aa917074ad926b53dc
+  metadata.gz: e47e4344e0e7e7cf55cc943672017a92e7e30d566aa84b28b2351b4f190b22ed
+  data.tar.gz: 62b74ffa083bbabe27890359f987e78363e6fc86a8b164d8529155f9eeaff655
 SHA512:
-  metadata.gz: e60c90edd1c31515070ef038a5fe019aacc19553943b70e64c40231298440a8e162b5aa883f59f3b842536ca942cc4e0b09a466f622afc7d683bf33af2e6c17c
-  data.tar.gz: a2ff8276d1b086c8e49fc59d86586af3c834df81e8a206d94b5d1902bf68602f9a9f74cd0a2780af2119ad3b024da369dbfb1ff675406de4d6e5bca76ff4fb0d
+  metadata.gz: ec637b18bb09e636e988507036d41dde995a8f33aeacd69a5b94924eadfcbae4acba73a58c32a0d4188f4f3a8ae852c5b9a9566af647bf4e0583484369d4566c
+  data.tar.gz: 7a9e37ed3dc2232e902e2d8b770c02e737413eec66cc4df80c1cefdb974e38d523568a1f66962a2943b667c6cb28439c0fb501c98b102747ad511d9d5204cc3c

data/README.md

@@ -1,6 +1,6 @@
 # Super
 
-![Unit tests status](https://github.com/zachahn/super/workflows/Unit%20tests/badge.svg?branch=master)
+![Unit tests status](https://github.com/superadministration/super/workflows/Unit%20tests/badge.svg?branch=master)
 [![Gem](https://img.shields.io/gem/v/super)][gem]
 [![Try the demo](https://img.shields.io/badge/demo-try-blue)][demo]
 [![Read the docs](https://img.shields.io/badge/docs-available-brightgreen)][docs]
@@ -88,7 +88,7 @@ The gem is available under the terms of the [GNU LGPLv3](./LICENSE).
 
 
 [gem]: https://rubygems.org/gems/super
-[discussions]: https://github.com/zachahn/super/discussions
+[discussions]: https://github.com/superadministration/super/discussions
 [docs]: https://superadministration.github.io/
-[demo]: https://demo-super.herokuapp.com/admin/members
-[demo_source]: https://github.com/zachahn/super_demo
+[demo]: https://demo-super.herokuapp.com/admin
+[demo_source]: https://github.com/superadministration/super_demo

data/app/controllers/super/application_controller.rb

@@ -118,7 +118,7 @@ module Super
     helper_method def resolved_member_actions(record)
       member_actions(record).map do |action|
         if action.respond_to?(:resolve)
-          action.resolve(record: record, params: params)
+          resolve_member_action(action, record)
         else
           action
         end
@@ -128,7 +128,7 @@ module Super
     helper_method def resolved_collection_actions
       collection_actions.map do |action|
         if action.respond_to?(:resolve)
-          action.resolve(params: params)
+          resolve_collection_action(action)
         else
           action
         end

data/app/controllers/super/substructure_controller.rb

@@ -93,6 +93,14 @@ module Super
       params.require(strong_params.require(model)).permit(strong_params.permit)
     end
 
+    helper_method def form_record(record)
+      record
+    end
+
+    helper_method def form_action(record)
+      Super::Link.polymorphic_parts(record)
+    end
+
     # Configures the actions linked to on the index page. This is an optional
     # method
     #
@@ -127,6 +135,14 @@ module Super
       end
     end
 
+    helper_method def resolve_collection_action(action)
+      action.resolve(params: params)
+    end
+
+    helper_method def resolve_member_action(action, record)
+      action.resolve(params: params, record: record)
+    end
+
     helper_method def filters_enabled?
       true
     end
@@ -264,6 +280,13 @@ module Super
         .offset(@pagination.offset)
     end
 
+    helper_method def paginated_link(page_query_params)
+      polymorphic_path(
+        Super::Link.polymorphic_parts(model),
+        page_query_params
+      )
+    end
+
     helper_method def csv_enabled?
       true
     end
@@ -286,7 +309,7 @@ module Super
       Super::Layout.new(
         main: Super::ViewChain.new(
           main_panel: Super::Panel.new,
-          main_header: Super::Partial.new("collection_header"),
+          main_header: Super::Partial.new("member_header"),
           main: :@display
         )
       )

data/app/helpers/super/form_builder_helper.rb

@@ -10,9 +10,9 @@ module Super
     # Super's version of `#form_for`
     def super_form_for(record, options = {}, &block)
       original = ActionView::Base.field_error_proc
-      ActionView::Base.field_error_proc = Form::Builder::FIELD_ERROR_PROC
+      ActionView::Base.field_error_proc = FormBuilder::FIELD_ERROR_PROC
 
-      options[:builder] ||= Form::Builder
+      options[:builder] ||= FormBuilder
       return form_for(record, options, &block)
     ensure
       ActionView::Base.field_error_proc = original
@@ -21,9 +21,9 @@ module Super
     # Super's version of `#form_with`
     def super_form_with(**options, &block)
       original = ActionView::Base.field_error_proc
-      ActionView::Base.field_error_proc = Form::Builder::FIELD_ERROR_PROC
+      ActionView::Base.field_error_proc = FormBuilder::FIELD_ERROR_PROC
 
-      options[:builder] ||= Form::Builder
+      options[:builder] ||= FormBuilder
       return form_with(**options, &block)
     ensure
       ActionView::Base.field_error_proc = original

data/app/views/super/application/_batch_checkbox.html.erb

@@ -1,5 +1,9 @@
+<% if current_action.collection? %>
 <div class="whitespace-nowrap gap-1">
 <% html_id = "batch-checkbox-#{value.to_s.gsub(/[^a-z0-9]+/, "-")}" %>
 <input type="checkbox" name="batch[]" value="<%= value %>" id="<%= html_id %>">
 <label for="<%= html_id %>"><%= value %></label>
 </div>
+<% else %>
+<%= value %>
+<% end %>

data/app/views/super/application/_form.html.erb

@@ -1,4 +1,4 @@
-<%= super_form_for(Super::Link.polymorphic_parts(@record), builder: Super::Form::Builder) do |f| %>
+<%= super_form_for(form_record(@record), url: form_action(@record)) do |f| %>
   <div class="max-w-3xl">
     <% form.each_attribute do |field, type| %>
       <%= render(

data/app/views/super/application/_pagination.html.erb

@@ -5,10 +5,7 @@
       <% @pagination.each do |page_query_params, is_current_page, display| %>
         <%= link_to(
           display,
-          polymorphic_path(
-            Super::Link.polymorphic_parts(model),
-            page_query_params
-          ),
+          paginated_link(page_query_params),
           class: "inline-block ml-2 text-lg #{is_current_page ? " text-gray-900" : ""}"
         ) %>
       <% end %>

data/app/views/super/application/_site_footer.html.erb

@@ -1,3 +1,3 @@
 <div class="pt-8 text-sm text-gray-800">
-  <%= t("super.layout.powered_by", env: Rails.env.capitalize, version: Super::VERSION) %>
+  <%= t("super.layout.powered_by_html", env: Rails.env.capitalize, version: Super::VERSION) %>
 </div>

data/config/locales/en.yml

@@ -1,6 +1,12 @@
 ---
 en:
   super:
+    actions:
+      new: New
+      index: Index
+      show: View
+      edit: Edit
+      destroy: Delete
     batch:
       none_error: This batch action received no items to act upon
     csv:
@@ -9,5 +15,5 @@ en:
       download_current_cta: Download current view
       download_all_cta: Download all matching query
     layout:
-      powered_by: "%{env} environment. Powered by Super %{version}."
+      powered_by_html: "%{env} environment. Powered by Super %{version}. <a href='https://superadministration.github.io/v%{version}/'>Developer docs.</a>"
     mismatching_package_json_gemfile_versions: "The version of Super specified in your package.json file does not match the version specified in your Gemfile.lock."