five-two-nw-olivander 0.2.0.6 → 0.2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1b83147e32bcad39702fd0a0a42a71a819e6f16ccc04ce2bf736a72cf8ba14
-  data.tar.gz: 0fa90392ac13ae2161024e59def15f555c7f38e8ebf036bf4787bd0f91a72602
+  metadata.gz: d898798155655b25246bd5f3ed6db6527749b8626ccb877ad09ad49c4461cf16
+  data.tar.gz: e034cbc59cd38d51d5dd3d82cf628db6ba5ecb935af80fb118575f16a57d0b7d
 SHA512:
-  metadata.gz: 93c448ec29561ffd681659106967a9149d17a877c123c737f05d98f408643e698fef4930f3cf0e310caa59acc675e0ae095c6dc9fc878d94c13ee0c46ebb3838
-  data.tar.gz: 63b5b466d541df95458ed0f7474aab9da06dba1803fa5a6118b1882e12391414824bdba931d9931ed065ccabbfdeedad945fb368063f758727f9cb0aeedd7716
+  metadata.gz: 3d48968d12e4474b5800451cdfea383c2dd90c22d636887ab12c0d0147a1c6519a41267ab58d90a400986dda16043eea7596825dfc9ef389cac79819f4fc4d7e
+  data.tar.gz: 72e4e087d0bed9d5fed3c709ba15d37e411da184eb76d4e1ccba6443b678ff3980eb7fa71a13cd0624ca989b7ddf75d18e6fea1f415753942d8a3375c3f57b55

data/app/assets/javascripts/controllers/input_control_association_controller.js

@@ -3,11 +3,23 @@ import { Controller } from "@hotwired/stimulus"
 // Connects to data-controller="input-control-association"
 export default class extends Controller {
   connect() {
+    console.log('setting up select2')
     var self = this,
         el = self.element;
+
+    console.log(el.dataset)
+
     if (!$(el).hasClass("select2-hidden-accessible")) {
       $(el).select2({
         dropdownParent: $(el).parent(),
+        tags: el.dataset.taggable == 'true',
+        createTag: function (tag) {
+          return {
+              id: tag.term,
+              text: tag.term,
+              isNew : true
+          };
+        },
         ajax: {
           url: el.dataset.collectionPath,
           delay: 250,
@@ -15,10 +27,40 @@ export default class extends Controller {
           dataType: 'json',
           processResults: function(data) {
             return { results: data.map(function(map) {
-              return { id: map.id, text: map.text || map.name || map.description };
+              return {
+                id: map.id,
+                text: map.text || map.name || map.description,
+                children: map.children
+              };
             }) };
           }
         }
+      }).on('select2:select', function (e) {
+        
+        let tag = e.params.data;
+        if (tag.isNew === true)
+        {
+          let csrfToken = document.querySelector("[name='csrf-token']").content,
+              data = new FormData()
+          data.append("authenticity_token", document.querySelector('meta[name="csrf-token"]').content)
+          data.append(el.dataset.tagFieldName, tag.text)
+          fetch(el.dataset.collectionPath, {
+            method: 'POST',
+            headers: {
+              "X-CSRF-Token": csrfToken,
+              Accept: "application/json"
+            },
+            body: data
+          })
+          .then(r => r.json())
+          .then(function(json) {
+            $(el).find(`option[value='${tag.id}']`).each(function(idx, opt) {
+              opt.value = json.id
+            })
+            $(el).select2().trigger('change')
+            return true
+          })
+        }
       })
     }
   }

data/app/assets/javascripts/olivander/rails-ujs.esm.js

@@ -0,0 +1,2 @@
+const t="a[data-confirm], a[data-method], a[data-remote]:not([disabled]), a[data-disable-with], a[data-disable]";const e={selector:"button[data-remote]:not([form]), button[data-confirm]:not([form])",exclude:"form button"};const n="select[data-remote], input[data-remote], textarea[data-remote]";const o="form:not([data-turbo=true])";const a="form:not([data-turbo=true]) input[type=submit], form:not([data-turbo=true]) input[type=image], form:not([data-turbo=true]) button[type=submit], form:not([data-turbo=true]) button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])";const r="input[data-disable-with]:enabled, button[data-disable-with]:enabled, textarea[data-disable-with]:enabled, input[data-disable]:enabled, button[data-disable]:enabled, textarea[data-disable]:enabled";const c="input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled, input[data-disable]:disabled, button[data-disable]:disabled, textarea[data-disable]:disabled";const s="input[name][type=file]:not([disabled])";const i="a[data-disable-with], a[data-disable]";const u="button[data-remote][data-disable-with], button[data-remote][data-disable]";let l=null;const loadCSPNonce=()=>{const t=document.querySelector("meta[name=csp-nonce]");return l=t&&t.content};const cspNonce=()=>l||loadCSPNonce();const d=Element.prototype.matches||Element.prototype.matchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector||Element.prototype.oMatchesSelector||Element.prototype.webkitMatchesSelector;const matches=function(t,e){return e.exclude?d.call(t,e.selector)&&!d.call(t,e.exclude):d.call(t,e)};const m="_ujsData";const getData=(t,e)=>t[m]?t[m][e]:void 0;const setData=function(t,e,n){t[m]||(t[m]={});return t[m][e]=n};const $=t=>Array.prototype.slice.call(document.querySelectorAll(t));const isContentEditable=function(t){var e=false;do{if(t.isContentEditable){e=true;break}t=t.parentElement}while(t);return e};const csrfToken=()=>{const t=document.querySelector("meta[name=csrf-token]");return t&&t.content};const csrfParam=()=>{const t=document.querySelector("meta[name=csrf-param]");return t&&t.content};const CSRFProtection=t=>{const e=csrfToken();if(e)return t.setRequestHeader("X-CSRF-Token",e)};const refreshCSRFTokens=()=>{const t=csrfToken();const e=csrfParam();if(t&&e)return $('form input[name="'+e+'"]').forEach((e=>e.value=t))};const p={"*":"*/*",text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript",script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"};const ajax=t=>{t=prepareOptions(t);var e=createXHR(t,(function(){const n=processResponse(e.response!=null?e.response:e.responseText,e.getResponseHeader("Content-Type"));Math.floor(e.status/100)===2?typeof t.success==="function"&&t.success(n,e.statusText,e):typeof t.error==="function"&&t.error(n,e.statusText,e);return typeof t.complete==="function"?t.complete(e,e.statusText):void 0}));return!(t.beforeSend&&!t.beforeSend(e,t))&&(e.readyState===XMLHttpRequest.OPENED?e.send(t.data):void 0)};var prepareOptions=function(t){t.url=t.url||location.href;t.type=t.type.toUpperCase();t.type==="GET"&&t.data&&(t.url.indexOf("?")<0?t.url+="?"+t.data:t.url+="&"+t.data);t.dataType in p||(t.dataType="*");t.accept=p[t.dataType];t.dataType!=="*"&&(t.accept+=", */*; q=0.01");return t};var createXHR=function(t,e){const n=new XMLHttpRequest;n.open(t.type,t.url,true);n.setRequestHeader("Accept",t.accept);typeof t.data==="string"&&n.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");if(!t.crossDomain){n.setRequestHeader("X-Requested-With","XMLHttpRequest");CSRFProtection(n)}n.withCredentials=!!t.withCredentials;n.onreadystatechange=function(){if(n.readyState===XMLHttpRequest.DONE)return e(n)};return n};var processResponse=function(t,e){if(typeof t==="string"&&typeof e==="string")if(e.match(/\bjson\b/))try{t=JSON.parse(t)}catch(t){}else if(e.match(/\b(?:java|ecma)script\b/)){const e=document.createElement("script");e.setAttribute("nonce",cspNonce());e.text=t;document.head.appendChild(e).parentNode.removeChild(e)}else if(e.match(/\b(xml|html|svg)\b/)){const n=new DOMParser;e=e.replace(/;.+/,"");try{t=n.parseFromString(t,e)}catch(t){}}return t};const href=t=>t.href;const isCrossDomain=function(t){const e=document.createElement("a");e.href=location.href;const n=document.createElement("a");try{n.href=t;return!((!n.protocol||n.protocol===":")&&!n.host||e.protocol+"//"+e.host===n.protocol+"//"+n.host)}catch(t){return true}};let f;let{CustomEvent:b}=window;if(typeof b!=="function"){b=function(t,e){const n=document.createEvent("CustomEvent");n.initCustomEvent(t,e.bubbles,e.cancelable,e.detail);return n};b.prototype=window.Event.prototype;({preventDefault:f}=b.prototype);b.prototype.preventDefault=function(){const t=f.call(this);this.cancelable&&!this.defaultPrevented&&Object.defineProperty(this,"defaultPrevented",{get(){return true}});return t}}const fire=(t,e,n)=>{const o=new b(e,{bubbles:true,cancelable:true,detail:n});t.dispatchEvent(o);return!o.defaultPrevented};const stopEverything=t=>{fire(t.target,"ujs:everythingStopped");t.preventDefault();t.stopPropagation();t.stopImmediatePropagation()};const delegate=(t,e,n,o)=>t.addEventListener(n,(function(t){let{target:n}=t;while(!!(n instanceof Element)&&!matches(n,e))n=n.parentNode;if(n instanceof Element&&o.call(n,t)===false){t.preventDefault();t.stopPropagation()}}));const toArray=t=>Array.prototype.slice.call(t);const serializeElement=(t,e)=>{let n=[t];matches(t,"form")&&(n=toArray(t.elements));const o=[];n.forEach((function(t){t.name&&!t.disabled&&(matches(t,"fieldset[disabled] *")||(matches(t,"select")?toArray(t.options).forEach((function(e){e.selected&&o.push({name:t.name,value:e.value})})):(t.checked||["radio","checkbox","submit"].indexOf(t.type)===-1)&&o.push({name:t.name,value:t.value})))}));e&&o.push(e);return o.map((function(t){return t.name?`${encodeURIComponent(t.name)}=${encodeURIComponent(t.value)}`:t})).join("&")};const formElements=(t,e)=>matches(t,"form")?toArray(t.elements).filter((t=>matches(t,e))):toArray(t.querySelectorAll(e));const handleConfirmWithRails=t=>function(e){allowAction(this,t)||stopEverything(e)};const confirm=(t,e)=>window.confirm(t);var allowAction=function(t,e){let n;const o=t.getAttribute("data-confirm");if(!o)return true;let a=false;if(fire(t,"confirm")){try{a=e.confirm(o,t)}catch(t){}n=fire(t,"confirm:complete",[a])}return a&&n};const handleDisabledElement=function(t){const e=this;e.disabled&&stopEverything(t)};const enableElement=t=>{let e;if(t instanceof Event){if(isXhrRedirect(t))return;e=t.target}else e=t;if(!isContentEditable(e))return matches(e,i)?enableLinkElement(e):matches(e,u)||matches(e,c)?enableFormElement(e):matches(e,o)?enableFormElements(e):void 0};const disableElement=t=>{const e=t instanceof Event?t.target:t;if(!isContentEditable(e))return matches(e,i)?disableLinkElement(e):matches(e,u)||matches(e,r)?disableFormElement(e):matches(e,o)?disableFormElements(e):void 0};var disableLinkElement=function(t){if(getData(t,"ujs:disabled"))return;const e=t.getAttribute("data-disable-with");if(e!=null){setData(t,"ujs:enable-with",t.innerHTML);t.innerHTML=e}t.addEventListener("click",stopEverything);return setData(t,"ujs:disabled",true)};var enableLinkElement=function(t){const e=getData(t,"ujs:enable-with");if(e!=null){t.innerHTML=e;setData(t,"ujs:enable-with",null)}t.removeEventListener("click",stopEverything);return setData(t,"ujs:disabled",null)};var disableFormElements=t=>formElements(t,r).forEach(disableFormElement);var disableFormElement=function(t){if(getData(t,"ujs:disabled"))return;const e=t.getAttribute("data-disable-with");if(e!=null)if(matches(t,"button")){setData(t,"ujs:enable-with",t.innerHTML);t.innerHTML=e}else{setData(t,"ujs:enable-with",t.value);t.value=e}t.disabled=true;return setData(t,"ujs:disabled",true)};var enableFormElements=t=>formElements(t,c).forEach((t=>enableFormElement(t)));var enableFormElement=function(t){const e=getData(t,"ujs:enable-with");if(e!=null){matches(t,"button")?t.innerHTML=e:t.value=e;setData(t,"ujs:enable-with",null)}t.disabled=false;return setData(t,"ujs:disabled",null)};var isXhrRedirect=function(t){const e=t.detail?t.detail[0]:void 0;return e&&e.getResponseHeader("X-Xhr-Redirect")};const handleMethodWithRails=t=>function(e){const n=this;const o=n.getAttribute("data-method");if(!o)return;if(isContentEditable(this))return;const a=t.href(n);const r=csrfToken();const c=csrfParam();const s=document.createElement("form");let i=`<input name='_method' value='${o}' type='hidden' />`;c&&r&&!isCrossDomain(a)&&(i+=`<input name='${c}' value='${r}' type='hidden' />`);i+='<input type="submit" />';s.method="post";s.action=a;s.target=n.target;s.innerHTML=i;s.style.display="none";document.body.appendChild(s);s.querySelector('[type="submit"]').click();stopEverything(e)};const isRemote=function(t){const e=t.getAttribute("data-remote");return e!=null&&e!=="false"};const handleRemoteWithRails=t=>function(a){let r,c,s;const i=this;if(!isRemote(i))return true;if(!fire(i,"ajax:before")){fire(i,"ajax:stopped");return false}if(isContentEditable(i)){fire(i,"ajax:stopped");return false}const u=i.getAttribute("data-with-credentials");const l=i.getAttribute("data-type")||"script";if(matches(i,o)){const t=getData(i,"ujs:submit-button");c=getData(i,"ujs:submit-button-formmethod")||i.getAttribute("method")||"get";s=getData(i,"ujs:submit-button-formaction")||i.getAttribute("action")||location.href;c.toUpperCase()==="GET"&&(s=s.replace(/\?.*$/,""));if(i.enctype==="multipart/form-data"){r=new FormData(i);t!=null&&r.append(t.name,t.value)}else r=serializeElement(i,t);setData(i,"ujs:submit-button",null);setData(i,"ujs:submit-button-formmethod",null);setData(i,"ujs:submit-button-formaction",null)}else if(matches(i,e)||matches(i,n)){c=i.getAttribute("data-method");s=i.getAttribute("data-url");r=serializeElement(i,i.getAttribute("data-params"))}else{c=i.getAttribute("data-method");s=t.href(i);r=i.getAttribute("data-params")}ajax({type:c||"GET",url:s,data:r,dataType:l,beforeSend(t,e){if(fire(i,"ajax:beforeSend",[t,e]))return fire(i,"ajax:send",[t]);fire(i,"ajax:stopped");return false},success(...t){return fire(i,"ajax:success",t)},error(...t){return fire(i,"ajax:error",t)},complete(...t){return fire(i,"ajax:complete",t)},crossDomain:isCrossDomain(s),withCredentials:u!=null&&u!=="false"});stopEverything(a)};const formSubmitButtonClick=function(t){const e=this;const{form:n}=e;if(n){e.name&&setData(n,"ujs:submit-button",{name:e.name,value:e.value});setData(n,"ujs:formnovalidate-button",e.formNoValidate);setData(n,"ujs:submit-button-formaction",e.getAttribute("formaction"));return setData(n,"ujs:submit-button-formmethod",e.getAttribute("formmethod"))}};const preventInsignificantClick=function(t){const e=this;const n=(e.getAttribute("data-method")||"GET").toUpperCase();const o=e.getAttribute("data-params");const a=t.metaKey||t.ctrlKey;const r=a&&n==="GET"&&!o;const c=t.button!=null&&t.button!==0;(c||r)&&t.stopImmediatePropagation()};const h={$:$,ajax:ajax,buttonClickSelector:e,buttonDisableSelector:u,confirm:confirm,cspNonce:cspNonce,csrfToken:csrfToken,csrfParam:csrfParam,CSRFProtection:CSRFProtection,delegate:delegate,disableElement:disableElement,enableElement:enableElement,fileInputSelector:s,fire:fire,formElements:formElements,formEnableSelector:c,formDisableSelector:r,formInputClickSelector:a,formSubmitButtonClick:formSubmitButtonClick,formSubmitSelector:o,getData:getData,handleDisabledElement:handleDisabledElement,href:href,inputChangeSelector:n,isCrossDomain:isCrossDomain,linkClickSelector:t,linkDisableSelector:i,loadCSPNonce:loadCSPNonce,matches:matches,preventInsignificantClick:preventInsignificantClick,refreshCSRFTokens:refreshCSRFTokens,serializeElement:serializeElement,setData:setData,stopEverything:stopEverything};const y=handleConfirmWithRails(h);h.handleConfirm=y;const j=handleMethodWithRails(h);h.handleMethod=j;const v=handleRemoteWithRails(h);h.handleRemote=v;const start=function(){if(window._rails_loaded)throw new Error("rails-ujs has already been loaded!");window.addEventListener("pageshow",(function(){$(c).forEach((function(t){getData(t,"ujs:disabled")&&enableElement(t)}));$(i).forEach((function(t){getData(t,"ujs:disabled")&&enableElement(t)}))}));delegate(document,i,"ajax:complete",enableElement);delegate(document,i,"ajax:stopped",enableElement);delegate(document,u,"ajax:complete",enableElement);delegate(document,u,"ajax:stopped",enableElement);delegate(document,t,"click",preventInsignificantClick);delegate(document,t,"click",handleDisabledElement);delegate(document,t,"click",y);delegate(document,t,"click",disableElement);delegate(document,t,"click",v);delegate(document,t,"click",j);delegate(document,e,"click",preventInsignificantClick);delegate(document,e,"click",handleDisabledElement);delegate(document,e,"click",y);delegate(document,e,"click",disableElement);delegate(document,e,"click",v);delegate(document,n,"change",handleDisabledElement);delegate(document,n,"change",y);delegate(document,n,"change",v);delegate(document,o,"submit",handleDisabledElement);delegate(document,o,"submit",y);delegate(document,o,"submit",v);delegate(document,o,"submit",(t=>setTimeout((()=>disableElement(t)),13)));delegate(document,o,"ajax:send",disableElement);delegate(document,o,"ajax:complete",enableElement);delegate(document,a,"click",preventInsignificantClick);delegate(document,a,"click",handleDisabledElement);delegate(document,a,"click",y);delegate(document,a,"click",formSubmitButtonClick);document.addEventListener("DOMContentLoaded",refreshCSRFTokens);document.addEventListener("DOMContentLoaded",loadCSPNonce);return window._rails_loaded=true};h.start=start;if(typeof jQuery!=="undefined"&&jQuery&&jQuery.ajax){if(jQuery.rails)throw new Error("If you load both jquery_ujs and rails-ujs, use rails-ujs only.");jQuery.rails=h;jQuery.ajaxPrefilter((function(t,e,n){if(!t.crossDomain)return CSRFProtection(n)}))}export{h as default};
+//# sourceMappingURL=rails-ujs.esm.js.map

data/app/components/olivander/components/resource_form_component.html.haml

@@ -4,21 +4,13 @@
     .row
       - section.fields.each do |field|
         %div{ class: section.column_class }
-          - case field.type
-          - when :association, :belongs_to_association, :has_many_association, :has_many_through_association, :has_and_belongs_to_many_reflection, :has_one_through_association
-            - reflection = @f.object.class.reflect_on_association(field.sym)
-            - controllers = "#{field.type}-#{@resource.class.name.underscore.gsub('/', '_')}-#{field.sym} input-control-association"
-            - begin
-              - collection_path = polymorphic_path(@resource.class.reflect_on_association(field.sym).klass, format: :json)
-            - rescue
-              - collection_path = ''
-            - collection = @f.object.send(field.sym)
-            - case field.type
-            - when :has_one_through_association
-              = @f.input field.sym, selected: collection, collection: [collection].flatten, disabled: !field.editable, input_html: { data: { collection_path: collection_path, controller: controllers } }
-            -else
-              = @f.association field.sym, collection: [collection].flatten, disabled: !field.editable, input_html: { data: { collection_path: collection_path, controller: controllers } }
-          - when :boolean 
+          - if association?(field)
+            - collection = collection_for(field)
+            - if one_through?(field)
+              = @f.input        field.sym, collection: [collection].flatten, disabled: !field.editable, input_html: { data: association_data_hash_for(field) }, selected: collection
+            - else
+              = @f.association  field.sym, collection: [collection].flatten, disabled: !field.editable, input_html: { data: association_data_hash_for(field) }
+          - elsif boolean?(field)
             = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: { controller: "input-control-#{field.type}" } }, wrapper: :checkbox
           - else 
             = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { rows: 10, data: { controller: "input-control-#{field.type}" } }

data/app/components/olivander/components/resource_form_component.rb

@@ -8,4 +8,53 @@ class Olivander::Components::ResourceFormComponent < ViewComponent::Base
     @f = form_builder
     super
   end
+
+  def collection_for(field)
+    @f.object.send(field.sym)
+  end
+
+  def association_data_hash_for(field)
+    {
+      collection_path: collection_path_for(field),
+      controller: "association-#{@resource.class.name.underscore.dasherize.gsub('/', '-')}-#{field.sym} input-control-association",
+      taggable: taggable?(field),
+      tag_field_name: tag_field_name(field)
+    }
+  end
+
+  def taggable?(field)
+    method_key = "#{field.sym}_taggable?"
+    puts method_key
+    return false unless @resource.class.respond_to?(method_key)
+
+    @resource.class.send(method_key)
+  end
+
+  def tag_field_name(field)
+    return '' unless taggable?(field)
+
+    @resource.class.send("#{field.sym}_tag_field_name")
+  end
+
+  def collection_path_for(field)
+    begin
+      polymorphic_path(@resource.class.reflect_on_association(field.sym).klass, format: :json)
+    rescue
+      ''
+    end
+  end
+
+  def association?(field)
+    %i[
+      association belongs_to_association has_many_association has_many_through_association has_and_belongs_to_many_reflection has_one_through_association
+    ].include?(field.type)
+  end
+
+  def one_through?(field)
+    field.type == :has_one_through_association
+  end
+
+  def boolean?(field)
+    field.type == :boolean
+  end
 end

data/app/controllers/concerns/olivander/resources/crud_controller.rb

@@ -6,6 +6,7 @@ module Olivander
       included do
         include Effective::CrudController
         layout 'olivander/adminlte/main'
+        before_action :fix_date_params
 
         def index
           if request.format == :json && params[:_type].present? && params[:_type] == 'query'
@@ -17,6 +18,25 @@ module Olivander
 
         def index_search
           self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
+          index_term_search if params[:term].present?
+          index_param_search
+          if resources.order_values.size.zero? && resources.model.implicit_order_column.present?
+            self.resources = resources.order(resources.model.implicit_order_column.to_sym)
+          end
+          self.resources = self.resources.limit(25)
+        end
+
+        def index_param_search
+          params.each do |param|
+            effective_resource.klass.columns.each do |col|
+              next unless col.name == param[0] #&& !param[1].blank?
+
+              self.resources = self.resources.where(param[0].to_sym => param[1])
+            end
+          end
+        end
+
+        def index_term_search
           if resource_scope.respond_to?(:search_for)
             self.resources = self.resources.search_for(params[:term])
           else
@@ -31,7 +51,6 @@ module Olivander
             self.resources = self.resources.where(clauses) if clauses.present? && clauses.length.positive?
             self.resources = self.resources.order(orders) if orders.length.positive?
           end
-          self.resources = self.resources.limit(25)
         end
 
         def permitted_params
@@ -73,8 +92,8 @@ module Olivander
                 render(action) # action.js.erb
               end
 
-              format.turbo_stream do
-              end
+              format.json { render json: resource }
+              format.turbo_stream {}
             end
           else # Default
             respond_to do |format|
@@ -88,11 +107,78 @@ module Olivander
                 render(:member_action, locals: { action: action })
               end
 
-              format.turbo_stream do
+              format.json { render json: resource }
+              format.turbo_stream {}
+            end
+          end
+        end
+
+        def respond_with_error(resource, action)
+          return if response.body.present?
+
+          flash.delete(:success)
+          flash.now[:danger] ||= resource_flash(:danger, resource, action)
+
+          respond_to do |format|
+            case action_name.to_sym
+            when :create
+              format.html { render :new }
+            when :update
+              format.html { render :edit }
+            when :destroy
+              format.html do
+                redirect_flash
+                redirect_to(resource_redirect_path(resource, action))
               end
+            else
+              if template_present?(action)
+                format.html { render(action, locals: { action: action }) }
+              elsif request.referer.to_s.end_with?('/edit')
+                format.html { render :edit }
+              elsif request.referer.to_s.end_with?('/new')
+                format.html { render :new }
+              else
+                format.html do
+                  redirect_flash
+                  redirect_to(resource_redirect_path(resource, action))
+                end
+              end
+            end
+
+            format.js do
+              view = template_present?(action) ? action : :member_action
+              render(view, locals: { action: action }) # action.js.erb
+            end
+
+            format.turbo_stream do
+            end
+          end
+        end
+
+        def date_params
+          []
+        end
+
+        def fix_date_params
+          recurse_and_fix_date_params(params)
+        end
+
+        def recurse_and_fix_date_params(params)
+          params.keys.each do |k|
+            if params[k].is_a? ActionController::Parameters
+              recurse_and_fix_date_params(params[k])
+            else
+              params[k] = rearrange_date_param(params[k]) if date_params.include?(k.to_sym)
             end
           end
         end
+
+        def rearrange_date_param(value)
+          return nil if value.blank?
+
+          parts = value.split('/')
+          "#{parts[2]}-#{parts[0]}-#{parts[1]}"
+        end
       end
     end
   end

data/app/views/application/edit.html.haml

@@ -2,6 +2,8 @@
 - @resource = instance_variable_get('@' + resource.name) if resource.name
 
 - if @resource
+  = render_optional_partial 'form_before'
   .row
     .col-12{ data: { controller: [controller.class.name.gsub('Controller', '').underscore.dasherize.gsub('/', '--'), action_name].join('-') } }
       = render_resource_form(@resource)
+  = render_optional_partial 'form_after'

data/config/initializers/simple_form.rb

@@ -125,7 +125,7 @@ SimpleForm.setup do |config|
     b.optional :min_max
     b.optional :readonly
     b.use :input, class: 'custom-control-input'
-    #b.use :label, class: 'custom-control-label'
+    b.use :label, class: 'custom-control-label'
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
     b.use :error, wrap_with: { tag: :span, class: "text-danger" }
   end
@@ -205,7 +205,7 @@ SimpleForm.setup do |config|
   # config.wrapper_mappings = { string: :prepend }
   config.wrapper_mappings = {
     boolean:  :vertical_boolean,
-    check_boxes:     :check_box,
+    check_boxes:     :vertical_collection,
     # date:          :horizontal_multi_select,
     # datetime:      :horizontal_multi_select,
     # file:          :horizontal_file,

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.6'.freeze
+  VERSION = '0.2.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.6
+  version: 0.2.0.8
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -217,6 +217,7 @@ files:
 - app/assets/javascripts/controllers/modal_controller.js
 - app/assets/javascripts/controllers/turbo_flash_controller.js
 - app/assets/javascripts/olivander/flash_toast.js
+- app/assets/javascripts/olivander/rails-ujs.esm.js
 - app/assets/stylesheets/adminlte.css
 - app/assets/stylesheets/fa-fix.scss
 - app/assets/stylesheets/olivander/application.css