@cocreate/crdt 1.8.20 → 1.8.24

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [1.8.24](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.23...v1.8.24) (2021-11-26)
+
+
+### Bug Fixes
+
+* add nav and sidenav to docs ([4749696](https://github.com/CoCreate-app/CoCreate-crdt/commit/47496966a2faa8dd1b7b999a8592a09d56c8d516))
+* updated action dependency to actions ([04c3728](https://github.com/CoCreate-app/CoCreate-crdt/commit/04c3728d8e5e575baecf70db57e8f9137a0fc95e))
+
+## [1.8.23](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.22...v1.8.23) (2021-11-26)
+
+
+### Bug Fixes
+
+* getDocs will request generateText with changeLog true or false ([2309736](https://github.com/CoCreate-app/CoCreate-crdt/commit/230973632f96a8a65f1bea430e626a8a7e6223af))
+
+## [1.8.22](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.21...v1.8.22) (2021-11-23)
+
+
+### Bug Fixes
+
+* update dependencies ([e4f1d13](https://github.com/CoCreate-app/CoCreate-crdt/commit/e4f1d136b47f11120a61ddaa91dd782cdd42ab5d))
+
+## [1.8.21](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.20...v1.8.21) (2021-11-23)
+
+
+### Bug Fixes
+
+* await generateText ([917dd9a](https://github.com/CoCreate-app/CoCreate-crdt/commit/917dd9acdeae8b6dc9185aa2049dd28b0337e3eb))
+
 ## [1.8.20](https://github.com/CoCreate-app/CoCreate-crdt/compare/v1.8.19...v1.8.20) (2021-11-22)
 
 

package/docs/index.html

@@ -17,7 +17,13 @@
     </head>
 
     <body>
-        <div collection="" document_id="" name="" id="cocreate-crdt">
+		<nav class="nav display:flex align-items:center left:0px background:whitesmoke padding-top:10px padding-bottom:10px" content_id="content" scroll="sticky-nav,hide-nav" scroll-up="10" scroll-down="10" collection="files" document_id="60395ef42b3ac232657040fd" name="src">
+		</nav>
+		<sidenav id="menuL" class="position:fixed top:0px left:0px overflow:hidden background:whitesmoke height:100vh width:0px width:300px@xl" resizable resize-target="[content_id='content']" resize-property="margin-left" resize-value="width">
+			<menu collection="files" document_id="603717b07de7fb350ae9fec8" name="src"></menu>
+			<div resize="right"></div>
+	    </sidenav>
+        <main class="padding-top:15px padding:15px@lg@xl" content_id="content" id="cocreate-crdt">
             <div class="display:flex flex-wrap:wrap justify-content:space-between margin:10px">
                 <div class="display:flex align-items:center">
                     <h2>CoCreate-crdt</h2>
@@ -112,7 +118,7 @@
                 </div>
                 
             </div>				
-        </div>
+        </main>
 
 		<script src="/apikey.js"></script>
         <script src="https://cdn.cocreate.app/latest/CoCreate.min.js" ></script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crdt",
-  "version": "1.8.20",
+  "version": "1.8.24",
   "description": "CoCreate crdt",
   "author": "CoCreate LLC",
   "license": "SEE LICENSE",
@@ -43,9 +43,9 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/action": "^1.3.15",
-    "@cocreate/crud-client": "^1.4.29",
-    "@cocreate/message-client": "^1.1.49",
-    "@cocreate/utils": "^1.3.10"
+    "@cocreate/actions": "^1.3.18",
+    "@cocreate/crud-client": "^1.4.34",
+    "@cocreate/message-client": "^1.1.52",
+    "@cocreate/utils": "^1.3.12"
   }
 }

package/src/index.js

@@ -34,7 +34,6 @@ async function getDoc(info) {
 		
 		if (!docs.get(docName).get(typeName).has('changeLog')) {
 			let changeLog = [];
-			docs.get(docName).get(typeName).set('changeLog', changeLog);
 			
 			if (info.read != 'false') {
 				let response = await crud.readDocumentList({		      
@@ -49,10 +48,13 @@ async function getDoc(info) {
 				});
 				if (response.data.length && response.data[0][typeName]) {
 					changeLog = response.data[0][typeName];
-					docs.get(docName).get(typeName).set('changeLog', changeLog);
 				}
+				docs.get(docName).get(typeName).set('changeLog', changeLog);
+				await generateText(info, true);
 			}
-			generateText(info);
+		}
+		else if (!docs.get(docName).get(typeName).has('text')){
+			await generateText(info, false);
 		}
 		return true;
 	}
@@ -65,7 +67,7 @@ String.prototype.customSplice = function (index, absIndex, string) {
     return this.slice(0, index) + string+ this.slice(index + Math.abs(absIndex));
 };
 
-async function generateText(info) {
+async function generateText(info, flag) {
 	try {
 		let name = docs.get(`${info.collection}${info.document_id}`).get(info.name);
 		let string = '';
@@ -73,26 +75,27 @@ async function generateText(info) {
 		for (let change of changeLog) {
 			string = string.customSplice(change.start, change.length, change.value);
 		}
+		if (string == '' && info.read != 'false'){
+			string = await checkDb(info, flag);
+		}
 		name.set('text', string);
-		if (string == '' && info.read != 'false')
-			checkDb(info);
+		return;
 	}
 	catch (e) {
 		console.error(e);
 	}
 }
 
-function checkDb(info) {
+async function checkDb(info, flag) {
 	let { collection, document_id, name } = info;
-	crud.readDocument({ collection, document_id, name }).then(response => {
-		if (!response) return;
-		let string = response.data[name];
-		if (string) {
-			info.value = string;
-			info.start = 0;
-			insertChange(info);
-		}
-	});
+	let response = await crud.readDocument({ collection, document_id, name })
+	let string = response.data[name];
+	if (string && flag != false) {
+		info.value = string;
+		info.start = 0;
+		insertChange(info);
+	}
+	return string || '';
 }
 
 function insertChange(info, broadcast, flag) {
@@ -228,7 +231,13 @@ async function getText(info) {
 		let typeName = info.name;
 		let doc = await getDoc(info);
 		if (doc) {
-			return docs.get(docName).get(typeName).get('text');
+			let value = docs.get(docName).get(typeName).get('text')
+			if (!value)
+			console.log(value)
+			return value;
+		}
+		else {
+			console.log('undefined')
 		}
 	}
 	catch (e) {