@cocreate/organizations 1.5.8 → 1.6.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.6.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.5.8...v1.6.0) (2022-09-28)
+
+
+### Bug Fixes
+
+* broadcast params reduced to socket, message, data ([f90ea9c](https://github.com/CoCreate-app/CoCreate-organizations/commit/f90ea9cf92e9e5a03c66bf40d2525699102d11a7))
+
+
+### Features
+
+* config is accessible from socket.config ([c64dacf](https://github.com/CoCreate-app/CoCreate-organizations/commit/c64dacf3ef279c61e682c099c8801ff18567fc30))
+* create new org while offline ([dc4223c](https://github.com/CoCreate-app/CoCreate-organizations/commit/dc4223c2e60c9ede79c040508bdc635b26f69fe6))
+
 ## [1.5.8](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.5.7...v1.5.8) (2022-09-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.5.8",
+  "version": "1.6.0",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",

package/src/client.js

@@ -1,6 +1,7 @@
 import crud from '@cocreate/crud-client';
 // import input from '@cocreate/elements'
 import action from '@cocreate/actions';
+import uuid from '@cocreate/uuid';
 
 const CoCreateOrganization = {
 	init: function() {
@@ -19,7 +20,7 @@ const CoCreateOrganization = {
 		
 		let elements = form.querySelectorAll("[collection='organizations'][name]");
 		
-		let data = {};
+		let data = {data: {}};
 		//. get form data
 		elements.forEach(el => {
 			let name = el.getAttribute('name');
@@ -28,13 +29,33 @@ const CoCreateOrganization = {
 			if (el.getAttribute('data-type') == 'array') {
 				value = [value];
 			}
-			data[name] = value;
+			data.data[name] = value;
 		});
 		
-		crud.send('createOrg', {
-			collection: 'organizations',
-			data: data
-		});
+		const socket = crud.socket.getSocket()
+		if (!socket || !socket.connected || window && !window.navigator.onLine) {
+			data.collection = 'organizations'
+			data.data['_id'] = ObjectId()
+			data.data['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']
+				crud.createDocument(data).then((response) => {
+					
+					document.dispatchEvent(new CustomEvent('createOrg', {
+						detail: response
+					}));
+		
+				})	
+			})
+		} else {
+			crud.send('createOrg', {
+				collection: 'organizations',
+				data: data
+			});
+		}
 	},
 	
 	setDocumentId: function(collection, id) {
@@ -106,6 +127,8 @@ const CoCreateOrganization = {
 
 };
 
+const ObjectId = (rnd = r16 => Math.floor(r16).toString(16)) =>
+    rnd(Date.now()/1000) + ' '.repeat(16).replace(/./g, () => rnd(Math.random()*16));
 
 action.init({
 	name: "createOrg",

package/src/server.js

@@ -9,16 +9,16 @@ class CoCreateOrganization {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createOrg', (socket, data, socketInfo) => 
-				this.createOrg(socket, data, socketInfo)
+			this.wsManager.on('createOrg', (socket, data) => 
+				this.createOrg(socket, data)
 			);
-			this.wsManager.on('deleteOrg', (socket, data, socketInfo) => 
-				this.deleteOrg(socket, data, socketInfo)
+			this.wsManager.on('deleteOrg', (socket, data) => 
+				this.deleteOrg(socket, data)
 			);
 		}
 	}
 
-	async createOrg(socket, data, socketInfo) {
+	async createOrg(socket, data) {
 		const self = this;
 		if(!data.data) return;
 		
@@ -37,8 +37,8 @@ class CoCreateOrganization {
 					
 					const response  = { ...data, document_id: orgId }
 
-					self.wsManager.send(socket, 'createOrg', response, socketInfo);
-					self.wsManager.broadcast(socket, data.namespace || data['organization_id'] , data.room, 'createDocument', response);
+					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) {	
@@ -53,7 +53,7 @@ class CoCreateOrganization {
 	}
 	
 	
-	async deleteOrg(socket, data, socketInfo) {
+	async deleteOrg(socket, data) {
 		const self = this;
 		if(!data.data) return;
 		const organization_id = data.data.organization_id
@@ -74,10 +74,10 @@ class CoCreateOrganization {
 					platformDB.deleteOne(query, function(error, result) {
 						if (!error) {
 							let response = { ...data }
-							self.wsManager.send(socket, 'deleteOrg', response, socketInfo);
-							self.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, 'deleteDocument', response, socketInfo);
+							self.wsManager.send(socket, 'deleteOrg', response);
+							self.wsManager.broadcast(socket, 'deleteDocument', response);
 						} else {
-							self.wsManager.send(socket, 'ServerError', error, socketInfo);
+							self.wsManager.send(socket, 'ServerError', error);
 						}
 					})
 				}