super 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 043677dcee80c7b83903b21904f1768a411f807567190d7227928df9bf7922c7
-  data.tar.gz: 5de2f073926089e4823a4228dc4f7be912fed0471d862f9b6f0f56dde280f154
+  metadata.gz: 05520525a7f38fff438eee43a134b9b2e52ac3551098c177323cdb87fd193670
+  data.tar.gz: 0db34e8d60114592b824ec79a2318a11743fe676291859ccec0d81615ce77bfb
 SHA512:
-  metadata.gz: feeba0baacdaf977c16f9e785e7abf6637679ebe2f624716f1006cce290157e29157b046a01f3d287d1b826378a04ece8c482b59cd2f21dc53bf463a28cf2848
-  data.tar.gz: a7d1a568a4c918ececb0200305f1e30042b4fc48946796f13e9568c27b5f95368b60aaac51ac977211566cb79f4973dd3d96a48a421531934c41884ce33ac084
+  metadata.gz: 489419d94f150b08399cfab907773f7cbafc08d7bbf6d2db3af0b8966b81b5cfc1d547fe1a8bb066f72fdac41b04d4b6295715468356de9442d66ae546ff890a
+  data.tar.gz: 806ca79ae33691eca540cd1350210ef4cf75fc427be26731068f307687e50643fe02999c473a39d90fe58f267e2f3aa5bd5e35d580c273b625f787c7176941b3

data/Rakefile

@@ -1,33 +1,35 @@
+# frozen_string_literal: true
+
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Super'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "Super"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 require_relative "dummy_path"
 
 APP_RAKEFILE = File.expand_path("#{SUPER_DUMMY_PATH}/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/app/assets/javascripts/super/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/app/controllers/super/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # Provides a default implementation for each of the resourceful actions
   class ApplicationController < ActionController::Base
@@ -9,22 +11,26 @@ module Super
     # Displays a list of records to the user
     def index
       @records = controls.load_records(action: action_inquirer, params: params)
-      @display = controls.display_schema(action: action_inquirer)
-      @view = controls.build_index_view
+      @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)
-      @view = controls.build_show_view
+      @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.build_new_view
+      @view = controls.new_view
     end
 
     # Creates a record, or shows the validation errors
@@ -35,7 +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.build_new_view
+        @view = controls.new_view
         render :new, status: :bad_request
       end
     end
@@ -44,7 +50,7 @@ module Super
     def edit
       @record = controls.load_record(action: action_inquirer, params: params)
       @form = controls.form_schema(action: action_inquirer)
-      @view = controls.build_edit_view
+      @view = controls.edit_view
     end
 
     # Updates a record, or shows validation errors
@@ -55,7 +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.build_edit_view
+        @view = controls.edit_view
         render :edit, status: :bad_request
       end
     end

data/app/helpers/super/form_builder_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   module FormBuilderHelper
     def super_form_for(record, options = {}, &block)

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

@@ -1,14 +1,6 @@
-<%= render(Super::Panel.new) do %>
-  <h1 class="text-xl">Filters</h1>
-  <%= super_form_for(filter, url: filter.url, method: :get, as: :q, html: { class: "mt-4" }) do |form| %>
-    <% filter.each_field do |filter_field| %>
-      <div class="mt-4">
-        <%= render(filter_field, form: form) %>
-      </div>
-    <% end %>
-
-    <div>
-      <%= form.super.submit "Filter", class: "super-button--border-gray mt-6" %>
-    </div>
-  <% end %>
+<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

@@ -1,4 +1,4 @@
-<div class="super-field-group">
+<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">
@@ -6,12 +6,15 @@
         :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 %>

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

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

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

@@ -1,22 +1,23 @@
-<div class="super-field-group">
+<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}
+        { 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) %>
+        <%= 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) %>
+        <%= form_field.super.text_field(:q1, data: { clean_filter_param_target: "control candidate" }) %>
       </div>
     </div>
   <% end %>

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 %>