super 0.20.0 → 0.22.0

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

@@ -1,66 +1,70 @@
-<h1 class="text-lg">Filter</h1>
-<% filter.each_attribute do |attribute_form_object| %>
-  <div class="mt-4">
-    <%= form.fields_for(attribute_form_object.field_name, attribute_form_object) do |attribute_form| %>
-      <% selected_index = 0 %>
-      <div data-controller="tab-container" data-tab-container-tab-identifier-getter-value="tabIdentifierValue" data-tab-container-tab-controller-name-value="tab">
-        <div>
-          <span class="inline-block"><%= attribute_form_object.humanized_attribute_name %></span>
-          <select data-tab-container-target="control" data-action="tab-container#change" class="super-input super-input-select inline-block">
-            <% selected = false %>
+<h1 class="text-lg mt-4">Filter</h1>
+<%= super_fields_for(query.namespace_for(filter), filter) do |form| %>
+  <% filter.each_attribute do |attribute_form_object| %>
+    <div class="mt-4">
+      <%= form.fields_for(attribute_form_object.field_name, attribute_form_object) do |attribute_form| %>
+        <% selected_index = 0 %>
+        <div data-controller="tab-container" data-tab-container-tab-identifier-getter-value="tabIdentifierValue" data-tab-container-tab-controller-name-value="tab">
+          <div>
+            <span class="inline-block"><%= attribute_form_object.humanized_attribute_name %></span>
+            <select data-tab-container-target="control" data-action="tab-container#change" class="super-input super-input-select inline-block">
+              <% selected = false %>
+              <% attribute_form_object.each_operator.with_index do |operator_form_object, index| %>
+                <%
+                  selected_attribute =
+                    if !selected && operator_form_object.specified?
+                      selected = true
+                      selected_index = index
+                      %(selected=selected)
+                    else
+                      ""
+                    end
+                %>
+                <option value="<%= operator_form_object.identifier %>" <%= selected_attribute %>><%= operator_form_object.operator.humanized_operator_name %></option>
+              <% end %>
+            </select>
+          </div>
+          <div>
             <% attribute_form_object.each_operator.with_index do |operator_form_object, index| %>
-              <%
-                selected_attribute =
-                  if !selected && operator_form_object.specified?
-                    selected = true
-                    selected_index = index
-                    %(selected=selected)
-                  else
-                    ""
-                  end
-              %>
-              <option value="<%= operator_form_object.identifier %>" <%= selected_attribute %>><%= operator_form_object.operator.humanized_operator_name %></option>
-            <% end %>
-          </select>
-        </div>
-        <div>
-          <% attribute_form_object.each_operator.with_index do |operator_form_object, index| %>
-            <div data-controller="tab" data-tab-tab-container-getter-value="tabContainer" data-tab-container-target="tab" data-tab-identifier-value="<%= operator_form_object.identifier %>">
-              <% form_html = capture do %>
-                <div data-tab-target="content">
-                  <%= attribute_form.fields_for(operator_form_object.identifier, operator_form_object) do |operator_form| %>
-                    <div class="flex gap-x-2 mt-2">
-                      <% operator_form_object.each_field.with_index do |operator_field_name, index| %>
-                        <div class="flex-1">
-                          <% if operator_field_name == Super::Filter::FormObject::OperatorForm::NULLARY %>
-                            <%= operator_form.super.check_box(operator_field_name, {}, "1", "") %>
-                            <%= operator_form.super.label(operator_field_name, nil, super: { class: "select-none ml-1" }) %>
-                          <% elsif operator_form_object.operator.respond_to?(:field_transcript) && operator_form_object.operator.field_transcript %>
-                            <% field_transcript = operator_form_object.operator.field_transcript %>
-                            <% if field_transcript.super? %>
-                              <%= operator_form.super.public_send(field_transcript.method_name, operator_field_name, *field_transcript.args, **field_transcript.kwargs) %>
+              <div data-controller="tab" data-tab-tab-container-getter-value="tabContainer" data-tab-container-target="tab" data-tab-identifier-value="<%= operator_form_object.identifier %>">
+                <% form_html = capture do %>
+                  <div data-tab-target="content">
+                    <%= attribute_form.fields_for(operator_form_object.identifier, operator_form_object) do |operator_form| %>
+                      <div class="flex gap-x-2 mt-2">
+                        <% operator_form_object.each_field.with_index do |operator_field_name, index| %>
+                          <div class="flex-1">
+                            <% if operator_field_name == Super::Filter::FormObject::OperatorForm::NULLARY %>
+                              <%= operator_form.super.check_box(operator_field_name, {}, "1", "") %>
+                              <%= operator_form.super.label(operator_field_name, nil, super: { class: "select-none ml-1" }) %>
+                            <% elsif operator_form_object.operator.respond_to?(:field_transcript) && operator_form_object.operator.field_transcript %>
+                              <% field_transcript = operator_form_object.operator.field_transcript %>
+                              <% if field_transcript.super? %>
+                                <%= operator_form.super.public_send(field_transcript.method_name, operator_field_name, *field_transcript.args, **field_transcript.kwargs) %>
+                              <% else %>
+                                <%= operator_form.public_send(field_transcript.method_name, operator_field_name, *field_transcript.args, **field_transcript.kwargs) %>
+                              <% end %>
                             <% else %>
-                              <%= operator_form.public_send(field_transcript.method_name, operator_field_name, *field_transcript.args, **field_transcript.kwargs) %>
+                              <%= operator_form.super.text_field(operator_field_name) %>
                             <% end %>
-                          <% else %>
-                            <%= operator_form.super.text_field(operator_field_name) %>
-                          <% end %>
-                        </div>
-                      <% end %>
-                    </div>
-                  <% end %>
-                </div>
-              <% end %>
+                          </div>
+                        <% end %>
+                      </div>
+                    <% end %>
+                  </div>
+                <% end %>
 
-              <%= form_html if index == selected_index %>
+                <%= form_html if index == selected_index %>
 
-              <template data-tab-target="pocket">
-                <%= form_html %>
-              </template>
-            </div>
-          <% end %>
+                <template data-tab-target="pocket">
+                  <%= form_html %>
+                </template>
+              </div>
+            <% end %>
+          </div>
         </div>
-      </div>
-    <% end %>
-  </div>
+      <% end %>
+    </div>
+  <% end %>
 <% end %>
+
+<%= yield if block_given? %>

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

@@ -1,7 +1,7 @@
 <%= super_form_for(form_record(@record), url: form_action(@record)) do |f| %>
   <div class="max-w-3xl">
     <% form.each_attribute do |field, type| %>
-      <%= render(
+      <%= super_render(
         type,
         form: f,
         column: field

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

@@ -3,6 +3,6 @@
     <legend class="bg-white p-1 -mx-1"><%= form_fieldset.label %></legend>
   <% end %>
   <% form_fieldset.nested_fields.each do |field, type| %>
-    <%= render(type, form: form, column: field) %>
+    <%= super_render(type, form: form, column: field) %>
   <% end %>
 </fieldset>

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

@@ -1,6 +1,6 @@
 <div data-controller="apply-template">
   <%= form.fields_for(form_has_many.reader) do |ff| %>
-    <%= render "form_fieldset", form_fieldset: form_has_many, form: ff %>
+    <%= super_render "form_fieldset", form_fieldset: form_has_many, form: ff %>
   <% end %>
 
   <%=
@@ -11,7 +11,7 @@
     ) do |ff|
   %>
     <template data-apply-template-target="template">
-      <%= render "form_fieldset", form_fieldset: form_has_many, form: ff %>
+      <%= super_render "form_fieldset", form_fieldset: form_has_many, form: ff %>
     </template>
   <% end %>
 

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

@@ -6,6 +6,6 @@
   %>
 
   <%= form.fields_for(form_has_one.reader) do |ff| %>
-    <%= render "form_fieldset", form_fieldset: form_has_one, form: ff %>
+    <%= super_render "form_fieldset", form_fieldset: form_has_one, form: ff %>
   <% end %>
 </div>

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

@@ -1,28 +1,26 @@
-<%# <% layout.resolve(self) %1> %>
-
 <% if layout.header %>
-  <%= render layout.header %>
+  <%= super_render layout.header %>
 <% end %>
 
 <% if layout.aside %>
   <div class="flow-root -mx-2">
     <div class="md:float-left md:w-9/12 px-2">
       <% if layout.main %>
-        <%= render layout.main %>
+        <%= super_render layout.main %>
       <% end %>
     </div>
 
     <div class="md:float-right md:w-3/12 px-2">
-      <%= render layout.aside %>
+      <%= super_render layout.aside %>
     </div>
   </div>
 <% else %>
   <% if layout.main %>
-    <%= render layout.main %>
+    <%= super_render layout.main %>
   <% end %>
 <% end %>
 
 <% if layout.footer %>
-  <%= render layout.footer %>
-  <%= Super::Partial.render(partial, template: self) %>
+  <%= super_render layout.footer %>
+  <%= super_render(partial) %>
 <% end %>

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

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

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

@@ -4,7 +4,7 @@
   </h1>
   <div class="flex gap-2">
     <% resolved_member_actions(@record).each do |link| %>
-      <%= render(
+      <%= super_render(
         link,
         default_options: {
           class: "super-button super-button--border-blue super-button-sm inline-block"

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

@@ -1,7 +1,7 @@
 <% 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">
     <% panel.resolved_parts.each do |partial| %>
-      <%= Super::Partial.render(partial, template: self) %>
+      <%= super_render(partial) %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,18 +1,19 @@
-<%= render(Super::Panel.new) do %>
+<% if filters_enabled? || sort_enabled? %>
   <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) %>
+
+  <%= form_tag(query.path, method: :get, data: { controller: "clean-filter-params", action: "submit->clean-filter-params#call" }) do %>
+    <% if filters_enabled? %>
+      <%= super_render @filter_form %>
+    <% end %>
+    <% if sort_enabled? %>
+      <% if filters_enabled? %>
+        <div class="mt-6"></div>
       <% end %>
+      <%= super_render @sort_form %>
     <% end %>
 
-    <%= form.super.submit "Apply", class: "super-button--border-gray mt-6" %>
+    <%= submit_tag("Apply", class: "super-button super-button--border-gray mt-6") %>
   <% end %>
 <% end %>
+
+<%= yield if block_given? %>

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) %>
-      <%= render(link_or_menu, default_options: { class: "inline-block mr-6" }) %>
+      <%= super_render(link_or_menu, default_options: { class: "inline-block mr-6" }) %>
     <% else %>
       <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 z-20">
           <% link_or_menu.links.each do |link| %>
-            <li><%= render(link, default_options: { class: "" }) %></li>
+            <li><%= super_render(link, default_options: { class: "" }) %></li>
           <% end %>
         </ul>
       </details>

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

@@ -1,18 +1,22 @@
 <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 %>
+<%= super_fields_for(query.namespace_for(sort), sort) do |form| %>
+  <div data-controller="apply-template">
+    <% sort.exprs.each.with_index do |expr, index| %>
+      <%= form.fields_for("exprs[]", expr.with_index(index)) do |expr_fields| %>
+        <%= super_render "sort_expression", expr_fields: expr_fields, sort: sort %>
+      <% end %>
     <% 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 %>
+    <%= form.fields_for("exprs[]", sort.new_expr.with_index("TEMPLATEINDEX")) do |expr_fields| %>
+      <template data-apply-template-target="template">
+        <%= super_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>
+<% end %>
 
-  <a href="#" data-action="apply-template#call" class="block mt-2 text-sm">
-    Add
-  </a>
-</div>
+<%= yield if block_given? %>

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

@@ -19,7 +19,7 @@
       ) %>
     </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>
+      <a href="#" data-action="delete#call" class="block text-black hover:text-red-600 h-4 w-4"><%= super_render("super/feather/x") %></a>
     </div>
   </div>
 </div>

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

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

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

@@ -1,2 +1,2 @@
 <% raise Super::Error::NothingToRender, "edit" if @view.nil? %>
-<%= render(@view) %>
+<%= super_render(@view) %>

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

@@ -1,2 +1,2 @@
 <% raise Super::Error::NothingToRender, "index" if @view.nil? %>
-<%= render(@view) %>
+<%= super_render(@view) %>

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

@@ -1,2 +1,2 @@
 <% raise Super::Error::NothingToRender, "new" if @view.nil? %>
-<%= render(@view) %>
+<%= super_render(@view) %>

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

@@ -1,2 +1,2 @@
 <% raise Super::Error::NothingToRender, "show" if @view.nil? %>
-<%= render(@view) %>
+<%= super_render(@view) %>

data/config/locales/en.yml

@@ -17,3 +17,6 @@ en:
     layout:
       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."
+    destroy_error:
+      invalid_foreign_key: Couldn't delete record because other records still refer to this one
+      generic: Couldn't delete record