super 0.0.6 → 0.0.11

data/app/controllers/super/application_controller.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module Super
   # Provides a default implementation for each of the resourceful actions
   class ApplicationController < ActionController::Base
     include ClientError::Handling
-    include Pluggable.new(:super_application_controller)
 
     helper_method :action_inquirer
     helper_method :controls
@@ -10,21 +11,26 @@ module Super
     # Displays a list of records to the user
     def index
       @records = controls.load_records(action: action_inquirer, params: params)
-      @pagination = controls.initialize_pagination(action: action_inquirer, records: @records, query_params: request.GET)
-      @records = controls.paginate_records(action: action_inquirer, records: @records, pagination: @pagination)
-      @display = controls.display_schema(action: action_inquirer)
+      @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)
+      @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.new_view
     end
 
     # Creates a record, or shows the validation errors
@@ -35,6 +41,7 @@ module Super
         redirect_to polymorphic_path(Super.configuration.path_parts(@record))
       else
         @form = controls.form_schema(action: action_inquirer_for("new"))
+        @view = controls.new_view
         render :new, status: :bad_request
       end
     end
@@ -43,6 +50,7 @@ module Super
     def edit
       @record = controls.load_record(action: action_inquirer, params: params)
       @form = controls.form_schema(action: action_inquirer)
+      @view = controls.edit_view
     end
 
     # Updates a record, or shows validation errors
@@ -53,6 +61,7 @@ module Super
         redirect_to polymorphic_path(Super.configuration.path_parts(@record))
       else
         @form = controls.form_schema(action: action_inquirer_for("edit"))
+        @view = controls.edit_view
         render :edit, status: :bad_request
       end
     end
@@ -75,7 +84,7 @@ module Super
     private
 
     def controls
-      Super::Controls.new(new_controls)
+      @controls ||= new_controls
     end
 
     def action_inquirer

data/app/helpers/super/form_builder_helper.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Super
+  module FormBuilderHelper
+    def super_form_for(record, options = {}, &block)
+      original = ActionView::Base.field_error_proc
+      ActionView::Base.field_error_proc = Form::Builder::FIELD_ERROR_PROC
+
+      options[:builder] ||= Form::Builder
+      return form_for(record, options, &block)
+    ensure
+      ActionView::Base.field_error_proc = original
+    end
+
+    def super_form_with(**options, &block)
+      original = ActionView::Base.field_error_proc
+      ActionView::Base.field_error_proc = Form::Builder::FIELD_ERROR_PROC
+
+      options[:builder] ||= Form::Builder
+      return form_with(**options, &block)
+    ensure
+      ActionView::Base.field_error_proc = original
+    end
+  end
+end

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

@@ -9,12 +9,28 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <% if Super.configuration.asset_handler.sprockets? %>
-      <%= stylesheet_link_tag "super/application", media: "all" %>
-      <%= javascript_include_tag "super/application" %>
-    <% elsif Super.configuration.asset_handler.webpacker? %>
-      <%= stylesheet_pack_tag "super/application", media: "all" %>
-      <%= javascript_pack_tag "super/application" %>
+    <% Super.configuration.stylesheets.each do |stylesheet| %>
+      <% 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 %>
+      <% end %>
+    <% end %>
+
+    <% Super.configuration.javascripts.each do |javascript| %>
+      <% 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 %>
+      <% end %>
     <% end %>
   </head>
 

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

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

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

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

@@ -0,0 +1,21 @@
+<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">
+      <%= 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 %>
+</div>

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

@@ -0,0 +1,18 @@
+<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">
+      <%= form_field.super.select(
+        :op,
+        filter_type_text.operators,
+        { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
+      ) %>
+    </div>
+    <%= form_field.super.text_field(
+      :q,
+      class: "mt-3",
+      data: { clean_filter_param_target: "control candidate" }
+    ) %>
+  <% end %>
+</div>

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

@@ -0,0 +1,24 @@
+<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">
+      <%= form_field.super.select(
+        :op,
+        filter_type_timestamp.operators,
+        { 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, 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, data: { clean_filter_param_target: "control candidate" }) %>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -1,9 +1 @@
-<% if !local_assigns[:ungrouped] %>
-  <div class="super-field-group">
-<% end %>
-  <%= form.check_box(column, data: { action: "toggle-pending-destruction#call" }) %>
-  <%= form.label(column) %>
-  <%= render "form_inline_errors", form: form, column: column %>
-<% if !local_assigns[:ungrouped] %>
-  </div>
-<% end %>
+<%= form.super.check_box!(column, field: { data: { action: "toggle-pending-destruction#call" } }) %>

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

@@ -0,0 +1 @@
+<%= form.super.check_box!(column) %>

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

@@ -0,0 +1 @@
+<%= form.super.rich_text_area!(column) %>

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

@@ -1,23 +1 @@
-<% if !local_assigns[:ungrouped] %>
-  <div class="super-field-group">
-<% end %>
-  <% if !local_assigns[:hide_label] %>
-    <%= form.label(column, class: "block") %>
-  <% end %>
-  <div class="<%= Super::ViewHelper.classes("super-input-select", ["mt-1", !local_assigns[:hide_label]]) %>">
-    <%= form.select(
-      column,
-      form_field_select[:collection],
-      { include_blank: true }.merge(form_field_select[:options] || {}),
-      { class: "super-input super-input-select-field" }
-    ) %>
-    <div class="super-input-select-icon text-gray-700">
-      <span class="h-4 w-4">
-        <%= render "super/feather/chevron_down" %>
-      </span>
-    </div>
-  </div>
-  <%= render "form_inline_errors", form: form, column: column %>
-<% if !local_assigns[:ungrouped] %>
-  </div>
-<% end %>
+<%= form.super.select!(column, form_field_select[:collection]) %>

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

@@ -1,13 +1 @@
-<% if !local_assigns[:ungrouped] %>
-  <div class="super-field-group">
-<% end %>
-  <% if !local_assigns[:hide_label] %>
-    <%= form.label(column, class: "block") %>
-  <% end %>
-  <div class="<%= Super::ViewHelper.classes(["mt-1", !local_assigns[:hide_label]]) %>">
-    <%= form.text_field(column, class: "super-input w-full") %>
-    <%= render "form_inline_errors", form: form, column: column %>
-  </div>
-<% if !local_assigns[:ungrouped] %>
-  </div>
-<% end %>
+<%= form.super.text_field!(column) %>

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>

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

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

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

@@ -0,0 +1,16 @@
+<% if @pagination.necessary? %>
+  <div class="flex justify-end mr-2">
+    <div class="mt-4">
+      <% @pagination.each do |page_query_params, is_current_page, display| %>
+        <%= link_to(
+          display,
+          polymorphic_path(
+            Super.configuration.path_parts(controls.model),
+            page_query_params
+          ),
+          class: "inline-block ml-2 text-lg #{is_current_page ? " text-gray-900" : ""}"
+        ) %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -1,7 +1,7 @@
-<% if super_panel.resolve(self, block_given? ? Proc.new : nil).resolved_parts.any? %>
+<% if super_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| %>
-      <%= super_render_partialish(partial) %>
+      <%= Super::Partial.render(partial, template: self) %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,18 +1,20 @@
 <div class="mt-4 overflow-x-auto">
-  <table class="w-full border-separate" cellspacing="0" cellpadding="0">
-    <thead>
+  <table class="w-full border-separate relative" cellspacing="0" cellpadding="0">
+    <thead class="">
       <tr class="">
-        <% super_schema_display_index.field_keys.each do |column| %>
-          <th class="p-2 first:pl-6 border-b border-b-2 border-gray-400 text-gray-600 text-left text-sm font-normal"><%= column.to_s.humanize %></th>
+        <% super_schema_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>
         <% end %>
       </tr>
     </thead>
     <tbody class="">
       <% @records.each.with_index do |record, row_index| %>
         <tr id="record-pk-<%= record.id %>" class="group">
-          <% super_schema_display_index.field_keys.each do |column| %>
-            <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 <%= Super::ViewHelper.classes(["bg-gray-100", row_index.odd?]) %>">
-              <%= super_format_for_display(super_schema_display_index, record, column) %>
+          <% super_schema_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) %>
             </td>
           <% end %>
         </tr>
@@ -20,20 +22,3 @@
     </tbody>
   </table>
 </div>
-
-<% if @pagination.necessary? %>
-  <div class="flex justify-end mr-2">
-    <div class="mt-4">
-      <% @pagination.each do |page_query_params, is_current_page, display| %>
-        <%= link_to(
-          display,
-          polymorphic_path(
-            Super.configuration.path_parts(controls.model),
-            page_query_params
-          ),
-          class: "inline-block ml-2 text-lg #{is_current_page ? " text-gray-900" : ""}"
-        ) %>
-      <% end %>
-    </div>
-  </div>
-<% end %>