@cocreate/elements 1.35.2 → 1.35.4

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.35.4](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.35.3...v1.35.4) (2024-05-19)
+
+
+### Bug Fixes
+
+* handle if item is already read ([2407f9b](https://github.com/CoCreate-app/CoCreate-elements/commit/2407f9b3789173fddb8f8ed6b4bb90f7f8d17864))
+
+## [1.35.3](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.35.2...v1.35.3) (2024-05-08)
+
+
+### Bug Fixes
+
+* handling of data upsert ([9884f90](https://github.com/CoCreate-app/CoCreate-elements/commit/9884f90b3b9e0016b266a36e6e5b377dc93fc6b7))
+* replace form object attribute with id if pending ([33838fb](https://github.com/CoCreate-app/CoCreate-elements/commit/33838fbe3e12f6a6b4e8fbcaa76822315b61ccdd))
+* typo with for loop index j ([8872c9f](https://github.com/CoCreate-app/CoCreate-elements/commit/8872c9f7b009638018ac48ffec41898a618b0cdd))
+
 ## [1.35.2](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.35.1...v1.35.2) (2024-04-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/elements",
-  "version": "1.35.2",
+  "version": "1.35.4",
   "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/index.js

@@ -78,13 +78,19 @@ async function init(element) {
             read(Array.from(elements.keys()), data, { string: key });
         }
     }
+
+    // const evt = new CustomEvent('elementsInitialized', { bubbles: true });
+    // document.dispatchEvent(evt);
+
 }
 
 async function initElement(el) {
     // if (el.closest('.template')) return;
 
     let data = getObject(el);
-    if (!data || !data.type) return
+    if (!data || !data.type)
+        return
+
     if (data.object && data.object !== 'pending' && !(/^[0-9a-fA-F]{24}$/.test(data.object)))
         return
 
@@ -113,6 +119,7 @@ async function initElement(el) {
 
         el.setFilter = (filter) => {
             data.$filter = filter
+            el.hasRead = false
             // let dataKey = initDataKey(el, data)
             read(el, data)
         }
@@ -134,7 +141,7 @@ function getObject(element) {
             data[crudType[i]] = []
 
             for (let j = 0; j < array.length; j++) {
-                array[i].trim()
+                array[j].trim()
                 if (crudType[i] === 'object') {
                     data[crudType[i]].push({ _id: array[j] })
                 } else {
@@ -227,8 +234,12 @@ async function read(element, data, dataKey) {
 
     for (let el of element) {
         const isRead = el.getAttribute('read');
-        if (isRead !== 'false')
+        if (isRead !== 'false' && !el.hasRead) {
+            el.hasRead = true
             delay.elements.set(el, true)
+        } else {
+            console.log('read skipped', el)
+        }
     }
 
     if (!delay.elements.size)
@@ -247,8 +258,18 @@ async function read(element, data, dataKey) {
                     data.object = { _id: data.object[0]._id }
             } else if (!data.object._id.match(/^[0-9a-fA-F]{24}$/))
                 return
+            // if (data.object._id.startsWith('$'))
+            //     return
         }
 
+        // if (data.object && !Array.isArray(data.object) && data.object._id.startsWith('$'))
+        //     return
+
+        // if (data.$filter && data.$filter.query) {
+        //     if (!Object.keys(data.$filter.query).length)
+        //         return
+        // }
+
         data.method = data.type + '.read'
 
         CRUD.send(data).then((Data) => {
@@ -393,7 +414,7 @@ async function filterData(element, data, type, key) {
         let property = key.replace(operator + '.', '')
 
         if (Array.isArray(data[type])) {
-            let Data = []
+            let Data = [], isObject
             for (let doc of data[type]) {
                 // TODO: should have been handled by getDataElements()
                 if (type === 'object') {
@@ -410,14 +431,17 @@ async function filterData(element, data, type, key) {
                 if (doc[property]) {
                     if (Array.isArray(doc[property]))
                         Data.push(...doc[property])
-                    else
+                    else {
+                        isObject = true
                         Data.push(doc[property])
+                    }
                 } else
                     return
             }
-            // if (Data.length === 1) {
+
+            // if (isObject && Data.length === 1) {
             //     data = { [property]: Data[0] }
-            // } else
+            // } else 
             if (!operator)
                 data = Data
             else if (operator === '$sum') {
@@ -863,6 +887,11 @@ async function save(element) {
             }
         }
 
+        if (data[i].isUpsert) {
+            data[i].upsert = true
+            delete data[i].isUpsert
+        }
+
         if (data[i].method && data[i].method.endsWith('.create')) {
             element.setAttribute(data[i].type, 'pending');
         } else if (data[i].method && data[i].method.endsWith('.update') && data[i].type == 'object' && typeof value == 'string' && window.CoCreate.crdt && !'crdt') {
@@ -910,6 +939,9 @@ function setTypeValue(element, data) {
         }
     } else {
         let formObject = forms.get(form)
+        if (form.getAttribute('object') === 'pending')
+            form.setAttribute('object', data.object[0]._id)
+
         let elements = formObject.types.get(data.type)
 
         for (let [el, Data] of elements.entries()) {