@cocreate/organizations 1.2.2 → 1.2.5

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.2.5](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.4...v1.2.5) (2022-05-13)
+
+
+### Bug Fixes
+
+* remove dead code ([b8b78fb](https://github.com/CoCreate-app/CoCreate-organizations/commit/b8b78fba6b8d0ab661d29d96a03a2dca5a1b9d38))
+
+## [1.2.4](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.3...v1.2.4) (2022-05-09)
+
+
+### Bug Fixes
+
+* insert returns insertedId instead of [0]._id ([3a604ed](https://github.com/CoCreate-app/CoCreate-organizations/commit/3a604ed3759f3d607243b29b9ee568bb459ab40f))
+
+## [1.2.3](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.2...v1.2.3) (2022-05-06)
+
+
+### Bug Fixes
+
+* replace ObjectID with ObjectId due to mongodb depreciation ([675f499](https://github.com/CoCreate-app/CoCreate-organizations/commit/675f49949d338e735e5d6df8a1be01b9b5f71751))
+* update config organization_Id to organization_id ([be77abe](https://github.com/CoCreate-app/CoCreate-organizations/commit/be77abe662b7839f3f97ad1dcc54835d85dc67c1))
+
 ## [1.2.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.1...v1.2.2) (2022-03-21)
 
 

package/CoCreate.config.js

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

package/demo/CoCreate-createUser.html

@@ -48,7 +48,7 @@
   <script>
     var config = {
       apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-            organization_Id: '5de0387b12e200ea63204d6c'
+            organization_id: '5de0387b12e200ea63204d6c'
     }
   </script>
  

package/demo/index.html

@@ -98,7 +98,7 @@
 	    <script>
 	      var config = {
 	        apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-	        organization_Id: '5de0387b12e200ea63204d6c',
+	        organization_id: '5de0387b12e200ea63204d6c',
 	        host: 'ws.cocreate.app'
 	      }
 	    </script>

package/demo/industries/industries.html

@@ -75,7 +75,7 @@
 			var config = {
 			  apiKey: '2061acef-0451-4545-f754-60cf8160',
 			  securityKey: '073daff2-5142-4402-cf59-48e205ef',
-			  organization_Id: '5ff747727005da1c272740ab'
+			  organization_id: '5ff747727005da1c272740ab'
 			}
 		</script>
     

package/demo/industries/industry-datatable.html

@@ -112,7 +112,7 @@
     <script>
       var config = {
         apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-                organization_Id: '5de0387b12e200ea63204d6c'
+                organization_id: '5de0387b12e200ea63204d6c'
       }
     </script>
   

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

@@ -117,7 +117,7 @@
     <script>
       var config = {
         apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-                organization_Id: '5de0387b12e200ea63204d6c'
+                organization_id: '5de0387b12e200ea63204d6c'
       }
     </script>
   

package/package.json

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

package/src/client.js

@@ -3,14 +3,8 @@ import crud from '@cocreate/crud-client';
 import action from '@cocreate/actions';
 
 const CoCreateOrganization = {
-	// masterDB: '5ae0cfac6fb8c4e656fdaf92', // '5ae0cfac6fb8c4e656fdaf92' /** masterDB **/,
 	init: function() {
 		const self = this;
-		crud.listen('createOrgNew', function(data) {
-			document.dispatchEvent(new CustomEvent('createdOrg', {
-				detail: data
-			}));
-		});
 		crud.listen('createOrg', function(data) {
 			self.setDocumentId('organizations', data.document_id);
 			document.dispatchEvent(new CustomEvent('createdOrg', {
@@ -18,23 +12,7 @@ const CoCreateOrganization = {
 			}));
 		});
 	},
-	
-	createOrgNew: function(btn) {
-		let form = btn.closest("form");
-		if (!form) return;
-		let newOrg_id = form.querySelector("input[collection='organizations'][name='_id']");
-
-		const room = config.organization_Id;
-
-		crud.send('createOrgNew', {
-			apiKey: config.apiKey,
-			organization_id: config.organization_Id,
-			collection: 'organizations',
-			newOrg_id: newOrg_id,
-		}, room);
-
-	},
-	
+		
 	createOrg: function(btn) {
 		let form = btn.closest("form");
 		if (!form) return;
@@ -52,13 +30,11 @@ const CoCreateOrganization = {
 			}
 			data[name] = value;
 		});
-		const room = config.organization_Id;
+		const room = config.organization_id;
 		
 		crud.send('createOrg', {
 			apiKey: config.apiKey,
-			organization_id: config.organization_Id,
-			// orgDb: newOrg,
-			mdb: '5ae0cfac6fb8c4e656fdaf92',
+			organization_id: config.organization_id,
 			collection: 'organizations',
 			data: data
 		}, room);
@@ -80,14 +56,6 @@ const CoCreateOrganization = {
 
 };
 
-action.init({
-	name: "createOrgNew",
-	endEvent: "createdOrg",
-	callback: (btn, data) => {
-		CoCreateOrganization.createOrgNew(btn);
-	},
-});
-
 action.init({
 	name: "createOrg",
 	endEvent: "createdOrg",

package/src/server.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 
 class CoCreateOrganization {
 	constructor(wsManager, dbClient) {
@@ -9,42 +9,11 @@ class CoCreateOrganization {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createOrgNew',	(socket, data, socketInfo) => this.createOrgNew(socket, data));
 			this.wsManager.on('createOrg',		(socket, data, socketInfo) => this.createOrg(socket, data));
 			this.wsManager.on('deleteOrg',		(socket, data, socketInfo) => this.deleteOrg(socket, data));
 		}
 	}
 
-	async createOrgNew(socket, data) {
-		const self = this;
-		if(!data) return;
-		const newOrg_id = data.newOrg_id;
-		if (newOrg_id != data.organization_id) {
-			try{
-				const db = this.dbClient.db(req_data['organization_id']);
-				const collection = db.collection(req_data["collection"]);
-					const query = {
-					"_id": new ObjectID(newOrg_id)
-				};
-			
-				collection.find(query).toArray(function(error, result) {
-					if(!error && result){
-						const newOrgDb = self.dbClient.db(newOrg_id).collection(data['collection']);
-						// Create new user in config db users collection
-						newOrgDb.insertOne({...result.ops[0], organization_id : newOrg_id}, function(error, result) {
-							if(!error && result){
-								const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0]}
-								self.wsManager.send(socket, 'createOrgNew', response, data['organization_id']);
-							}
-						});
-					}
-				});
-			}catch(error){
-				console.log('createDocument error', error);
-			}
-		}
-	}
-
 	async createOrg(socket, data) {
 		const self = this;
 		if(!data.data) return;
@@ -52,22 +21,27 @@ class CoCreateOrganization {
 		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.ops[0]._id + "";
+					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({...result.ops[0], organization_id : orgId});
+					anotherCollection.insertOne({...data.data, organization_id : orgId});
 					
-					const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0] }
+					const response  = { ...data, document_id: orgId }
 
 					self.wsManager.send(socket, 'createOrg', response );
 					self.wsManager.broadcast(socket, data.namespace || data['organization_id'] , data.room, 'createDocument', response);
-				}
-					// add new org to masterDb
-					const masterOrgDb = self.dbClient.db(data.mdb).collection(data['collection']);
-					masterOrgDb.insertOne({...result.ops[0], organization_id : data['mdb']});
 
+					// 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});
+					}	
+				}
 			});
 		}catch(error){
 			console.log('createDocument error', error);