super 0.0.15 → 0.19.0.rc1

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

@@ -1,7 +1,7 @@
 <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>
+      <th class="py-1 align-baseline text-right px-4"><%= 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 %>

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

@@ -1,6 +1,66 @@
 <h1 class="text-lg">Filter</h1>
-<% filter.each_field do |filter_field| %>
+<% filter.each_attribute do |attribute_form_object| %>
   <div class="mt-4">
-    <%= render(filter_field, form: form) %>
+    <%= 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| %>
+            <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.super.text_field(operator_field_name) %>
+                          <% end %>
+                        </div>
+                      <% end %>
+                    </div>
+                  <% end %>
+                </div>
+              <% end %>
+
+              <%= form_html if index == selected_index %>
+
+              <template data-tab-target="pocket">
+                <%= form_html %>
+              </template>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
   </div>
 <% end %>

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

@@ -1,16 +1,16 @@
 <header class="flex justify-between content-end">
   <h1 class="text-xl">
-    <%= controls.title %>
+    <%= title %>
   </h1>
-  <div>
-    <% controls.member_actions(action: action_inquirer).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">
@@ -5,7 +6,7 @@
         <%= link_to(
           display,
           polymorphic_path(
-            Super::Link.polymorphic_parts(controls.model),
+            Super::Link.polymorphic_parts(model),
             page_query_params
           ),
           class: "inline-block ml-2 text-lg #{is_current_page ? " text-gray-900" : ""}"

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

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

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

@@ -0,0 +1,17 @@
+<header class="pt-4">
+  <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" }) %>
+    <% 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>
+          <% end %>
+        </ul>
+      </details>
+    <% end %>
+  <% end %>
+</header>

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

@@ -5,7 +5,7 @@
         :a,
         sort.sortable_columns,
         {},
-        {}
+        { class: "w-full" }
       ) %>
     </div>
     <div class="flex-none w-2">
@@ -15,7 +15,7 @@
         :d,
         sort.class::DIRECTIONS,
         { include_blank: false },
-        {}
+        { class: "w-full" }
       ) %>
     </div>
     <div class="flex-none pl-2">

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/app/views/super/application/index.csv.erb

@@ -0,0 +1,14 @@
+<%=
+  attribute_names = @display.each_attribute_name.to_a
+
+  CSV
+    .generate(write_headers: true, headers: attribute_names) do |csv|
+      @records.each do |record|
+        row = attribute_names.map do |attribute_name|
+          @display.render_attribute(template: self, record: record, column: attribute_name)
+        end
+        csv << row
+      end
+    end
+    .html_safe
+-%>

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."