@cocreate/organizations 1.13.1 → 1.13.3

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.13.3](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.13.2...v1.13.3) (2023-05-11)
+
+
+### Bug Fixes
+
+* minor bugs ([66f84c0](https://github.com/CoCreate-app/CoCreate-organizations/commit/66f84c009616d1cc929e82b05117807cf44ef875))
+* removed deleteOrgs and deleteOrg. now handeled by delete documents ([ab17992](https://github.com/CoCreate-app/CoCreate-organizations/commit/ab1799247711262bfdf82f2b763ead6ff34103e7))
+
+## [1.13.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.13.1...v1.13.2) (2023-05-10)
+
+
+### Bug Fixes
+
+* apikey renamed to key ([1de6e5f](https://github.com/CoCreate-app/CoCreate-organizations/commit/1de6e5fa2105b9b7a3185c08577eebbb30cd3a67))
+* apikey renamed to key ([7a67ebd](https://github.com/CoCreate-app/CoCreate-organizations/commit/7a67ebd3da8be66259632ede4ebb492455bc94bf))
+
 ## [1.13.1](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.13.0...v1.13.1) (2023-05-10)
 
 

package/CoCreate.config.js

@@ -1,7 +1,7 @@
 module.exports = {
     "config": {
         "organization_id": "5ff747727005da1c272740ab",
-        "apiKey": "2061acef-0451-4545-f754-60cf8160",
+        "key": "2061acef-0451-4545-f754-60cf8160",
         "host": "general.cocreate.app"
     },
     "sources": [

package/demo/CoCreate-createUser.html

@@ -28,10 +28,10 @@
 								
 								
 								<!-- API key  -->
-								<input type="hidden" id="apiKey"
+								<input type="hidden" id="key"
 									collection="organizations"
 									document_id=""
-									name="apiKey"
+									name="key"
 									placeholder="API Key" 
 									uuid="32" readonly>
 								

package/demo/index.html

@@ -54,10 +54,10 @@
 									placeholder="OrganizationId">
 								
 								<!-- API key  -->
-								<input type="hidden" id="apiKey"
+								<input type="hidden" id="key"
 									collection="organizations"
 									document_id=""
-									name="apiKey"
+									name="key"
 									placeholder="API Key" 
 									uuid="32" readonly>
 																	

package/package.json

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

package/src/client.js

@@ -9,92 +9,38 @@ const CoCreateOrganization = {
 		let formEl = btn.closest("form");
 		if (!formEl) return;
 
-		let organization = {
-			collection: 'organizations',
-			document: [{
-				_id: crud.socket.config.organization_id,
-				key: crud.socket.config.key
-			}]
-		}
-		let user = {
-			collection: 'users',
-			document: [{
-				_id: crud.socket.config.user_id
-			}]
-		}
-
-		form.setDocumentId(formEl, organization)
-		form.setDocumentId(formEl, user)
-
-		organization = form.getData(formEl, 'organizations')
-		user = form.getData(formEl, 'users')
+		let organization = form.getData(formEl, 'organizations')
+		let user = form.getData(formEl, 'users')
 
+		let response
 		let documents = await indexeddb.generateDB(organization, user)
 		
-		let response = await crud.socket.send('createOrg', {
-			documents,
-			broadcastBrowser: false
-		});
+		if (documents) {
+			if(!organization || !organization.document || !organization.document[0]) return
+			let org = organization.document[0]
+			let organization_id = org._id	
+			let key = org.key
+
+			if (!crud.socket.status) {
+				crud.socket.status = true
+				crud.socket.create({organization_id, key})
+			}
+
+			form.setDocumentId(formEl, organization)
+			form.setDocumentId(formEl, user)
+
+			response = await crud.socket.send('createOrg', {
+				documents,
+				broadcastBrowser: false,
+				organization_id,
+				key
+			});
+		}
 
 		document.dispatchEvent(new CustomEvent('createdOrg', {
 			detail: response
 		}));
-
-	},	
-	
-	deleteOrg: async function(btn) {
-		const { collection, document_id } = crud.getAttributes(btn);
-		const organization_id = document_id;
-
-		if (crud.checkValue(collection) && crud.checkValue(document_id)) {
-
-			crud.socket.send('deleteOrg', {
-				collection,
-				document_id,
-				data: {
-					organization_id,
-				},
-				'metadata': 'deleteOrg-action'
-			}).then(response => {
-
-				// ToDo: replace with custom event
-				document.dispatchEvent(new CustomEvent('deletedOrg', {
-					detail: {}
-				}));
-			})
-		}
-	},
-
-	deleteOrgs: async function(btn) {
-		const collection = btn.getAttribute('collection');
-		if (crud.checkValue(collection)) {
-			const dataTemplateid = btn.getAttribute('template_id');
-			if (!dataTemplateid) return;
-
-			const selectedEls = document.querySelectorAll(`.selected[templateid="${dataTemplateid}"]`);
-
-			selectedEls.forEach((el) => {
-				const document_id = el.getAttribute('document_id');
-				const organization_id = document_id;
-
-				if (crud.checkValue(document_id)) {
-					crud.socket.send('deleteOrg', {
-						collection,
-						document_id,
-						data: {
-							organization_id,
-						},
-						'metadata': 'deleteOrgs-action'
-					})
-				}
-			});
-
-			document.dispatchEvent(new CustomEvent('deletedOrgs', {
-				detail: {}
-			}));
-		}
 	}
-
 };
 
 action.init({
@@ -105,20 +51,4 @@ action.init({
 	},
 });
 
-action.init({
-	name: "deleteOrg",
-	endEvent: "deletedOrg",
-	callback: (btn, data) => {
-		CoCreateOrganization.deleteOrg(btn);
-	},
-});
-
-action.init({
-	name: "deleteOrgs",
-	endEvent: "deletedOrgs",
-	callback: (btn, data) => {
-		CoCreateOrganization.deleteOrgs(btn);
-	},
-});
-
 export default CoCreateOrganization;

package/src/server.js

@@ -10,9 +10,6 @@ class CoCreateOrganization {
 			this.wsManager.on('createOrg', (socket, data) => 
 				this.createOrg(socket, data)
 			);
-			this.wsManager.on('deleteOrg', (socket, data) => 
-				this.deleteOrg(socket, data)
-			);
 		}
 	}
 
@@ -36,41 +33,6 @@ class CoCreateOrganization {
 		}
 	}
 	
-	
-	async deleteOrg(socket, data) {
-		const self = this;
-		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 {
-			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 request = {
-						database: process.env.organization_id, 
-						collection: 'organization',
-						document: {
-							_id: organization_id
-						},
-						organization_id: process.env.organization_id
-					};
-		
-					self.crud.deleteDocument(request).then((data) => {
-						self.wsManager.broadcast(socket, 'deleteDocument', data)
-					})
-				}	
-
-			})
-			
-		}catch(error){
-			console.log('deleteOrg error', error);
-		}
-	}
-
 }
 
 module.exports = CoCreateOrganization;