super 0.0.10 → 0.0.15

data/app/controllers/super/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # Provides a default implementation for each of the resourceful actions
   class ApplicationController < ActionController::Base
@@ -5,26 +7,31 @@ module Super
 
     helper_method :action_inquirer
     helper_method :controls
+    helper_method :navigation
 
     # Displays a list of records to the user
     def index
       @records = controls.load_records(action: action_inquirer, params: params)
-      @display = controls.display_schema(action: action_inquirer)
-      @view = controls.build_index_view
+      @display = controls.display_schema(action: action_inquirer).apply(action: action_inquirer)
+      @view = controls.index_view
+      @query_form = controls.initialize_query_form(params: params, current_path: request.path)
+      controls.initialize_filter_form(query_form: @query_form)
+      controls.initialize_sort_form(query_form: @query_form)
+      @records = controls.apply_queries(query_form: @query_form, records: @records)
     end
 
     # Displays a specific record to the user
     def show
       @record = controls.load_record(action: action_inquirer, params: params)
-      @display = controls.display_schema(action: action_inquirer)
-      @view = controls.build_show_view
+      @display = controls.display_schema(action: action_inquirer).apply(action: action_inquirer)
+      @view = controls.show_view
     end
 
     # Displays a form to allow the user to create a new record
     def new
       @record = controls.build_record(action: action_inquirer)
       @form = controls.form_schema(action: action_inquirer)
-      @view = controls.build_new_view
+      @view = controls.new_view
     end
 
     # Creates a record, or shows the validation errors
@@ -32,10 +39,11 @@ module Super
       @record = controls.build_record_with_params(action: action_inquirer, params: params)
 
       if controls.save_record(action: action_inquirer, record: @record, params: params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
-        @form = controls.form_schema(action: action_inquirer_for("new"))
-        @view = controls.build_new_view
+        @action_inquirer = ActionInquirer.new!
+        @form = controls.form_schema(action: action_inquirer)
+        @view = controls.new_view
         render :new, status: :bad_request
       end
     end
@@ -44,7 +52,7 @@ module Super
     def edit
       @record = controls.load_record(action: action_inquirer, params: params)
       @form = controls.form_schema(action: action_inquirer)
-      @view = controls.build_edit_view
+      @view = controls.edit_view
     end
 
     # Updates a record, or shows validation errors
@@ -52,10 +60,11 @@ module Super
       @record = controls.load_record(action: action_inquirer, params: params)
 
       if controls.update_record(action: action_inquirer, record: @record, params: params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
-        @form = controls.form_schema(action: action_inquirer_for("edit"))
-        @view = controls.build_edit_view
+        @action_inquirer = ActionInquirer.edit!
+        @form = controls.form_schema(action: action_inquirer)
+        @view = controls.edit_view
         render :edit, status: :bad_request
       end
     end
@@ -65,14 +74,14 @@ module Super
       @record = controls.load_record(action: action_inquirer, params: params)
 
       if controls.destroy_record(action: action_inquirer, record: @record, params: params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(controls.model))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
         flash.alert = "Couldn't delete record"
-        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       end
     rescue ActiveRecord::InvalidForeignKey => e
       flash.alert = "Couldn't delete record: #{e.class}"
-      redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+      redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
     end
 
     private
@@ -82,14 +91,15 @@ module Super
     end
 
     def action_inquirer
-      @action_inquirer ||= action_inquirer_for(params[:action])
+      @action_inquirer ||=
+        ActionInquirer.new(
+          ActionInquirer.default_for_resources,
+          params[:action]
+        )
     end
 
-    def action_inquirer_for(action)
-      ActionInquirer.new(
-        ActionInquirer.default_for_resources,
-        action
-      )
+    def navigation
+      Navigation.new(&:all)
     end
   end
 end

data/app/helpers/super/form_builder_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   module FormBuilderHelper
     def super_form_for(record, options = {}, &block)

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

@@ -13,11 +13,7 @@
       <% if stylesheet.handler.sprockets? %>
         <%= stylesheet_link_tag(stylesheet.path, **stylesheet.arguments) %>
       <% elsif stylesheet.handler.webpacker? %>
-        <% if Gem::Dependency.new("webpacker", "> 5.99", "< 7").matching_specs.any? %>
-          <%= stylesheet_packs_with_chunks_tag(stylesheet.path) %>
-        <% else %>
-          <%= stylesheet_pack_tag(stylesheet.path, **stylesheet.arguments) %>
-        <% end %>
+        <%= stylesheet_pack_tag(stylesheet.path, **stylesheet.arguments) %>
       <% end %>
     <% end %>
 
@@ -25,11 +21,7 @@
       <% if javascript.handler.sprockets? %>
         <%= javascript_include_tag(javascript.path) %>
       <% elsif javascript.handler.webpacker? %>
-        <% if Gem::Dependency.new("webpacker", "> 5.99", "< 7").matching_specs.any? %>
-          <%= javascript_packs_with_chunks_tag(javascript.path) %>
-        <% else %>
-          <%= javascript_pack_tag(javascript.path) %>
-        <% end %>
+        <%= javascript_pack_tag(javascript.path) %>
       <% end %>
     <% end %>
   </head>
@@ -38,10 +30,19 @@
     <div class="px-4">
       <header class="pt-4">
         <h1 class="text-lg font-bold mr-6 mb-1"><%= Super.configuration.title %></h1>
-        <%
-        route_namespace = Super.configuration.route_namespace.map(&:to_s).join("/")
-        Super::Navigation::Automatic.new(route_namespace: route_namespace).each do |text, href| %>
-          <%= link_to(text, href, class: "inline-block mr-6") %>
+        <% 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" }) %>
+          <% 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">
+              <summary class="text-blue-700"><%= link_or_menu.title %></summary>
+              <ul class="absolute bg-white shadow-md px-4 py-3">
+                <% link_or_menu.links.each do |link| %>
+                  <li><%= link.to_s(default_options: { class: "" }) %></li>
+                <% end %>
+              </ul>
+            </details>
+          <% end %>
         <% end %>
       </header>
 

data/app/views/super/application/{_super_schema_display_index.html.erb → _display_index.html.erb}

@@ -1,8 +1,8 @@
 <div class="mt-4 overflow-x-auto">
-  <table class="w-full border-separate relative" cellspacing="0" cellpadding="0">
+  <table class="w-full border-separate" cellspacing="0" cellpadding="0">
     <thead class="">
       <tr class="">
-        <% super_schema_display_index.each_attribute_name do |attribute_name| %>
+        <% display_index.each_attribute_name do |attribute_name| %>
           <th class="p-2 first:pl-6 border-b border-b-2 border-gray-400 text-gray-600 text-left text-sm font-normal bg-white top-0 z-10">
             <%= controls.model.human_attribute_name(attribute_name) %>
           </th>
@@ -12,9 +12,9 @@
     <tbody class="">
       <% @records.each.with_index do |record, row_index| %>
         <tr id="record-pk-<%= record.id %>" class="group">
-          <% super_schema_display_index.each_attribute_name do |attribute_name| %>
+          <% display_index.each_attribute_name do |attribute_name| %>
             <td class="py-1 px-2 first:pl-5 border-transparent border-t border-b group-hover:bg-blue-200 first:border-l first:rounded-l-lg last:border-r last:rounded-r-lg bg-white <%= Super::ViewHelper.classes(["bg-gray-100", row_index.odd?]) %>">
-              <%= super_schema_display_index.render_field(template: self, record: record, column: attribute_name) %>
+              <%= display_index.render_attribute(template: self, record: record, column: attribute_name) %>
             </td>
           <% end %>
         </tr>

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

@@ -0,0 +1,8 @@
+<table class="max-w-full mt-4">
+  <% display_show.each_attribute_name do |attribute_name| %>
+    <tr>
+      <th class="py-1 align-baseline text-right px-4"><%= controls.model.human_attribute_name(attribute_name) %></th>
+      <td class="py-1 align-baseline"><%= display_show.render_attribute(template: self, record: @record, column: attribute_name) %></td>
+    </tr>
+  <% end %>
+</table>

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

@@ -1,14 +1,6 @@
-<%= render(Super::Panel.new) do %>
-  <h1 class="text-xl">Filters</h1>
-  <%= super_form_for(filter, url: filter.url, method: :get, as: :q, html: { class: "mt-4" }) do |form| %>
-    <% filter.each_field do |filter_field| %>
-      <div class="mt-4">
-        <%= render(filter_field, form: form) %>
-      </div>
-    <% end %>
-
-    <div>
-      <%= form.super.submit "Filter", class: "super-button--border-gray mt-6" %>
-    </div>
-  <% end %>
+<h1 class="text-lg">Filter</h1>
+<% filter.each_field do |filter_field| %>
+  <div class="mt-4">
+    <%= render(filter_field, form: form) %>
+  </div>
 <% end %>

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

@@ -1,17 +1,20 @@
-<div class="super-field-group">
+<div class="super-field-group" data-controller="clean-filter-param">
   <%= form.fields_for(filter_type_select.field_name, filter_type_select) do |form_field| %>
     <%= form_field.label(:q, filter_type_select.humanized_field_name) %>
-    <div class="relative inline-block">
+    <div class="inline-block">
       <%= form_field.super.select(
         :op,
         filter_type_select.operators,
         { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
       ) %>
     </div>
     <div class="mt-3">
       <%= form_field.super.select(
         :q,
         filter_type_select.field_type.collection,
+        {},
+        data: { clean_filter_param_target: "control candidate" }
       ) %>
     </div>
   <% end %>

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

@@ -1,16 +1,18 @@
-<div class="super-field-group">
+<div class="super-field-group" data-controller="clean-filter-param">
   <%= form.fields_for(filter_type_text.field_name, filter_type_text) do |form_field| %>
     <%= form_field.label(:q, filter_type_text.humanized_field_name) %>
-    <div class="relative inline-block">
+    <div class="inline-block">
       <%= form_field.super.select(
         :op,
         filter_type_text.operators,
-        { include_blank: false }
+        { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
       ) %>
     </div>
     <%= form_field.super.text_field(
       :q,
-      class: "mt-3"
+      class: "mt-3",
+      data: { clean_filter_param_target: "control candidate" }
     ) %>
   <% end %>
 </div>

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

@@ -1,22 +1,23 @@
-<div class="super-field-group">
+<div class="super-field-group" data-controller="clean-filter-param">
   <%= form.fields_for(filter_type_timestamp.field_name, filter_type_timestamp) do |form_field| %>
     <%= form_field.label(:q0, filter_type_timestamp.humanized_field_name) %>
-    <div class="relative inline-block mt-2">
+    <div class="inline-block mt-2">
       <%= form_field.super.select(
         :op,
         filter_type_timestamp.operators,
-        { include_blank: false}
+        { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
       ) %>
     </div>
     <div class="flex items-center mt-3">
       <div class="flex-initial">
-        <%= form_field.super.text_field(:q0) %>
+        <%= form_field.super.datetime_flatpickr(:q0, data: { clean_filter_param_target: "control candidate" }) %>
       </div>
       <div class="flex-initial px-2">
         &ndash;
       </div>
       <div class="flex-initial">
-        <%= form_field.super.text_field(:q1) %>
+        <%= form_field.super.datetime_flatpickr(:q1, data: { clean_filter_param_target: "control candidate" }) %>
       </div>
     </div>
   <% end %>

data/app/views/super/application/{_super_schema_form.html.erb → _form.html.erb}

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

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

@@ -0,0 +1,5 @@
+<% if form_field.super_builder %>
+  <%= form.super.public_send(form_field.method_name, column, *form_field.args, **form_field.kwargs) %>
+<% else %>
+  <%= form.public_send(form_field.method_name, column, *form_field.args, **form_field.kwargs) %>
+<% end %>

data/app/views/super/application/{_super_layout.html.erb → _layout.html.erb}

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

data/app/views/super/application/{_super_pagination.html.erb → _pagination.html.erb}

@@ -5,7 +5,7 @@
         <%= link_to(
           display,
           polymorphic_path(
-            Super.configuration.path_parts(controls.model),
+            Super::Link.polymorphic_parts(controls.model),
             page_query_params
           ),
           class: "inline-block ml-2 text-lg #{is_current_page ? " text-gray-900" : ""}"

data/app/views/super/application/{_super_panel.html.erb → _panel.html.erb}

@@ -1,6 +1,6 @@
-<% if super_panel.resolve(self, block_given? ? Proc.new { yield } : nil).resolved_parts.any? %>
+<% if panel.resolve(self, block_given? ? Proc.new { yield } : nil).resolved_parts.any? %>
   <div class="border rounded shadow border-gray-400 bg-white px-5 pt-4 pb-8 mt-6">
-    <% super_panel.resolved_parts.each do |partial| %>
+    <% panel.resolved_parts.each do |partial| %>
       <%= Super::Partial.render(partial, template: self) %>
     <% end %>
   </div>

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

@@ -0,0 +1,18 @@
+<%= render(Super::Panel.new) do %>
+  <h1 class="text-xl">Query</h1>
+  <%= super_form_for(
+    query,
+    url: query.path,
+    method: :get,
+    as: query.namespace,
+    html: { class: "mt-4" },
+    data: { controller: "clean-filter-params", action: "submit->clean-filter-params#call" }) do |form| %>
+    <% query.addons.each do |namespace, addon| %>
+      <%= form.fields_for namespace do |addon_form| %>
+        <%= render(addon, form: addon_form) %>
+      <% end %>
+    <% end %>
+
+    <%= form.super.submit "Apply", class: "super-button--border-gray mt-6" %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,18 @@
+<h1 class="text-lg mt-6">Sort</h1>
+<div data-controller="apply-template">
+  <% sort.exprs.each.with_index do |expr, index| %>
+    <%= form.fields_for("exprs[]", expr.with_index(index)) do |expr_fields| %>
+      <%= render "sort_expression", expr_fields: expr_fields, sort: sort %>
+    <% end %>
+  <% end %>
+
+  <%= form.fields_for("exprs[]", sort.new_expr.with_index("TEMPLATEINDEX")) do |expr_fields| %>
+    <template data-apply-template-target="template">
+      <%= render "sort_expression", expr_fields: expr_fields, sort: sort %>
+    </template>
+  <% end %>
+
+  <a href="#" data-action="apply-template#call" class="block mt-2 text-sm">
+    Add
+  </a>
+</div>

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

@@ -0,0 +1,25 @@
+<div data-controller="delete clean-filter-param" class="mt-4">
+  <div class="flex items-center">
+    <div class="flex-auto">
+      <%= expr_fields.super.select(
+        :a,
+        sort.sortable_columns,
+        {},
+        {}
+      ) %>
+    </div>
+    <div class="flex-none w-2">
+    </div>
+    <div class="flex-auto">
+      <%= expr_fields.super.select(
+        :d,
+        sort.class::DIRECTIONS,
+        { include_blank: false },
+        {}
+      ) %>
+    </div>
+    <div class="flex-none pl-2">
+      <a href="#" data-action="delete#call" class="block text-black hover:text-red-600 h-4 w-4"><%= render("super/feather/x") %></a>
+    </div>
+  </div>
+</div>