@cocreate/organizations 1.11.8 → 1.12.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.12.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.11.9...v1.12.0) (2023-05-10)
+
+
+### Features
+
+* createOrg in local and platform ([85f62ed](https://github.com/CoCreate-app/CoCreate-organizations/commit/85f62ed74f511f3f15acbe3aa6825c314abde46d))
+
+## [1.11.9](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.11.8...v1.11.9) (2023-05-07)
+
+
+### Bug Fixes
+
+* crud.wsManger ([88c9be9](https://github.com/CoCreate-app/CoCreate-organizations/commit/88c9be98665f6f29fdf2212fac27634471e6996e))
+
 ## [1.11.8](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.11.7...v1.11.8) (2023-05-06)
 
 

package/demo/industries/industry-datatable.html

@@ -33,7 +33,7 @@
    			      template_id="datatable" 
            	  placeholder="Industry_id"/>
               <span class="position:absolute bottom:20px right:20px float:right z-index:6" >
-                <a filter-sort-name="_id" value="" filter-sort-direction="asc" icon click-value="desc, asc" click-attribute="filter-sort-direction" template_id="datatable">
+                <a filter-sort-name="_id" value="" filter-sort-direction="asc" click-value="desc, asc" click-attribute="filter-sort-direction" template_id="datatable">
                 </a>
               </span>
           </td>

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

@@ -35,7 +35,7 @@
    			      template_id="datatable" 
            	  placeholder="Industry_id"/>
               <span class="position:absolute bottom:20px right:20px float:right z-index:6" >
-                <a filter-sort-name="_id" value="" filter-sort-direction="asc" icon click-value="desc, asc" click-attribute="filter-sort-direction" template_id="datatable">
+                <a filter-sort-name="_id" value="" filter-sort-direction="asc" click-value="desc, asc" click-attribute="filter-sort-direction" template_id="datatable">
                 </a>
               </span>
           </td>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.11.8",
+  "version": "1.12.0",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -62,7 +62,7 @@
     "@cocreate/actions": "^1.8.8",
     "@cocreate/crud-client": "^1.20.4",
     "@cocreate/docs": "^1.7.8",
-    "@cocreate/element-prototype": "^1.8.7",
-    "@cocreate/local-storage": "^1.6.8"
+    "@cocreate/form": "^1.14.6",
+    "@cocreate/indexeddb": "^1.8.6"
   }
 }

package/src/client.js

@@ -1,74 +1,32 @@
 import crud from '@cocreate/crud-client';
-import '@cocreate/element-prototype';
+import indexeddb from '@cocreate/indexeddb';
 import action from '@cocreate/actions';
-import uuid from '@cocreate/uuid';
-import localStorage from '@cocreate/local-storage';
+import { getData, setDocumentId } from '@cocreate/form';
 
 const CoCreateOrganization = {
-	init: function() {
-		const self = this;
-		crud.listen('createOrg', function(data) {
-			self.setDocumentId('organizations', data.document[0]._id);
-			document.dispatchEvent(new CustomEvent('createdOrg', {
-				detail: data
-			}));
-		});
-	},
 		
-	createOrg: function(btn) {
+	createOrg: async function(btn) {
 		let form = btn.closest("form");
 		if (!form) return;
+
+		let organization = getData(form, 'organizations')
+		let user = getData(form, 'users')
 		
-		let elements = form.querySelectorAll("[collection='organizations'][name]");
+		let documents = indexeddb.generateDB(organization, user)
 		
-		let data = {document: {}};
-		elements.forEach(el => {
-			let name = el.getAttribute('name');
-			let value = el.getValue();
-			if (!name || !value) return;
-			data.document[name] = value;
+		let response = await crud.socket.send('createOrg', {
+			documents,
+			broadcastBrowser: false
 		});
-		
-		// const socket = crud.socket.getSockets()
-		// if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine) {
-			data.collection = 'organizations'
-			// data.document['_id'] = crud.ObjectId()
-			// data.document['name'] = 'untitled'
-			// localStorage.setItem('apiKey', uuid.generate(32));
-			// localStorage.setItem('organization_id', data['_id']);	
-			crud.createDocument(data).then((response) => {
-				// data.database = data.document[0]['_id']
-				// data.organization_id = data.document[0]['_id']
-				// crud.createDocument(data).then((response) => {
-					
-					document.dispatchEvent(new CustomEvent('createdOrg', {
-						detail: response
-					}));
-		
-				// })	
-			})
-		// } else {
-		// 	crud.socket.send('createOrg', {
-		// 		collection: 'organizations',
-		// 		...data,
-		// 		broadcastBrowser: false
-		// 	});
-		// }
-	},
-	
-	setDocumentId: function(collection, id) {
-		let orgIdElements = document.querySelectorAll(`[collection='${collection}']`);
-		if (orgIdElements && orgIdElements.length > 0) {
-			orgIdElements.forEach((el) => {
-				if (!el.getAttribute('document_id')) {
-					el.setAttribute('document_id', id);
-				}
-				if (el.getAttribute('name') == "_id") {
-					el.value = id;
-				}
-			});
-		}
-	},
+
+		setDocumentId(form, organization)
+		setDocumentId(form, user)
+
+		document.dispatchEvent(new CustomEvent('createdOrg', {
+			detail: response
+		}));
+
+	},	
 	
 	deleteOrg: async function(btn) {
 		const { collection, document_id } = crud.getAttributes(btn);

package/src/server.js

@@ -1,6 +1,6 @@
 class CoCreateOrganization {
-	constructor(wsManager, crud) {
-		this.wsManager = wsManager
+	constructor(crud) {
+		this.wsManager = crud.wsManager
 		this.crud = crud
 		this.init()
 	}
@@ -17,29 +17,21 @@ class CoCreateOrganization {
 	}
 
 	async createOrg(socket, data) {
-		const self = this;
-		
-		try{
-			// create new org in config db organization collection
-			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.broadcast(socket, 'updateDocument', data);	
-				self.wsManager.send(socket, 'createOrg', data);
-
-				// 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 })
+		try {
+			const platformSocket = {
+				config: {
+					organization_id: process.env.organization_id,
 				}
-	
-			})
-		}catch(error){
+			}
+
+			for(let document of data.documents) {
+				document.database = process.env.organization_id
+				document.organization_id = process.env.organization_id
+				let response = await this.crud.createDocument(document)
+				this.wsManager.broadcast(platformSocket, 'createDocument', response);
+			}
+			this.wsManager.send(socket, 'createOrg', data);
+		} catch(error) {
 			console.log('createDocument error', error);
 		}
 	}