disco_app 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 588d8ea318ba16bf4dff4610ac9ba3797e20b13833b55001175024b22f147428
-  data.tar.gz: a2b553ef70d4a296d594da3d0b907492fb0171a1ce01e536a9b5a9674c612ba7
+  metadata.gz: 333b0540e47c1d1c0f35b1e10ad0b8039fae81c91a9e96648ca4e5d2abbbb526
+  data.tar.gz: 1749255c14c73a9c3835d4c9a1e140c9c695a97535445b16121eb9eb38e711ff
 SHA512:
-  metadata.gz: 73cfa3f2d3dc98e0a312f1ff4827f849af6752bce0ca4b176a6ac87c2d01a67551d59a701bd0d7cb1cbb78493a03eb804fc46aba6e5cf5b4c49a05001a019363
-  data.tar.gz: d7cadbbe26e7f65e1ce9dc980ad794689adc1c5ca19ff6b9ff31927c9f64d212c5b2707892089ff3ea735a0283820786841c00cf379956254143a8a9987ea25f
+  metadata.gz: 0367c1f61d48894dcc70a8f08d8bfe2f00fe4c7ba589a0969ff28e2043f538c8f413f9417b02268940b9b9ba9281fc12d0278402406128dee20a7ea14fa45308
+  data.tar.gz: 2da5c048070836eebd7fd577f01240cc70c8f4671d57d5f5be70143e23ab55029d5cecc514eb2b021129f626ef9703806c621dbd4c7610a3b05d7adeeb3a5553

data/app/assets/components/disco_app/forms/model-form.es6.jsx

@@ -2,7 +2,7 @@ class ModelForm extends BaseForm {
 
   render() {
     const { modelTitle, modelName, modelUrl, modelsUrl, children, authenticityToken } = this.props;
-    const errors = this.renderErrors();
+    const errorsElement = this.getErrorsElement();
 
     return(
       <form action={modelUrl ? modelUrl : modelsUrl} acceptCharset="UTF-8" method="POST" data-shopify-app-submit="ea.save">
@@ -10,12 +10,7 @@ class ModelForm extends BaseForm {
         <input type="hidden" name="_method" value={modelUrl ? 'patch' : 'post'} />
         <input type="hidden" name="authenticity_token" value={authenticityToken}/>
 
-        {(() => {
-          if (!errors) return false;
-          return (
-            {errors}
-          );
-        })()}
+        {errorsElement}
 
         {children}
 

data/app/assets/javascripts/disco_app/components/ui-kit/forms/base_form.es6.jsx

@@ -5,64 +5,36 @@
 class BaseForm extends React.Component {
 
   /**
-   * check if the field parameter has errors associated.
-   * if no parameters are given, it checks if there's at least an error at all
-   **/
-  hasErrors(field) {
-    if ((arguments.length === 0 && this.errorKeys().length > 0) ||
-        (this.props.errors && this.props.errors.errors.indexOf(field) > -1)) {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * returns a list of fields that contain errors
-   **/
-  errorKeys() {
-    return this.props.errors.errors;
-  }
-
-  /**
-   * returns the type of resource associate with this error
-   **/
-  errorType() {
-    return this.props.errors.type;
-  }
-
-  /**
-   * returns the error messages
-   **/
-  errorMessages() {
-    return this.props.errors.messages;
-  }
-
-  /**
-   * renders basic form errors
-   **/
-  renderErrors() {
-    if (!this.hasErrors()) {
+   * Returns the JSX required to render a list of errors.
+   *
+   * @returns {*}
+   */
+  getErrorsElement() {
+    const { errors } = this.props;
+
+    // Don't render anything if no errors present.
+    if(!errors || !errors.errors || (errors.errors.length == 0)) {
       return null;
     }
 
-    var title = "There " + (this.errorMessages().length == 1 ? "is" : "are") + " " + this.errorMessages().length + " error" + (this.errorMessages().length > 1 ? "s" : "") + " for this " + this.errorType() + ":";
-    var errorMessages = this.errorMessages().map(function(message) {
-      return <li>{message}</li>;
-    });
+    const errorCount = errors.errors.length;
+    const singleError = (errorCount == 1);
 
     return (
       <div className="ui-banner ui-banner--status-error ui-banner--default-vertical-spacing ui-banner--default-horizontal-spacing">
         <div className="ui-banner__ribbon">
           <svg className="next-icon next-icon--24" viewBox="0 0 24 24">
-            <path d="M12 0C5.4 0 0 5.4 0 12s5.4 12 12 12 12-5.4 12-12S18.6 0 12 0zm0 4c1.4 0 2.7.4 3.9 1L12 8.8 8.8 12 5 15.9c-.6-1.1-1-2.5-1-3.9 0-4.4 3.6-8 8-8zm0 16c-1.4 0-2.7-.4-3.9-1l3.9-3.9 3.2-3.2L19 8.1c.6 1.1 1 2.5 1 3.9 0 4.4-3.6 8-8 8z"></path>
+            <use xmlns="http://www.w3.org/1999/xlink" xlinkHref="#next-error" />
           </svg>
         </div>
         <div className="ui-banner__content">
           <h2 className="ui-banner__title">
-            {title}
+            There {singleError ? 'is' : 'are'} {errorCount} error{singleError ? '' : 's'} for this {errors.type}:
           </h2>
           <ul>
-            {errorMessages}
+            {errors.messages.map((message, i) => {
+              return <li key={i}>{message}</li>;
+            })}
           </ul>
         </div>
       </div>

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Gavin Ballard