@cocreate/elements 1.35.5 → 1.35.6

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.35.6](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.35.5...v1.35.6) (2024-06-19)
+
+
+### Bug Fixes
+
+* add method update.object if upsert and filter ([3730438](https://github.com/CoCreate-app/CoCreate-elements/commit/37304389f0447cd24009c8deb406c48b85974bd7))
+* handle isFIlter false in read function and improved handling of filter and render data ([85b6d00](https://github.com/CoCreate-app/CoCreate-elements/commit/85b6d00c128f27f378e7f5687f5fddf0a01268fe))
+* skip-attribute to prevent form attributes from applying to an element ([72f18b3](https://github.com/CoCreate-app/CoCreate-elements/commit/72f18b3aa7dc929e300ddd225e3d961cc0007400))
+
 ## [1.35.5](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.35.4...v1.35.5) (2024-06-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/elements",
-  "version": "1.35.5",
+  "version": "1.35.6",
   "description": "Fetch content into any html element by using html5 attributes to query data stored in CoCreate headless CMS. If data is changed it will instantly reflect in html tags as changes are broadcasted in realtime",
   "keywords": [
     "elements",

package/src/form.js

@@ -76,7 +76,7 @@ function setAttribute(form, elements) {
         if (variable) {
             for (let el of elements) {
                 // Set the value of the attribute.
-                if (!el.getAttribute(attribute.name)) {
+                if (!el.getAttribute(attribute.name) && !el.hasAttribute('skip-attribute')) {
                     el.setAttribute(attribute.name, form.getAttribute(attribute.name));
                 }
             }

package/src/index.js

@@ -234,7 +234,7 @@ async function read(element, data, dataKey) {
 
     for (let el of element) {
         const isRead = el.getAttribute('read');
-        if (isRead !== 'false' && !el.hasRead) {
+        if (isRead !== 'false' && !el.hasRead && (!data.$filter || data.$filter && data.$filter.isFilter !== false)) {
             el.hasRead = true
             delay.elements.set(el, true)
         } else {
@@ -362,9 +362,6 @@ async function setData(element, data) {
 
         }
 
-        if (!data[type] || !data[type].length)
-            continue;
-
         let action = el.getAttribute('actions')
         if (action && ['database', 'array', 'object', 'key'].includes(action)) continue;
 
@@ -372,6 +369,9 @@ async function setData(element, data) {
         if (el.getFilter || el.renderValue)
             await filterData(el, data, type, key)
         else {
+            if (!data[type] || !data[type].length)
+                continue;
+
             if (key) {
                 let value
                 if (key.includes('$length')) {
@@ -454,11 +454,17 @@ async function filterData(element, data, type, key) {
         }
     }
 
+    let isRendered = element.querySelector('[render-clone]');
+
     if (operator) {
         element.setValue(value);
-    } else if (element.getFilter && data.method && !data.method.endsWith('.read'))
+    } else if (element.renderValue && data.method && data.method.endsWith('.read') && data.$filter && (data.$filter.overwrite || !isRendered)) {
+        await element.renderValue(data);
+    } else if (data.$filter && data.$filter.loadmore || data.method && data.method.endsWith('.read') && isRendered) {
+        await loadMore(element, data, type)
+    } else if (element.getFilter && data.method && !data.method.endsWith('.read')) {
         await checkFilters(element, data, type)
-    else if (element.renderValue) {
+    } else if (element.renderValue) {
         await element.renderValue(data);
     } else if (key === '$length') {
         element.setValue(data[type].length);
@@ -481,6 +487,30 @@ async function filterData(element, data, type, key) {
     element.dispatchEvent(evt);
 }
 
+async function loadMore(element, data, type, sort) {
+    let Data = { ...data };
+    let renderedData = await element.getData();
+    if (!renderedData || !renderedData[type]) {
+        return;
+    }
+    for (let i = 0; i < Data[type].length; i++) {
+        let index;
+        if (type === 'object') {
+            index = renderedData[type].findIndex(obj => obj._id === Data[type][i]._id);
+        } else {
+            index = renderedData[type].findIndex(obj => obj.name === Data[type][i].name);
+        }
+
+        if (index >= 0) {
+            Data[type].splice(i, 1);
+            i--; // Adjust the index to account for the removed item
+        }
+    }
+    if (Data[type].length > 0) {
+        await element.renderValue(Data);
+    }
+}
+
 async function checkFilters(element, data, type) {
     let Data
     if (!element.getData) {
@@ -702,15 +732,30 @@ async function getData(form) {
 
             // console.log(type, value, data)
             if (!Data[Data.type] && Data.key) {
+                if (!value)
+                    continue
+                else if (Array.isArray(value) && !value.length)
+                    continue
+
                 Data.method = Data.type + '.create'
                 if (Data.type === 'object') {
-                    if (typeof Data.object === 'string')
-                        Data.object = { _id: Data.object }
-                    else if (!Data.object)
+                    if (!Data.object)
                         Data.object = {}
+                    else if (typeof Data.object === 'string')
+                        Data.object = { _id: Data.object }
 
-                    if (Data.key)
-                        Data.object[Data.key] = value
+
+                    if (Data.key) {
+                        if (Data.key == '{}') {
+                            if (Array.isArray(value)) {
+                                Data.object = value
+                            } else
+                                Data.object = { ...Data.object, ...value }
+                        } else
+                            Data.object[Data.key] = value
+                    }
+                    if (Data.isUpsert && Data.$filter)
+                        Data.method = 'object.update'
 
                 } else
                     Data[Data.type] = value
@@ -1090,6 +1135,8 @@ Observer.init({
     observe: ['addedNodes'],
     target: '[render-clone]',
     callback: function (mutation) {
+        if (!mutation.parentElement.hasAttribute('dnd'))
+            return
         let delayTimer = debounce.get(mutation)
         clearTimeout(delayTimer);
         debounce.delete(mutation.target)