@cocreate/organizations 1.2.0 → 1.2.3

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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)
+
+
+### 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)
 
 

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

@@ -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"
@@ -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.0",
+  "version": "1.2.3",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",

package/src/client.js

@@ -3,7 +3,6 @@ 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) {
@@ -24,11 +23,11 @@ const CoCreateOrganization = {
 		if (!form) return;
 		let newOrg_id = form.querySelector("input[collection='organizations'][name='_id']");
 
-		const room = config.organization_Id;
+		const room = config.organization_id;
 
 		crud.send('createOrgNew', {
 			apiKey: config.apiKey,
-			organization_id: config.organization_Id,
+			organization_id: config.organization_id,
 			collection: 'organizations',
 			newOrg_id: newOrg_id,
 		}, room);
@@ -52,11 +51,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,
+			organization_id: config.organization_id,
 			// orgDb: newOrg,
 			mdb: '5ae0cfac6fb8c4e656fdaf92',
 			collection: 'organizations',

package/src/server.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 
 class CoCreateOrganization {
 	constructor(wsManager, dbClient) {
@@ -9,9 +9,9 @@ class CoCreateOrganization {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createOrgNew',	(socket, data, roomInfo) => this.createOrgNew(socket, data));
-			this.wsManager.on('createOrg',		(socket, data, roomInfo) => this.createOrg(socket, data));
-			this.wsManager.on('deleteOrg',		(socket, data, roomInfo) => this.deleteOrg(socket, data));
+			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));
 		}
 	}
 
@@ -24,7 +24,7 @@ class CoCreateOrganization {
 				const db = this.dbClient.db(req_data['organization_id']);
 				const collection = db.collection(req_data["collection"]);
 					const query = {
-					"_id": new ObjectID(newOrg_id)
+					"_id": new ObjectId(newOrg_id)
 				};
 			
 				collection.find(query).toArray(function(error, result) {
@@ -62,11 +62,7 @@ class CoCreateOrganization {
 					const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0] }
 
 					self.wsManager.send(socket, 'createOrg', response );
-					if (data.room) {
-						self.wsManager.broadcast(socket, data.namespace || data['organization_id'] , data.room, 'createDocument', response, true);
-					} else {
-						self.wsManager.broadcast(socket, data.namespace || data['organization_id'], null, 'createDocument', 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']);