super 0.0.16 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14981d8658b6c65e32ead25ed20481ab4f675928239f72454ed0fc8d2dcd8795
-  data.tar.gz: 124dc8f187b220e30d171bf4a2dda7f778b52a70088df3ffce5ea15bdfa93196
+  metadata.gz: f4c1533c37aaa4f56c80a7111be8f640d33a29e9de966acb5d389556224057c5
+  data.tar.gz: d57b41a260d921a135289497b247df2951d2d1c0399b3668f9c54f2c5ddc981a
 SHA512:
-  metadata.gz: '0780127899eadf34022440f92166258941a8794a72098af5694b4df28da8b3c7a9f7c91ef8f140c0bc5fdd7154d539d197061229402ad9500c4510928ff0be03'
-  data.tar.gz: 9025a0591386f938da8dc65a3d3dca846f76093c1d1c529b9df97a3cd0aa14b543dd2b32854273cbe23fd97358fce5dcef0712b96b5b29c09d0b7b0dda2b2b90
+  metadata.gz: 67d7be279b48cc7ebbb1ae4a7ea1c1bc6fd6f06ec11e218ccddd590d0392a64cdff7a896d49d0b96b796185a21b08fe4fc15d3cba4299d0d19a419105ee0c4a9
+  data.tar.gz: 9d0811ebf7fcd8e70d18285fa9e86979c96334c620c0688843dc85c4b33d695dacba1e6fb5f026e0f900ff930ade5c77b5321b5a428adc3968f92a579f7b2d77

data/app/assets/javascripts/super/application.js

@@ -413,7 +413,7 @@ var Super = (function (exports) {
         }).call(this);
         (function () {
           var AcceptHeaders, CSRFProtection, createXHR, cspNonce, prepareOptions, processResponse;
-          cspNonce = Rails.cspNonce, CSRFProtection = Rails.CSRFProtection, Rails.fire;
+          cspNonce = Rails.cspNonce, CSRFProtection = Rails.CSRFProtection;
           AcceptHeaders = {
             '*': '*/*',
             text: 'text/plain',
@@ -3975,7 +3975,7 @@ var Super = (function (exports) {
     };
   }
 
-  var _default$6 = /*#__PURE__*/function (_Controller) {
+  var _default$8 = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
     var _super = _createSuper(_default);
@@ -4004,7 +4004,7 @@ var Super = (function (exports) {
     return _default;
   }(Controller);
 
-  var _default$5 = /*#__PURE__*/function (_Controller) {
+  var _default$7 = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
     var _super = _createSuper(_default);
@@ -4040,7 +4040,7 @@ var Super = (function (exports) {
     return _default;
   }(Controller);
 
-  var _default$4 = /*#__PURE__*/function (_Controller) {
+  var _default$6 = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
     var _super = _createSuper(_default);
@@ -4064,7 +4064,7 @@ var Super = (function (exports) {
     return _default;
   }(Controller);
 
-  var _default$3 = /*#__PURE__*/function (_Controller) {
+  var _default$5 = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
     var _super = _createSuper(_default);
@@ -4094,7 +4094,7 @@ var Super = (function (exports) {
     return _default;
   }(Controller);
 
-  var _default$2 = /*#__PURE__*/function (_Controller) {
+  var _default$4 = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
     var _super = _createSuper(_default);
@@ -6354,7 +6354,7 @@ var Super = (function (exports) {
     window.flatpickr = flatpickr;
   }
 
-  var _default$1 = /*#__PURE__*/function (_Controller) {
+  var _default$3 = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
     var _super = _createSuper(_default);
@@ -6382,6 +6382,137 @@ var Super = (function (exports) {
     return _default;
   }(Controller);
 
+  var _default$2 = /*#__PURE__*/function (_Controller) {
+    _inherits(_default, _Controller);
+
+    var _super = _createSuper(_default);
+
+    function _default() {
+      _classCallCheck(this, _default);
+
+      return _super.apply(this, arguments);
+    }
+
+    _createClass(_default, [{
+      key: "connect",
+      value: function connect() {
+        var _this = this;
+
+        this.tabTargets.forEach(function (tab) {
+          tab.tabContainer = _this;
+        });
+      }
+    }, {
+      key: "activeTabIdentifier",
+      get: function get() {
+        return this.controlTarget.value;
+      }
+    }, {
+      key: "change",
+      value: function change(event) {
+        this.update(event.target.value);
+      }
+    }, {
+      key: "update",
+      value: function update(newActiveTabIdentifier) {
+        var _this2 = this;
+
+        this.tabTargets.forEach(function (tab) {
+          var tabController = _this2.application.getControllerForElementAndIdentifier(tab, _this2.tabControllerNameValue);
+
+          if (tab.dataset[_this2.tabIdentifierGetterValue] == newActiveTabIdentifier) {
+            tabController.show();
+          } else {
+            tabController.hide();
+          }
+        });
+      }
+    }], [{
+      key: "targets",
+      get: function get() {
+        return ["control", "tab"];
+      }
+    }, {
+      key: "values",
+      get: function get() {
+        return {
+          tabIdentifierGetter: String,
+          tabControllerName: String
+        };
+      }
+    }]);
+
+    return _default;
+  }(Controller);
+
+  var _default$1 = /*#__PURE__*/function (_Controller) {
+    _inherits(_default, _Controller);
+
+    var _super = _createSuper(_default);
+
+    function _default() {
+      _classCallCheck(this, _default);
+
+      return _super.apply(this, arguments);
+    }
+
+    _createClass(_default, [{
+      key: "connect",
+      value: function connect() {
+        var tabContainer = this.element[this.tabContainerGetterValue];
+
+        if (tabContainer.activeTabIdentifier === this.identifierValue) {
+          this.show();
+        } else {
+          this.hide();
+        }
+      }
+    }, {
+      key: "toggle",
+      value: function toggle() {
+        if (this.hasContentTarget) {
+          this.hide();
+        } else {
+          this.show();
+        }
+      }
+    }, {
+      key: "show",
+      value: function show() {
+        if (this.hasContentTarget) {
+          return;
+        }
+
+        var pocketContent = this.pocketTarget.content.cloneNode(true);
+        this.element.appendChild(pocketContent);
+      }
+    }, {
+      key: "hide",
+      value: function hide() {
+        if (!this.hasContentTarget) {
+          return;
+        }
+
+        this.contentTarget.remove();
+      }
+    }], [{
+      key: "targets",
+      get: function get() {
+        return ["pocket", "content"];
+      }
+    }, {
+      key: "values",
+      get: function get() {
+        return {
+          identifier: String,
+          tabContainerGetter: String
+        };
+      }
+    }]);
+
+    return _default;
+  }(Controller);
+
   var _default = /*#__PURE__*/function (_Controller) {
     _inherits(_default, _Controller);
 
@@ -6412,12 +6543,14 @@ var Super = (function (exports) {
   }(Controller);
 
   var StimulusApplication = Application.start();
-  StimulusApplication.register("apply-template", _default$6);
-  StimulusApplication.register("clean-filter-param", _default$5);
-  StimulusApplication.register("clean-filter-params", _default$4);
-  StimulusApplication.register("click-outside-to-close", _default$3);
-  StimulusApplication.register("delete", _default$2);
-  StimulusApplication.register("flatpickr", _default$1);
+  StimulusApplication.register("apply-template", _default$8);
+  StimulusApplication.register("clean-filter-param", _default$7);
+  StimulusApplication.register("clean-filter-params", _default$6);
+  StimulusApplication.register("click-outside-to-close", _default$5);
+  StimulusApplication.register("delete", _default$4);
+  StimulusApplication.register("flatpickr", _default$3);
+  StimulusApplication.register("tab-container", _default$2);
+  StimulusApplication.register("tab", _default$1);
   StimulusApplication.register("toggle-pending-destruction", _default);
 
   exports.StimulusApplication = StimulusApplication;

data/app/assets/stylesheets/super/application.css

@@ -1487,7 +1487,6 @@ span.flatpickr-day.selected {
 
 .super-input-select {
   padding-right: 2rem;
-  width: 100%;
   background-repeat: no-repeat;
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%232b6cb0' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E %3Cpolyline points='6 9 12 15 18 9'/%3E %3C/svg%3E");
   background-position: right 0.5rem center;

data/app/controllers/super/application_controller.rb

@@ -34,7 +34,8 @@ module Super
 
     # Creates a record, or shows the validation errors
     def create
-      @record = build_record_with_params
+      @record = build_record
+      set_record_attributes
 
       if save_record
         redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
@@ -56,8 +57,9 @@ module Super
     # Updates a record, or shows validation errors
     def update
       @record = load_record
+      set_record_attributes
 
-      if update_record
+      if save_record
         redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
         @current_action = ActionInquirer.edit!
@@ -91,5 +93,16 @@ module Super
           params[:action]
         )
     end
+
+    def with_current_action(action)
+      original = @current_action
+      @current_action = ActionInquirer.new(
+        ActionInquirer.default_for_resources,
+        action
+      )
+      yield
+    ensure
+      @current_action = original
+    end
   end
 end

data/app/controllers/super/substructure_controller.rb

@@ -50,7 +50,18 @@ module Super
     #
     # @return [ActionController::Parameters]
     helper_method def permitted_params
-      strong_params = Super::Form::StrongParams.new(form_schema)
+      strong_params =
+        if current_action.create?
+          with_current_action("new") do
+            Super::Form::StrongParams.new(form_schema)
+          end
+        elsif current_action.update?
+          with_current_action("edit") do
+            Super::Form::StrongParams.new(form_schema)
+          end
+        else
+          Super::Form::StrongParams.new(form_schema)
+        end
       params.require(strong_params.require(model)).permit(strong_params.permit)
     end
 
@@ -65,8 +76,12 @@ module Super
     # Configures the actions linked to on the show page as well as each row of
     # the table on the index page. This is an optional method
     #
+    # Favor the `record` argument over the `@record` instance variable;
+    # `@record` won't always be set, notably on the index page where it's
+    # called on every row
+    #
     # @return [Array<Link>]
-    helper_method def member_actions
+    helper_method def member_actions(record)
       if current_action.show?
         Super::Link.find_all(:edit, :destroy)
       elsif current_action.edit?
@@ -127,18 +142,14 @@ module Super
       base_scope.build
     end
 
-    def build_record_with_params
-      base_scope.build(permitted_params)
+    def set_record_attributes
+      @record.attributes = permitted_params
     end
 
     def save_record
       @record.save
     end
 
-    def update_record
-      @record.update(permitted_params)
-    end
-
     def destroy_record
       @record.destroy
     end

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

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

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/_member_header.html.erb

@@ -3,7 +3,7 @@
     <%= title %>
   </h1>
   <div>
-    <% member_actions.each do |link| %>
+    <% member_actions(@record).each do |link| %>
       <%= link.to_s(
         default_options: {
           class: "super-button super-button--border-blue super-button-sm inline-block ml-2"

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/frontend/super-frontend/dist/application.css

@@ -1487,7 +1487,6 @@ span.flatpickr-day.selected {
 
 .super-input-select {
   padding-right: 2rem;
-  width: 100%;
   background-repeat: no-repeat;
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%232b6cb0' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E %3Cpolyline points='6 9 12 15 18 9'/%3E %3C/svg%3E");
   background-position: right 0.5rem center;