super 0.18.0 → 0.19.0.rc1

data/app/controllers/super/application_controller.rb

@@ -5,10 +5,20 @@ module Super
   class ApplicationController < SubstructureController
     include ClientError::Handling
 
-    helper_method :current_action
+    before_action do
+      if Super::PackagedAsset.warning_message
+        flash.now[:mismatching_package_json_gemfile_versions] = Super::PackagedAsset.warning_message
+      end
+    end
 
     # Displays a list of records to the user
     def index
+      if request.format.ref == :csv && !csv_enabled?
+        params_for_rebuilding_url = params.to_unsafe_hash
+        params_for_rebuilding_url.delete("format")
+        return redirect_to params_for_rebuilding_url
+      end
+
       @records = load_records
       @display = display_schema.apply(action: current_action, format: request.format)
       @view = index_view
@@ -86,7 +96,7 @@ module Super
 
     private
 
-    def current_action
+    helper_method def current_action
       @current_action ||=
         ActionInquirer.new(
           ActionInquirer.default_for_resources,
@@ -104,5 +114,25 @@ module Super
     ensure
       @current_action = original
     end
+
+    helper_method def resolved_member_actions(record)
+      member_actions(record).map do |action|
+        if action.respond_to?(:resolve)
+          action.resolve(record: record, params: params)
+        else
+          action
+        end
+      end
+    end
+
+    helper_method def resolved_collection_actions
+      collection_actions.map do |action|
+        if action.respond_to?(:resolve)
+          action.resolve(params: params)
+        else
+          action
+        end
+      end
+    end
   end
 end

data/app/controllers/super/substructure_controller.rb

@@ -4,6 +4,24 @@ module Super
   # Various methods that determine the behavior of your controllers. These
   # methods can and should be overridden.
   class SubstructureController < ActionController::Base
+    def self.batch(action_name)
+      mod = Module.new do
+        define_method(action_name) do
+          if !params[:batch]
+            flash.alert = I18n.t("super.batch.none_error")
+            return render :nothing, status: :bad_request
+          end
+
+          super()
+        end
+      end
+
+      const_set("Batch__#{action_name}__#{SecureRandom.hex(4)}", mod)
+      prepend(mod)
+
+      action_name
+    end
+
     private
 
     helper_method def model
@@ -80,7 +98,15 @@ module Super
     #
     # @return [Array<Link>]
     helper_method def collection_actions
-      Super::Link.find_all(:new)
+      if current_action.index?
+        [
+          Super::Partial.new("csv_button"),
+          Super::Partial.new("batch_button"),
+          Super::Link.find(:new)
+        ]
+      else
+        Super::Link.find_all(:new)
+      end
     end
 
     # Configures the actions linked to on the show page as well as each row of
@@ -140,6 +166,15 @@ module Super
       Super.configuration.index_records_per_page
     end
 
+    helper_method def batch_actions_enabled?
+      true
+    end
+
+    helper_method def batch_actions
+      [
+      ]
+    end
+
     def load_records
       base_scope
     end
@@ -198,7 +233,7 @@ module Super
       end
     end
 
-    def pagination_disabled_param
+    helper_method def pagination_disabled_param
       :_all_pages
     end
 
@@ -229,50 +264,51 @@ module Super
         .offset(@pagination.offset)
     end
 
+    helper_method def csv_enabled?
+      true
+    end
+
     def index_view
       Super::Layout.new(
-        mains: [
-          Super::Panel.new(
-            Super::Partial.new("collection_header"),
-            :@display
-          ),
-        ],
-        asides: [
-          :@query_form,
-        ]
+        main: Super::ViewChain.new(
+          main_panel: Super::Panel.new,
+          batch_form: Super::Partial.new("batch_form"),
+          main_header: Super::Partial.new("collection_header"),
+          main: :@display
+        ),
+        aside: Super::ViewChain.new(
+          main: :@query_form
+        )
       )
     end
 
     def show_view
       Super::Layout.new(
-        mains: [
-          Super::Panel.new(
-            Super::Partial.new("member_header"),
-            :@display
-          ),
-        ]
+        main: Super::ViewChain.new(
+          main_panel: Super::Panel.new,
+          main_header: Super::Partial.new("collection_header"),
+          main: :@display
+        )
       )
     end
 
     def new_view
       Super::Layout.new(
-        mains: [
-          Super::Panel.new(
-            Super::Partial.new("collection_header"),
-            :@form
-          ),
-        ]
+        main: Super::ViewChain.new(
+          main_panel: Super::Panel.new,
+          main_header: Super::Partial.new("collection_header"),
+          main: :@form
+        )
       )
     end
 
     def edit_view
       Super::Layout.new(
-        mains: [
-          Super::Panel.new(
-            Super::Partial.new("member_header"),
-            :@form
-          ),
-        ]
+        main: Super::ViewChain.new(
+          main_panel: Super::Panel.new,
+          main_header: Super::Partial.new("member_header"),
+          main: :@form
+        )
       )
     end
 

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

@@ -0,0 +1,12 @@
+<% default_options = {} unless defined?(default_options) %>
+<% if batch_actions_enabled? && batch_actions.any? %>
+  <details class="details-reset details-backdrop-transparent inline-block">
+    <summary class="cursor-pointer <%= default_options[:class] %>" id="batch-actions">Batch actions</summary>
+
+    <ul class="absolute bg-white shadow-md px-4 py-3 z-20">
+      <% batch_actions.each do |batch_action| %>
+        <li><button data-controller="batch" data-batch-method-value="<%= batch_action.options&.dig(:method) || "get" %>" data-batch-action-value="<%= batch_action.href %>" data-action="batch#submit" class="<%= default_options[:class] %>"><%= batch_action.text %></button></li>
+      <% end %>
+    </ul>
+  </details>
+<% end %>

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

@@ -0,0 +1 @@
+<%= value -%>

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

@@ -0,0 +1,5 @@
+<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>

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

@@ -0,0 +1,3 @@
+<form>
+  <%= yield %>
+</form>

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

@@ -2,14 +2,15 @@
   <h1 class="text-xl">
     <%= title %>
   </h1>
-  <div>
-    <% collection_actions.each do |link| %>
-      <%= link.to_s(
+  <div class="flex gap-2">
+    <% resolved_collection_actions.each do |link| %>
+      <%= render(
+        link,
         default_options: {
-          class: "super-button super-button--border-blue super-button-sm inline-block ml-2"
-        },
-        params: params
+          class: "super-button super-button--border-blue super-button-sm inline-block"
+        }
       ) %>
     <% end %>
   </div>
 </header>
+<%= yield if block_given? %>

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

@@ -0,0 +1,25 @@
+<% default_options = {} unless defined?(default_options) %>
+<% if csv_enabled? %>
+  <details class="details-reset details-backdrop-dark inline-block">
+    <summary class="cursor-pointer <%= default_options[:class] %>"><%= t("super.csv.initial_cta") %></summary>
+    <details-dialog class="bg-white shadow-md px-4 py-4 rounded-lg">
+      <header class="flex items-center">
+        <h1 class="font-semibold border-b-1 flex-1"><%= t("super.csv.modal_header") %></h1>
+        <button type="button" data-close-dialog class="flex-initial h-4 w-4"><%= render("super/feather/x") %></button>
+      </header>
+      <div class="mt-3">
+        <% linkable_params = params.to_unsafe_hash %>
+        <%= link_to(
+          t("super.csv.download_current_cta"),
+          linkable_params.merge(format: :csv),
+          class: "super-button"
+        ) %>
+        <%= link_to(
+          t("super.csv.download_all_cta"),
+          linkable_params.merge(format: :csv, pagination_disabled_param => 1),
+          class: "super-button"
+        ) %>
+      </div>
+    </details-dialog>
+  </details>
+<% end %>

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

@@ -1,5 +1,5 @@
 <div>
-  <% member_actions(record).each do |link| %>
-    <span class="pr-2 last:pr-0"><%= link.to_s(record: record, params: params) %></span>
+  <% resolved_member_actions(record).each do |link| %>
+    <span class="pr-2 last:pr-0"><%= render link %></span>
   <% end %>
 </div>

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

@@ -1,29 +1,28 @@
-<% layout.resolve(self) %>
+<%# <% layout.resolve(self) %1> %>
 
-<% layout.resolved_headers.each do |partial| %>
-  <%= Super::Partial.render(partial, template: self) %>
+<% if layout.header %>
+  <%= render layout.header %>
 <% end %>
 
-<% if layout.resolved_asides.empty? %>
-  <% layout.resolved_mains.each do |partial| %>
-    <%= Super::Partial.render(partial, template: self) %>
-  <% end %>
-<% else %>
+<% if layout.aside %>
   <div class="flow-root -mx-2">
     <div class="md:float-left md:w-9/12 px-2">
-      <% layout.resolved_mains.each do |partial| %>
-        <%= Super::Partial.render(partial, template: self) %>
+      <% if layout.main %>
+        <%= render layout.main %>
       <% end %>
     </div>
 
     <div class="md:float-right md:w-3/12 px-2">
-      <% layout.resolved_asides.each do |partial| %>
-        <%= Super::Partial.render(partial, template: self) %>
-      <% end %>
+      <%= render layout.aside %>
     </div>
   </div>
+<% else %>
+  <% if layout.main %>
+    <%= render layout.main %>
+  <% end %>
 <% end %>
 
-<% layout.resolved_footers.each do |partial| %>
+<% if layout.footer %>
+  <%= render layout.footer %>
   <%= Super::Partial.render(partial, template: self) %>
 <% end %>

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

@@ -0,0 +1,8 @@
+<%=
+  default_options ||= {}
+  link_to(
+    link.text,
+    link.href,
+    default_options.deep_merge(link.options)
+  )
+%>

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

@@ -2,15 +2,15 @@
   <h1 class="text-xl">
     <%= title %>
   </h1>
-  <div>
-    <% member_actions(@record).each do |link| %>
-      <%= link.to_s(
+  <div class="flex gap-2">
+    <% resolved_member_actions(@record).each do |link| %>
+      <%= render(
+        link,
         default_options: {
-          class: "super-button super-button--border-blue super-button-sm inline-block ml-2"
-        },
-        record: @record,
-        params: params
+          class: "super-button super-button--border-blue super-button-sm inline-block"
+        }
       ) %>
     <% end %>
   </div>
 </header>
+<%= yield if block_given? %>

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

@@ -1,3 +1,4 @@
+<%= yield %>
 <% if @pagination.necessary? %>
   <div class="flex justify-end mr-2">
     <div class="mt-4">

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

@@ -2,13 +2,13 @@
   <h1 class="text-lg font-bold mr-6 mb-1"><%= site_title %></h1>
   <% site_navigation.definition.each do |link_or_menu| %>
     <% if link_or_menu.is_a?(Super::Link) %>
-      <%= link_or_menu.to_s(default_options: { class: "inline-block mr-6" }) %>
+      <%= render(link_or_menu, default_options: { class: "inline-block mr-6" }) %>
     <% else %>
-      <details class="details-reset select-none inline-block mr-6" data-controller="click-outside-to-close" data-action="click@window->click-outside-to-close#close">
+      <details class="details-reset details-backdrop-transparent select-none inline-block mr-6">
         <summary class="text-blue-700"><%= link_or_menu.title %></summary>
-        <ul class="absolute bg-white shadow-md px-4 py-3">
+        <ul class="absolute bg-white shadow-md px-4 py-3 z-20">
           <% link_or_menu.links.each do |link| %>
-            <li><%= link.to_s(default_options: { class: "" }) %></li>
+            <li><%= render(link, default_options: { class: "" }) %></li>
           <% end %>
         </ul>
       </details>

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

@@ -0,0 +1,5 @@
+<% current = view_chain.chain.shift %>
+<% current = instance_variable_get(current) if current.kind_of?(Symbol) %>
+<%= render(current) do %>
+  <%= render(view_chain) %>
+<% end %>

data/config/locales/en.yml

@@ -1,5 +1,13 @@
 ---
 en:
   super:
+    batch:
+      none_error: This batch action received no items to act upon
+    csv:
+      initial_cta: Export CSV
+      modal_header: Export CSV
+      download_current_cta: Download current view
+      download_all_cta: Download all matching query
     layout:
       powered_by: "%{env} environment. Powered by Super %{version}."
+    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."