@cocreate/indexeddb 1.4.5 → 1.4.6

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.4.6](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.4.5...v1.4.6) (2022-12-02)
+
+
+### Bug Fixes
+
+* bump @cocreat/utils ([4b4801f](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/4b4801f86ee329182683e96a174eadb8411a64dd))
+* export default ([33e1721](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/33e17219877f692a71d8b8f876751642b157b7b0))
+* if condition for readDocument _id, if condition for count results to prevent error. sortType renamed to direction ([5b3d817](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/5b3d8170a06f001bcd71d00ca9d4284c4039ffaa))
+* if data.organization_id add to document ([55e7ad7](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/55e7ad70c64f0848f99343a73fff0db8376c7938))
+
 ## [1.4.5](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.4.4...v1.4.5) (2022-11-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/indexeddb",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "A simple indexeddb component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "indexeddb",
@@ -61,8 +61,8 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.4.8",
-    "@cocreate/hosting": "^1.6.7",
-    "@cocreate/utils": "^1.12.6"
+    "@cocreate/docs": "^1.4.9",
+    "@cocreate/hosting": "^1.6.8",
+    "@cocreate/utils": "^1.13.0"
   }
 }

package/src/index.js

@@ -710,8 +710,9 @@ function runDocs({action, data, objectStore, documents, filterDocs, database, co
                 
                 if (action == 'updateDocument' || action == 'deleteDocument') {
                     if (doc._id) {
-                        doc['organization_id'] = data.organization_id
-                        doc['modified'] = {on: data.timeStamp, by: data.user || data.clientId}
+                        if (data.organization_id)
+                            doc['organization_id'] = data.organization_id
+                        doc['modified'] = {on: data.timeStamp, by: data.user_id || data.clientId}
 
                         updateDoc(action, data, doc, objectStore, database, collection).then((doc) => {
                             doc.db = 'indexeddb'
@@ -735,13 +736,20 @@ function runDocs({action, data, objectStore, documents, filterDocs, database, co
                             doc['_id'] = ObjectId()
                         doc = dotNotationToObject(doc)
 
-                        doc['organization_id'] = data.organization_id
-                        doc['created'] = {on: data.timeStamp, by: data.user || data.clientId}
+                        if (data.organization_id)
+                            doc['organization_id'] = data.organization_id
+                        doc['created'] = {on: data.timeStamp, by: data.user_id || data.clientId}
                         request = objectStore.add(doc);
                     }
 
-                    if (action == 'readDocument') {
+                    if (action == 'readDocument' && doc._id) {
                         request = objectStore.get(doc._id);
+                    } else {
+                        docsLength -= 1
+                        errorHandler(data, {message: 'requires _id', document: doc}, database, objectStore.name)
+                        if (!docsLength) {                        
+                            resolve()
+                        }
                     }
                     
                     request.onsuccess = function() {
@@ -860,12 +868,14 @@ const readDocuments = (data, database, collection) => {
             try {
                 let transaction = db.transaction([collection], "readonly");
                 let objectStore = transaction.objectStore(collection);
-
-                let count = objectStore.count();
-                count.onsuccess = function() {
-                    data.filter.count = count.result
-                }
                 
+                if (data.filter) {
+                    let count = objectStore.count();
+                    count.onsuccess = function() {
+                        data.filter.count = count.result
+                    }
+                }
+
                 let isIndex = false
                 let indexName;
                 if (data.filter && data.filter.sort && data.filter.sort[0] && data.filter.sort[0].name) {
@@ -878,11 +888,11 @@ const readDocuments = (data, database, collection) => {
                 }
 
                 if (isIndex) {
-                    let sortType = data.filter.sort[0].type
-                    if (sortType == -1)
-                        sortType = 'prev'
+                    let direction = data.filter.sort[0].direction
+                    if (direction == -1)
+                        direction = 'prev'
                     else
-                        sortType = 'next'
+                        direction = 'next'
 
                     let indexNames = Array.from(objectStore.indexNames)
                     let indexExist = indexNames.includes(indexName)
@@ -891,17 +901,22 @@ const readDocuments = (data, database, collection) => {
                         getDatabase({database, upgrade: true}).then((db2) => {
                             let transaction = db2.transaction;
                             let objectStore = transaction.objectStore(collection);
-                            objectStore.createIndex(indexName, indexName, {unique: false})
+                            try {
+                                objectStore.createIndex(indexName, indexName, {unique: false})
+                            } catch(error) {
+                                // console.log(error)
+                            }
                             const indexStore = objectStore.index(indexName);
 
-                            readDocs(data, database, collection, indexStore, isIndex, sortType).then((results) => {
-                                db2.close()
+                            readDocs(data, database, collection, indexStore, isIndex, direction).then((results) => {
+                                if (db2 && db2.close)
+                                    db2.close()
                                 resolve(results)
                             })
                         })
                     } else {
                         const indexStore = objectStore.index(indexName);
-                        readDocs(data, database, collection, indexStore, isIndex, sortType).then((results) => {
+                        readDocs(data, database, collection, indexStore, isIndex, direction).then((results) => {
                             db.close()
                             resolve(results)
                         })
@@ -928,7 +943,7 @@ const readDocuments = (data, database, collection) => {
     })
 }
 
-async function readDocs(data, database, collection, objectStore, isIndex, sortType) {
+async function readDocs(data, database, collection, objectStore, isIndex, direction) {
     return new Promise((resolve, reject) => {
                 
         let results = [], index = 0, limit
@@ -941,7 +956,7 @@ async function readDocs(data, database, collection, objectStore, isIndex, sortTy
                 limit = index + limit;
         }
 
-        const request = objectStore.openCursor(null, sortType);
+        const request = objectStore.openCursor(null, direction);
         request.onsuccess = function() {
             let cursor = request.result;
             if (cursor) {
@@ -1024,10 +1039,9 @@ async function generateDB(data) {
 					},
 					"modules": {
 						"actions": [
-							"login",
-							"signin",
+							"signIn",
+                            "signUp",
 							"userCurrentOrg",
-							"createUser",
 							"createOrg",
 							"runIndustry"
 						],
@@ -1151,7 +1165,7 @@ function init() {
 
 init();
 
-export {
+export default {
     getDatabase,
     createDatabase,
     readDatabase,