super 0.0.10 → 0.0.11

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/feather/README.md

@@ -3,6 +3,7 @@
 Vendored from: https://github.com/feathericons/feather
 
 * `icons/chevron-down.svg` @ `3c64e93543fab6befab54c3abd013dd8db52509e`
+* `icons/x.svg` @ `a718a7e9c39447202f703783336e8ba1c8e32405`
 
 
 ## License

data/app/views/super/feather/_x.html

@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+  class="feather feather-x"
+>
+  <line x1="18" y1="6" x2="6" y2="18" />
+  <line x1="6" y1="6" x2="18" y2="18" />
+</svg>

data/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
 end

data/docs/action_text.md

@@ -39,7 +39,7 @@ class Controls < Super::Controls
   end
 
   def display_schema(action:)
-    Super::Display.new(action: action) do |fields, type|
+    Super::Display.new do |fields, type|
       fields[:title] = type.text
       fields[:content] = type.rich_text
     end

data/docs/yard_customizations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "yard"
 
 module FixRelativeLinks

data/frontend/super-frontend/dist/application.js

@@ -4332,6 +4332,187 @@ var _default = /*#__PURE__*/function (_Controller) {
   return _default;
 }(_stimulus.Controller);
 
+exports.default = _default;
+},{"stimulus":"../node_modules/stimulus/index.js"}],"javascripts/super/clean_filter_param_controller.js":[function(require,module,exports) {
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _stimulus = require("stimulus");
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+var _default = /*#__PURE__*/function (_Controller) {
+  _inherits(_default, _Controller);
+
+  var _super = _createSuper(_default);
+
+  function _default() {
+    _classCallCheck(this, _default);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(_default, [{
+    key: "call",
+    value: function call() {
+      var allControlsBlank = this.controlTargets.every(function (el) {
+        return el.value === "";
+      });
+
+      if (!allControlsBlank) {
+        return;
+      }
+
+      this.candidateTargets.forEach(function (el) {
+        el.disabled = true;
+      });
+    }
+  }], [{
+    key: "targets",
+    get: function get() {
+      return ["candidate", "control"];
+    }
+  }]);
+
+  return _default;
+}(_stimulus.Controller);
+
+exports.default = _default;
+},{"stimulus":"../node_modules/stimulus/index.js"}],"javascripts/super/clean_filter_params_controller.js":[function(require,module,exports) {
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _stimulus = require("stimulus");
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+var _default = /*#__PURE__*/function (_Controller) {
+  _inherits(_default, _Controller);
+
+  var _super = _createSuper(_default);
+
+  function _default() {
+    _classCallCheck(this, _default);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(_default, [{
+    key: "call",
+    value: function call(event) {
+      this.element.querySelectorAll("[data-controller='clean-filter-param']").forEach(function (el) {
+        var controller = this.application.getControllerForElementAndIdentifier(el, "clean-filter-param");
+        controller.call();
+      }.bind(this));
+    }
+  }]);
+
+  return _default;
+}(_stimulus.Controller);
+
+exports.default = _default;
+},{"stimulus":"../node_modules/stimulus/index.js"}],"javascripts/super/delete_controller.js":[function(require,module,exports) {
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _stimulus = require("stimulus");
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+var _default = /*#__PURE__*/function (_Controller) {
+  _inherits(_default, _Controller);
+
+  var _super = _createSuper(_default);
+
+  function _default() {
+    _classCallCheck(this, _default);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(_default, [{
+    key: "call",
+    value: function call(event) {
+      event.preventDefault();
+      this.element.remove();
+    }
+  }]);
+
+  return _default;
+}(_stimulus.Controller);
+
 exports.default = _default;
 },{"stimulus":"../node_modules/stimulus/index.js"}],"javascripts/super/toggle_pending_destruction_controller.js":[function(require,module,exports) {
 "use strict";
@@ -4415,6 +4596,12 @@ var _stimulus = require("stimulus");
 
 var _apply_template_controller = _interopRequireDefault(require("./apply_template_controller"));
 
+var _clean_filter_param_controller = _interopRequireDefault(require("./clean_filter_param_controller"));
+
+var _clean_filter_params_controller = _interopRequireDefault(require("./clean_filter_params_controller"));
+
+var _delete_controller = _interopRequireDefault(require("./delete_controller"));
+
 var _toggle_pending_destruction_controller = _interopRequireDefault(require("./toggle_pending_destruction_controller"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -4425,5 +4612,8 @@ var StimulusApplication = _stimulus.Application.start();
 
 exports.StimulusApplication = StimulusApplication;
 StimulusApplication.register("apply-template", _apply_template_controller.default);
+StimulusApplication.register("clean-filter-param", _clean_filter_param_controller.default);
+StimulusApplication.register("clean-filter-params", _clean_filter_params_controller.default);
+StimulusApplication.register("delete", _delete_controller.default);
 StimulusApplication.register("toggle-pending-destruction", _toggle_pending_destruction_controller.default);
-},{"@rails/ujs":"../node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js","stimulus":"../node_modules/stimulus/index.js","./apply_template_controller":"javascripts/super/apply_template_controller.js","./toggle_pending_destruction_controller":"javascripts/super/toggle_pending_destruction_controller.js"}]},{},["javascripts/super/application.js"], "Super")
+},{"@rails/ujs":"../node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js","stimulus":"../node_modules/stimulus/index.js","./apply_template_controller":"javascripts/super/apply_template_controller.js","./clean_filter_param_controller":"javascripts/super/clean_filter_param_controller.js","./clean_filter_params_controller":"javascripts/super/clean_filter_params_controller.js","./delete_controller":"javascripts/super/delete_controller.js","./toggle_pending_destruction_controller":"javascripts/super/toggle_pending_destruction_controller.js"}]},{},["javascripts/super/application.js"], "Super")

data/lib/generators/super/action_text/action_text_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class ActionTextGenerator < Rails::Generators::Base
     source_root File.expand_path("templates", __dir__)

data/lib/generators/super/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path("templates", __dir__)

data/lib/generators/super/resource/resource_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class ResourceGenerator < Rails::Generators::NamedBase
     source_root File.expand_path("templates", __dir__)

data/lib/generators/super/webpacker/webpacker_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class WebpackerGenerator < Rails::Generators::Base
     source_root File.expand_path("templates", __dir__)

data/lib/super.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tsort"
 
 require "rails/engine"
@@ -18,7 +20,6 @@ require "super/filter"
 require "super/filter/form_object"
 require "super/filter/guesser"
 require "super/filter/operator"
-require "super/filter/plugin"
 require "super/filter/schema_types"
 require "super/form"
 require "super/form/builder"
@@ -33,8 +34,10 @@ require "super/pagination"
 require "super/panel"
 require "super/partial"
 require "super/plugin"
+require "super/query/form_object"
 require "super/schema"
 require "super/schema/guesser"
+require "super/sort"
 require "super/version"
 require "super/view_helper"
 

data/lib/super/action_inquirer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # ```ruby
   # action = Super::ActionInquirer.new(

data/lib/super/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # Utilities for determining whether to use Sprockets or Webpacker
   class Assets

data/lib/super/client_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # A container class for all user-facing (4xx) errors thrown by this library.
   #

data/lib/super/compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   module Compatability
     module_function

data/lib/super/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # @yield [Configuration]
   # @return [Configuration]
@@ -25,7 +27,6 @@ module Super
       self.controller_namespace = "admin"
       self.route_namespace = :admin
 
-      controller_plugins.use(prepend: Super::Filter::ControllerMethods)
       controller_plugins.use(prepend: Super::Pagination::ControllerMethods)
 
       self.javascripts = [Super::Assets.auto("super/application")]

data/lib/super/controls.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require "super/controls/optional"
 require "super/controls/required"
 require "super/controls/steps"
+require "super/controls/view"
 
 module Super
   # The base Controls class. Most parts of Super can be configured by
@@ -9,5 +12,6 @@ module Super
     include Required
     include Optional
     include Steps
+    include View
   end
 end

data/lib/super/controls/optional.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Controls
     # Methods for `Controls` that have a sane default implementation
@@ -24,7 +26,7 @@ module Super
       # @param action [ActionInquirer]
       # @return [Display]
       def display_schema(action:)
-        Display.new(action: action) do |fields, type|
+        Display.new do |fields, type|
           Display::Guesser.new(model: model, action: action, fields: fields, type: type).call
         end
       end
@@ -74,6 +76,37 @@ module Super
           Super::Link.find_all(:show, :edit, :destroy)
         end
       end
+
+      def filters_enabled?
+        true
+      end
+
+      def filter_schema
+        Super::Filter.new do |fields, type|
+          Super::Filter::Guesser.new(model: model, fields: fields, type: type).call
+        end
+      end
+
+      def sort_enabled?
+        true
+      end
+
+      def sortable_columns
+        action = ActionInquirer.new(
+          ActionInquirer.default_for_resources,
+          "index"
+        )
+        attribute_names =
+          display_schema(action: action).each_attribute.map do |key, val|
+            key if val.real?
+          end
+
+        attribute_names.compact
+      end
+
+      def default_sort
+        { id: :desc }
+      end
     end
   end
 end