saasufy-components 5.8.0 → 6.0.1

package/collection-reducer.js

@@ -138,6 +138,7 @@ class CollectionReducer extends SocketConsumer {
 
   renderReduction() {
     let viewportSlot = this.shadowRoot.querySelector('slot[name="viewport"]');
+    if (!viewportSlot) return;
 
     let viewportNode = viewportSlot.assignedNodes()[0];
     if (!viewportNode) return;
@@ -176,11 +177,19 @@ class CollectionReducer extends SocketConsumer {
   }
 
   render() {
+    if (
+      !this.hasAttribute('collection-type') ||
+      !this.hasAttribute('collection-fields') ||
+      !this.hasAttribute('collection-view') ||
+      !this.getAttribute('collection-view-params')
+    ) {
+      return;
+    };
     let collectionType = this.getAttribute('collection-type');
     let collectionFields = this.getAttribute('collection-fields') || '';
-    let collectionView = this.getAttribute('collection-view');
-    let collectionPageSize = this.getAttribute('collection-page-size');
+    let collectionView = this.getAttribute('collection-view') || 'defaultView';
     let collectionViewParams = this.getAttribute('collection-view-params') || '';
+    let collectionPageSize = this.getAttribute('collection-page-size');
     let collectionPageOffset = this.getAttribute('collection-page-offset');
     let collectionGetCount = this.hasAttribute('collection-get-count');
     let hideErrorLogs = this.hasAttribute('hide-error-logs');

package/collection-viewer.js

@@ -201,6 +201,7 @@ class CollectionViewer extends SocketConsumer {
 
   renderList() {
     let viewportSlot = this.shadowRoot.querySelector('slot[name="viewport"]');
+    if (!viewportSlot) return;
 
     let viewportNode = viewportSlot.assignedNodes()[0];
     if (!viewportNode) return;
@@ -271,12 +272,20 @@ class CollectionViewer extends SocketConsumer {
   }
 
   render() {
+    if (
+      !this.hasAttribute('collection-type') ||
+      !this.hasAttribute('collection-fields') ||
+      !this.hasAttribute('collection-view') ||
+      !this.getAttribute('collection-view-params')
+    ) {
+      return;
+    };
     let collectionType = this.getAttribute('collection-type');
     let collectionFields = this.getAttribute('collection-fields') || '';
     let collectionView = this.getAttribute('collection-view') || 'defaultView';
-    let collectionPageSize = this.getAttribute('collection-page-size');
     let collectionViewParams = this.getAttribute('collection-view-params') || '';
     let collectionViewPrimaryFields = this.getAttribute('collection-view-primary-fields');
+    let collectionPageSize = this.getAttribute('collection-page-size');
     let collectionPageOffset = this.getAttribute('collection-page-offset');
     let collectionGetCount = this.hasAttribute('collection-get-count');
     let hideErrorLogs = this.hasAttribute('hide-error-logs');

package/model-input.js

@@ -105,6 +105,13 @@ class ModelInput extends SocketConsumer {
   }
 
   render() {
+    if (
+      !this.hasAttribute('model-type') ||
+      !this.hasAttribute('model-id') ||
+      !this.hasAttribute('model-field')
+    ) {
+      return;
+    };
     this.innerHTML = '';
     let socketInstanceProperty = this.getAttribute('socket-instance-property');
     let showErrorMessage = this.hasAttribute('show-error-message');

package/model-text.js

@@ -47,6 +47,13 @@ class ModelText extends SocketConsumer {
   }
 
   render() {
+    if (
+      !this.hasAttribute('model-type') ||
+      !this.hasAttribute('model-id') ||
+      !this.hasAttribute('model-field')
+    ) {
+      return;
+    };
     this.innerHTML = '';
     let socketInstanceProperty = this.getAttribute('socket-instance-property');
     let modelType = this.getAttribute('model-type');

package/model-viewer.js

@@ -54,6 +54,7 @@ class ModelViewer extends SocketConsumer {
 
   renderItem() {
     let viewportSlot = this.shadowRoot.querySelector('slot[name="viewport"]');
+    if (!viewportSlot) return;
 
     let viewportNode = viewportSlot.assignedNodes()[0];
     if (!viewportNode) return;
@@ -89,6 +90,13 @@ class ModelViewer extends SocketConsumer {
   }
 
   render() {
+    if (
+      !this.hasAttribute('model-type') ||
+      !this.hasAttribute('model-id') ||
+      !this.hasAttribute('model-fields')
+    ) {
+      return;
+    };
     let socketInstanceProperty = this.getAttribute('socket-instance-property');
     let modelType = this.getAttribute('model-type');
     let modelId = this.getAttribute('model-id');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saasufy-components",
-  "version": "5.8.0",
+  "version": "6.0.1",
   "description": "Components for Saasufy.",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -232,7 +232,7 @@ let templateFormatters = {
     return list.map(item => item[field]).join(sep);
   },
   combineFilters: (filterMap, useOr) => {
-    return Object.values(filterMap || {}).join(useOr ? ' %OR% ' : ' %AND% ');
+    return Object.values(filterMap || {}).join(useOr ? ' ~OR~ ' : ' ~AND~ ');
   },
   computeId,
   safeString: toSafeHTML
@@ -373,7 +373,7 @@ export function generateRandomHexString(byteLength) {
   }).join('');
 }
 
-export const fieldPartsRegExp = /("[^"]*"|'[^']*'|\([^)]*\)|[^,()"']+)+/g;
+export const fieldPartsRegExp = /((^|(?<=,))((?=,)|$)|"[^"]*"|'[^']*'|\([^)]*\)|[^,()"']+)+/g
 export const quotedContentRegExp = /^\s*["']?(.*?)["']?\s*$/;
 
 export function toBoolean(value) {