@cocreate/organizations 1.6.12 → 1.7.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.7.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.6.12...v1.7.0) (2022-11-21)
+
+
+### Bug Fixes
+
+* crud.getAttr renamed to crud.getAttributes ([10ea025](https://github.com/CoCreate-app/CoCreate-organizations/commit/10ea025048686e6b3bceeb0a675d5ff0d3370ca1))
+* filter-order attributes renamed to filter-sort ([e116902](https://github.com/CoCreate-app/CoCreate-organizations/commit/e11690208f46517364e6594b3343a76a06a89bd4))
+* renamed {{data.key}} to {{document.key}} ([f4712a5](https://github.com/CoCreate-app/CoCreate-organizations/commit/f4712a5d77b4525ff5544315f32013dc07c13d33))
+* renamed crud.checkAttrValue to crud.checkValue ([62e99ce](https://github.com/CoCreate-app/CoCreate-organizations/commit/62e99ce433928ce3200ba75b811e0b288f1bf964))
+* renamed data.data to data.document ([50b924c](https://github.com/CoCreate-app/CoCreate-organizations/commit/50b924cddcf93bef9c473072967a0b2fa1dc7dd7))
+* renamed getSocket to getSockets ([02a2dc5](https://github.com/CoCreate-app/CoCreate-organizations/commit/02a2dc583ebfe9754a2518729d998c42b9d96a2b))
+* update crud functions to receive an array of objects as the response ([1b07d3d](https://github.com/CoCreate-app/CoCreate-organizations/commit/1b07d3d90be082114db5ac96b1d0c6c13918e0f5))
+
+
+### Features
+
+* Add @cocreate/element-prototype ([a0b71df](https://github.com/CoCreate-app/CoCreate-organizations/commit/a0b71dfaed1204836eea9f32a111d6bb8b6594e4))
+* updated to use new crud which has the abilty to use multiple databases ([b405e32](https://github.com/CoCreate-app/CoCreate-organizations/commit/b405e321d89859f624ad99d23581ca767d3eba88))
+
 ## [1.6.12](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.6.11...v1.6.12) (2022-10-02)
 
 

package/demo/index.html

@@ -76,8 +76,8 @@
 									<ul fetch-collection="industries" 
 									    template_id="industries"
 									    class="options overflow:auto">
-										<li class="template option" template_id="industries" value="{{data._id}}">
-											<h4 collection="industries" document_id="{{data._id}}" name="name">industry name</h4>
+										<li class="template option" template_id="industries" value="{{document._id}}">
+											<h4 collection="industries" document_id="{{document._id}}" name="name">industry name</h4>
 										</li>
 									</ul>
 	                            </cocreate-select>

package/demo/industries/industry-datatable.html

@@ -19,7 +19,7 @@
            	  placeholder="Industry Name">
               <span class="position:absolute bottom:18px right:20px float:right font-size:18px z-index:6">
                 <!-- need a solution to update toggle value="desc|asc" and define and upadte icons... show hide works great but to much html and orderby only has 2 values -->
-                <a filter-order-name="name" toggle-order template_id="datatable">
+                <a filter-sort-name="name" toggle-order template_id="datatable">
                   <i></i>
                 </a>
               </span>
@@ -32,7 +32,7 @@
    			      template_id="datatable" 
            	  placeholder="Industry_id"/>
               <span class="position:absolute bottom:18px right:20px float:right font-size:18px z-index:6" >
-                <a filter-order-name="_id" value="" toggle-order="true" template_id="datatable">
+                <a filter-sort-name="_id" value="" toggle-order="true" template_id="datatable">
                 </a>
               </span>
           </td>
@@ -42,8 +42,8 @@
           fetch-collection="industries"
           fetch-name="" 
           filter-value=""
-          filter-order-name="name" 
-          filter-order-type="asc"
+          filter-sort-name="name" 
+          filter-sort-type="asc"
           template_id="datatable">
           
           <tr class="template background:gainsboro:hover border-bottom:1px_solid_darkgray">
@@ -55,12 +55,12 @@
     					  <div>
       						<a target="modal" href="render.html" 
       						   pass-collection="module_activity"
-      						   pass-document_id="{{data._id}}"
+      						   pass-document_id="{{document._id}}"
       						   pass-prefix="form_"
       						   pass_to="form-fields" 
       						   modal-width="320px" 
       						   modal-color="#229954">
-      						  <h4 collection="{{collection}}" pass-document_id="{{data._id}}" name="name">Name</h4>
+      						  <h4 collection="{{document.collection}}" pass-document_id="{{document._id}}" name="name">Name</h4>
       						  <div pass-collection="modules"
           						   pass-document_id=""
       						       pass-prefix="form_"
@@ -69,7 +69,7 @@
       						    
       						  </div>
       						</a>
-      						  <h5 collection="{{collection}}" pass-document_id="{{data._id}}" name="description"></h5>
+      						  <h5 collection="{{document.collection}}" pass-document_id="{{document._id}}" name="description"></h5>
     					  </div>
   					  </div>
   					</td>
@@ -81,7 +81,7 @@
   						   pass_to="form-fields" 
   						   modal-width="320px" 
   						   modal-color="#229954">
-  					     <b collection="{{collection}}" pass-document_id="{{data._id}}" name="_id">Industry Id</b>
+  					     <b collection="{{document.collection}}" pass-document_id="{{document._id}}" name="_id">Industry Id</b>
   						    <div pass-collection="module_activity"
       						   pass-document_id=""
   						       pass-prefix="form_"

package/demo/industries/industry-documents-datatable.1.html

@@ -21,7 +21,7 @@
            	  placeholder="Industry Name">
               <span class="position:absolute bottom:18px right:20px float:right font-size:18px z-index:6">
                 <!-- need a solution to update toggle value="desc|asc" and define and upadte icons... show hide works great but to much html and orderby only has 2 values -->
-                <a filter-order-name="name" toggle-order template_id="datatable">
+                <a filter-sort-name="name" toggle-order template_id="datatable">
                   <i></i>
                 </a>
               </span>
@@ -34,7 +34,7 @@
    			      template_id="datatable" 
            	  placeholder="Industry_id"/>
               <span class="position:absolute bottom:18px right:20px float:right font-size:18px z-index:6" >
-                <a filter-order-name="_id" value="" toggle-order="true" template_id="datatable">
+                <a filter-sort-name="_id" value="" toggle-order="true" template_id="datatable">
                 </a>
               </span>
           </td>
@@ -46,8 +46,8 @@
           filter-value=""
           filter-value-type="or"
           fetch-count=""
-          filter-order-name="name" 
-          filter-order-type="asc"
+          filter-sort-name="name" 
+          filter-sort-type="asc"
           template_id="datatable"
           pass_to="me1234">
           

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.6.12",
+  "version": "1.7.0",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -64,7 +64,7 @@
     "@cocreate/actions": "^1.5.12",
     "@cocreate/crud-client": "^1.12.12",
     "@cocreate/docs": "^1.3.18",
-    "@cocreate/elements": "^1.12.11",
+    "@cocreate/element-prototype": "^1.0.0",
     "mongodb": "^4.4.0"
   }
 }

package/src/client.js

@@ -1,13 +1,19 @@
-import crud from '@cocreate/crud-client';
-// import input from '@cocreate/elements'
+import CRUD from '@cocreate/crud-client';
+import '@cocreate/element-prototype';
 import action from '@cocreate/actions';
 import uuid from '@cocreate/uuid';
 
+let crud
+if(CRUD && CRUD.default)
+	crud = CRUD.default
+else
+	crud = CRUD
+
 const CoCreateOrganization = {
 	init: function() {
 		const self = this;
 		crud.listen('createOrg', function(data) {
-			self.setDocumentId('organizations', data.document_id);
+			self.setDocumentId('organizations', data.document[0]._id);
 			document.dispatchEvent(new CustomEvent('createdOrg', {
 				detail: data
 			}));
@@ -20,7 +26,7 @@ const CoCreateOrganization = {
 		
 		let elements = form.querySelectorAll("[collection='organizations'][name]");
 		
-		let data = {data: {}};
+		let data = {document: {}};
 		//. get form data
 		elements.forEach(el => {
 			let name = el.getAttribute('name');
@@ -29,19 +35,19 @@ const CoCreateOrganization = {
 			if (el.getAttribute('data-type') == 'array') {
 				value = [value];
 			}
-			data.data[name] = value;
+			data.document[name] = value;
 		});
 		
-		const socket = crud.socket.getSocket()
-		if (!socket || !socket.connected || window && !window.navigator.onLine) {
+		const socket = crud.socket.getSockets()
+		if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine) {
 			data.collection = 'organizations'
-			data.data['_id'] = ObjectId()
-			data.data['name'] = 'untitled'
+			data.document['_id'] = ObjectId()
+			data.document['name'] = 'untitled'
 			window.localStorage.setItem('apiKey', uuid(32));
 			window.localStorage.setItem('organization_id', data['_id']);	
 			crud.createDocument(data).then((response) => {
-				data.database = data.data['_id']
-				data.organization_id = data.data['_id']
+				data.database = data.document[0]['_id']
+				data.organization_id = data.document[0]['_id']
 				crud.createDocument(data).then((response) => {
 					
 					document.dispatchEvent(new CustomEvent('createOrg', {
@@ -51,9 +57,9 @@ const CoCreateOrganization = {
 				})	
 			})
 		} else {
-			crud.send('createOrg', {
+			crud.socket.send('createOrg', {
 				collection: 'organizations',
-				data: data
+				...data
 			});
 		}
 	},
@@ -73,12 +79,12 @@ const CoCreateOrganization = {
 	},
 	
 	deleteOrg: async function(btn) {
-		const { collection, document_id } = crud.getAttr(btn);
+		const { collection, document_id } = crud.getAttributes(btn);
 		const organization_id = document_id;
 
-		if(crud.checkAttrValue(collection) && crud.checkAttrValue(document_id)) {
+		if(crud.checkValue(collection) && crud.checkValue(document_id)) {
 
-			crud.send('deleteOrg', {
+			crud.socket.send('deleteOrg', {
 				collection,
 				document_id,
 				data: {
@@ -97,7 +103,7 @@ const CoCreateOrganization = {
 
 	deleteOrgs: async function(btn) {
 		const collection = btn.getAttribute('collection');
-		if(crud.checkAttrValue(collection)) {
+		if(crud.checkValue(collection)) {
 			const dataTemplateid = btn.getAttribute('template_id');
 			if(!dataTemplateid) return;
 
@@ -107,8 +113,8 @@ const CoCreateOrganization = {
 				const document_id = el.getAttribute('document_id');
 				const organization_id = document_id;
 
-				if(crud.checkAttrValue(document_id)) {
-					crud.send('deleteOrg', {
+				if(crud.checkValue(document_id)) {
+					crud.socket.send('deleteOrg', {
 						collection,
 						document_id,
 						data: {

package/src/server.js

@@ -1,9 +1,7 @@
-const {ObjectId} = require("mongodb");
-
 class CoCreateOrganization {
-	constructor(wsManager, dbClient) {
+	constructor(wsManager, crud) {
 		this.wsManager = wsManager
-		this.dbClient = dbClient
+		this.crud = crud
 		this.init()
 	}
 	
@@ -20,33 +18,24 @@ class CoCreateOrganization {
 
 	async createOrg(socket, data) {
 		const self = this;
-		if(!data.data) return;
 		
 		try{
-			const collection = this.dbClient.db(data.organization_id).collection(data.collection);
 			// create new org in config db organization collection
-			// ToDo: if data.data._id create org in platformDB
-			collection.insertOne({ ...data.data, organization_id: data.organization_id }, function(error, result) {
-				if(!error && result){
-					const orgId = `${result.insertedId}`
-					data.data['_id'] = result.insertedId
-					
-					const anotherCollection = self.dbClient.db(orgId).collection(data['collection']);
-					// Create new org db and insert organization
-					anotherCollection.insertOne({...data.data, organization_id : orgId});
-					
-					const response  = { ...data, document_id: orgId }
+			this.crud.createDocument(data).then((data) => {
+				const orgId = `${data.document[0]._id}`
+				
+				// Create new org db and insert organization
+				self.crud.createDocument({...data, database: orgId, organization_id: orgId}).then((data) => {
+					self.wsManager.send(socket, 'createOrg', data);
+					self.wsManager.broadcast(socket, 'createDocument', data);	
+				})
 
-					self.wsManager.send(socket, 'createOrg', response);
-					self.wsManager.broadcast(socket, 'createDocument', response);
-
-					// add new org to platformDB
-					if (data.organization_id != process.env.organization_id) {	
-						const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
-						platformDB.insertOne({...data.data, organization_id: process.env.organization_id});
-					}	
+				// add new org to platformDB
+				if (data.organization_id != process.env.organization_id) {	
+					self.crud.createDocument({ ...data, database: process.env.organization_id, organization_id: process.env.organization_id })
 				}
-			});
+	
+			})
 		}catch(error){
 			console.log('createDocument error', error);
 		}
@@ -55,33 +44,33 @@ class CoCreateOrganization {
 	
 	async deleteOrg(socket, data) {
 		const self = this;
-		if(!data.data) return;
 		const organization_id = data.data.organization_id
-		if(!organization_id || organization_id == process.env.organization_id) return;
-		if(data.organization_id != process.env.organization_id) return;
-		try{
-			const db = this.dbClient.db(organization_id);
-			db.dropDatabase().then(response => {
+		if (!organization_id || organization_id == process.env.organization_id) return;
+		if (data.organization_id != process.env.organization_id) return;
+
+		try {
+			this.crud.deleteDatabase(data).then((response) => {
 				if (response === true){
 					process.emit('deleteOrg', organization_id)
-
+					self.wsManager.send(socket, 'deleteOrg', data);
+					
 					// delete org from platformDB
-					const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
-					const query = {
-						"_id": new ObjectId(organization_id)
+					const request = {
+						database: process.env.organization_id, 
+						collection: 'organization',
+						document: {
+							_id: organization_id
+						},
+						organization_id: process.env.organization_id
 					};
 		
-					platformDB.deleteOne(query, function(error, result) {
-						if (!error) {
-							let response = { ...data }
-							self.wsManager.send(socket, 'deleteOrg', response);
-							self.wsManager.broadcast(socket, 'deleteDocument', response);
-						} else {
-							self.wsManager.send(socket, 'ServerError', error);
-						}
+					self.crud.deleteDocument(request).then((data) => {
+						self.wsManager.broadcast(socket, 'deleteDocument', data)
 					})
 				}	
+
 			})
+			
 		}catch(error){
 			console.log('deleteOrg error', error);
 		}