@cocreate/organizations 1.1.68 → 1.2.2

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.2.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.1...v1.2.2) (2022-03-21)
+
+
+### Bug Fixes
+
+* update class sortable to attribute sortable ([8257806](https://github.com/CoCreate-app/CoCreate-organizations/commit/825780670c4a40eac352e5c83067df9dcea686bd))
+
+## [1.2.1](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.0...v1.2.1) (2022-03-06)
+
+
+### Bug Fixes
+
+* removed param isExact from broadcast as it can be handled by param room ([241b0fe](https://github.com/CoCreate-app/CoCreate-organizations/commit/241b0fec1bd0251604bd43b7cc0d6273c23d4342))
+* update param roomInfo to socketInfo ([fadc197](https://github.com/CoCreate-app/CoCreate-organizations/commit/fadc197cd647b0e951895f787bee6f4f2c92f6d6))
+
+# [1.2.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.1.68...v1.2.0) (2022-03-03)
+
+
+### Features
+
+* manage server and client scripts ([3084e7e](https://github.com/CoCreate-app/CoCreate-organizations/commit/3084e7e0d6096905dd3c6bdeb21d56fb43039e51))
+
 ## [1.1.68](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.1.67...v1.1.68) (2022-02-24)
 
 

package/demo/index.html

@@ -71,7 +71,7 @@
 		                        <div class="padding:25px background:gainsboro text-align:left">
 	
 	                           <!-- Industry select -->
-	                            <cocreate-select class="sortable floating-label" collection="organizations" name="industry" placeholder="Industry" realtime="false" save="false">
+	                            <cocreate-select sortable class="floating-label" collection="organizations" name="industry" placeholder="Industry" realtime="false" save="false">
 	  					          	  <input placeholder="Search" template_id="industries">
 									<ul fetch-collection="industries" 
 									    template_id="industries"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.1.68",
+  "version": "1.2.2",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -64,6 +64,7 @@
     "@cocreate/actions": "^1.3.33",
     "@cocreate/crud-client": "^1.4.47",
     "@cocreate/docs": "^1.2.69",
-    "@cocreate/elements": "^1.6.11"
+    "@cocreate/elements": "^1.6.11",
+    "mongodb": "^4.4.0"
   }
 }

package/src/client.js

@@ -0,0 +1,101 @@
+import crud from '@cocreate/crud-client';
+// import input from '@cocreate/elements'
+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', {
+				detail: data
+			}));
+		});
+	},
+	
+	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;
+		
+		let elements = form.querySelectorAll("[collection='organizations'][name]");
+		
+		let data = {};
+		//. get form data
+		elements.forEach(el => {
+			let name = el.getAttribute('name');
+			let value = el.getValue(el) || el.getAttribute('value');
+			if (!name || !value) return;
+			if (el.getAttribute('data-type') == 'array') {
+				value = [value];
+			}
+			data[name] = value;
+		});
+		const room = config.organization_Id;
+		
+		crud.send('createOrg', {
+			apiKey: config.apiKey,
+			organization_id: config.organization_Id,
+			// orgDb: newOrg,
+			mdb: '5ae0cfac6fb8c4e656fdaf92',
+			collection: 'organizations',
+			data: data
+		}, room);
+	},
+	
+	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;
+				}
+			});
+		}
+	},
+
+};
+
+action.init({
+	name: "createOrgNew",
+	endEvent: "createdOrg",
+	callback: (btn, data) => {
+		CoCreateOrganization.createOrgNew(btn);
+	},
+});
+
+action.init({
+	name: "createOrg",
+	endEvent: "createdOrg",
+	callback: (btn, data) => {
+		CoCreateOrganization.createOrg(btn);
+	},
+});
+
+CoCreateOrganization.init();
+
+export default CoCreateOrganization;

package/src/index.js

@@ -1,101 +1,14 @@
-import crud from '@cocreate/crud-client';
-// import input from '@cocreate/elements'
-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', {
-				detail: data
-			}));
-		});
-	},
-	
-	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;
-		
-		let elements = form.querySelectorAll("[collection='organizations'][name]");
-		
-		let data = {};
-		//. get form data
-		elements.forEach(el => {
-			let name = el.getAttribute('name');
-			let value = el.getValue(el) || el.getAttribute('value');
-			if (!name || !value) return;
-			if (el.getAttribute('data-type') == 'array') {
-				value = [value];
-			}
-			data[name] = value;
-		});
-		const room = config.organization_Id;
-		
-		crud.send('createOrg', {
-			apiKey: config.apiKey,
-			organization_id: config.organization_Id,
-			// orgDb: newOrg,
-			mdb: '5ae0cfac6fb8c4e656fdaf92',
-			collection: 'organizations',
-			data: data
-		}, room);
-	},
-	
-	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;
-				}
-			});
-		}
-	},
-
-};
-
-action.init({
-	name: "createOrgNew",
-	endEvent: "createdOrg",
-	callback: (btn, data) => {
-		CoCreateOrganization.createOrgNew(btn);
-	},
-});
-
-action.init({
-	name: "createOrg",
-	endEvent: "createdOrg",
-	callback: (btn, data) => {
-		CoCreateOrganization.createOrg(btn);
-	},
-});
-
-CoCreateOrganization.init();
-
-export default CoCreateOrganization;
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(["./client"], function(CoCreateOrganization) {
+        	return factory(CoCreateOrganization)
+        });
+    } else if (typeof module === 'object' && module.exports) {
+      const CoCreateOrganization = require("./server.js")
+      module.exports = factory(CoCreateOrganization);
+    } else {
+        root.returnExports = factory(root["./client.js"]);
+  }
+}(typeof self !== 'undefined' ? self : this, function (CoCreateOrganization) {
+  return CoCreateOrganization;
+}));

package/src/server.js

@@ -0,0 +1,90 @@
+const {ObjectID} = require("mongodb");
+
+class CoCreateOrganization {
+	constructor(wsManager, dbClient) {
+		this.wsManager = wsManager
+		this.dbClient = dbClient
+		this.init()
+	}
+	
+	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;
+		
+		try{
+			const collection = this.dbClient.db(data.organization_id).collection(data.collection);
+			// create new org in config db organization collection
+			collection.insertOne({ ...data.data, organization_id: data.organization_id }, function(error, result) {
+				if(!error && result){
+					const orgId = result.ops[0]._id + "";
+					const anotherCollection = self.dbClient.db(orgId).collection(data['collection']);
+					// Create new org db and insert organization
+					anotherCollection.insertOne({...result.ops[0], organization_id : orgId});
+					
+					const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0] }
+
+					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']});
+
+			});
+		}catch(error){
+			console.log('createDocument error', error);
+		}
+	}
+	
+	
+	async deleteOrg(socket, data) {
+		const self = this;
+		if(!data.data) return;
+		try{
+			// ToDo: Delete DB and delete org and user from masterDB
+		}catch(error){
+			console.log('deleteOrg error', error);
+		}
+	}
+
+}
+
+module.exports = CoCreateOrganization;