@cocreate/elements 1.29.0 → 1.30.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.30.0](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.29.1...v1.30.0) (2023-12-18)
+
+
+### Bug Fixes
+
+* spread render import ([19e7abd](https://github.com/CoCreate-app/CoCreate-elements/commit/19e7abdb4ebcccfd05a79d17ad4c8681546b4ce5))
+
+
+### Features
+
+* handle resolved property and set index for create ([5e0d92d](https://github.com/CoCreate-app/CoCreate-elements/commit/5e0d92d37f26e2916f5c2b748d8c571f9814198a))
+
+## [1.29.1](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.29.0...v1.29.1) (2023-12-15)
+
+
+### Bug Fixes
+
+* handle arrays ([7ea1e12](https://github.com/CoCreate-app/CoCreate-elements/commit/7ea1e12d89d95aae1dca23b38d80b899fa4cddd6))
+
 # [1.29.0](https://github.com/CoCreate-app/CoCreate-elements/compare/v1.28.0...v1.29.0) (2023-11-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/elements",
-  "version": "1.29.0",
+  "version": "1.30.0",
   "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

@@ -27,7 +27,7 @@ import Actions from '@cocreate/actions';
 import CRUD from '@cocreate/crud-client';
 import { dotNotationToObject, queryElements, queryData, sortData, getAttributes, getAttributeNames, checkValue } from '@cocreate/utils';
 import filter from '@cocreate/filter';
-import render from '@cocreate/render';
+import { render, renderValue, renderedNodes } from '@cocreate/render';
 import '@cocreate/element-prototype';
 import './fetchSrc';
 import { reset } from './form'
@@ -86,13 +86,13 @@ async function initElement(el) {
         // if found add the node as an element, if the element has crud attributes also add as the element
         for (let attribute of el.attributes) {
             if (attribute.match(/{{(.*?)}}/)) {
-                let value = render.renderValue(attribute, undefined, attribute.value)
+                let value = renderValue(attribute, undefined, attribute.value)
                 if (value)
                     attribute.value = value
             }
         }
         if (el.innerHTML.match(/{{(.*?)}}/)) {
-            let value = render.renderValue(el, undefined, el.innerHTML)
+            let value = renderValue(el, undefined, el.innerHTML)
             if (value)
                 attribute.value = value
         }
@@ -333,6 +333,12 @@ async function filterData(element, data, type, key) {
         if (Array.isArray(data[type])) {
             let Data = []
             for (let doc of data[type]) {
+                // TODO: should have been handled by getDataElements()
+                if (type === 'object') {
+                    let _id = element.getAttribute('object')
+                    if (_id && doc._id !== _id)
+                        return
+                }
                 if (doc[key]) {
                     if (Array.isArray(doc[key]))
                         Data.push(...doc[key])
@@ -435,6 +441,8 @@ function checkIndex(element, data, Data, newData, type, filter) {
                 data.$filter.create = true
                 if (filter && filter.sort)
                     newData.isNewData = true
+                else
+                    index = Data.length
                 Data.push(newData)
             }
         } else {
@@ -525,11 +533,6 @@ function getDataKeys(data) {
                         const matches = sortedKey.data[key].some(value => {
                             if (key === 'object') {
                                 return data[key].some(obj => {
-                                    if (data.array.includes('users'))
-                                        console.log('users')
-                                    if (data.array.includes('questions'))
-                                        console.log('questions')
-
                                     return obj._id === value._id
                                 });
                             } else {
@@ -602,13 +605,20 @@ async function getData(form) {
                     }
                 }
 
-
                 if (Data.type = 'object') {
                     if (typeof Data[Data.type] === 'string')
                         if (Data.key == '{}')
                             Data[Data.type] = { _id: Data[Data.type], ...value }
                         else
                             Data[Data.type] = { _id: Data[Data.type], [Data.key]: value }
+                    else if (Array.isArray(Data[Data.type]))
+                        if (Data.key == '{}')
+                            Data[Data.type][0] = { ...Data[Data.type][0], ...value }
+                        else {
+                            Data[Data.type][0][Data.key] = value
+                            if (!Data[Data.type][0]._id)
+                                Data.method = Data.type + '.create'
+                        }
                     else if (typeof Data[Data.type] === 'object')
                         if (Data.key == '{}')
                             Data[Data.type] = { ...Data[Data.type], ...value }
@@ -937,6 +947,8 @@ function initSocket() {
             const action = type[i] + '.' + method[j];
 
             CRUD.listen(action, function (data) {
+                if (data.resolved && data.status === 'received' && CRUD.socket.clientId === data.clientId)
+                    return
                 setData(null, data);
             });
         }
@@ -952,7 +964,7 @@ Observer.init({
         clearTimeout(delayTimer);
         debounce.delete(mutation.target)
 
-        let renderedNode = render.renderedNodes.get(mutation.target)
+        let renderedNode = renderedNodes.get(mutation.target)
         if (!renderedNode) return
 
         if (!mutation.movedFrom) return
@@ -1059,7 +1071,7 @@ function dndNewData(element, data) {
 
     let keyPath, clonesMap, clones, index
 
-    let renderedNode = render.renderedNodes.get(element)
+    let renderedNode = renderedNodes.get(element)
     if (renderedNode) {
         keyPath = renderedNode.keyPath
         clonesMap = renderedNode.template.clones