@cocreate/organizations 1.4.0 → 1.5.2

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.5.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.5.1...v1.5.2) (2022-06-12)
+
+
+### Bug Fixes
+
+* update dependencies ([e67c74d](https://github.com/CoCreate-app/CoCreate-organizations/commit/e67c74df65e782adc22b19ea3dbca226e795b695))
+* update modal btn to actions ([e40a303](https://github.com/CoCreate-app/CoCreate-organizations/commit/e40a303710dc73dd614c659c084d339d5797dc16))
+
+## [1.5.1](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.5.0...v1.5.1) (2022-06-02)
+
+
+### Bug Fixes
+
+* update padding of datables td element ([4adf0fe](https://github.com/CoCreate-app/CoCreate-organizations/commit/4adf0fe02212df759b333da837c616e473b1d9b1))
+
+# [1.5.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.4.0...v1.5.0) (2022-05-29)
+
+
+### Features
+
+* deleteDocument broadcasted after orgDeleted ([be1ecee](https://github.com/CoCreate-app/CoCreate-organizations/commit/be1ecee732ce71a3877dfbb06df9b19c0148eb16))
+* deleteOrgs action to select and delete many organizations ([0abaa20](https://github.com/CoCreate-app/CoCreate-organizations/commit/0abaa2061ac7575c51314f5011aa6031022b6d7f))
+
 # [1.4.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.3.2...v1.4.0) (2022-05-28)
 
 

package/demo/industries/industries.html

@@ -15,13 +15,13 @@
         
         <ul class="overflow:auto display:inline-flex direction:rtl font-size:20px align-items:center list-style-type:none width:100% height:50px">
     			<li class="margin-right:15px">
-    			  <a class="btn-modal-close"><i class="fas fa-times"></i></a>
+    			  <a actions="closeModal"><i class="fas fa-times"></i></a>
     			</li>
     			<li class="margin-right:15px">
-    			  <a class="btn-modal-maximize"><i toggle="fa-window-restore, fa-window-maximize" class="far fa-window-maximize"></i></a>
+    			  <a actions="minMaxModal"><i toggle="fa-window-restore, fa-window-maximize" class="far fa-window-maximize"></i></a>
     			</li>
     			<li class="margin-right:15px">
-    			  <a class="btn-modal-minimize"><i class="far fa-window-minimize"></i></a>
+    			  <a actions="parkModal"><i class="far fa-window-minimize"></i></a>
     			</li>
     			<li class="margin-right:15px">
     			  <a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a>

package/demo/industries/industry-datatable.html

@@ -12,7 +12,7 @@
     <div content_id="content" class="padding:5px">
       <table class="width:100% border-collapse:collapse">
         <tr class="border-bottom:1px_solid_darkgray">
-          <td class="position:sticky top:0 background:white padding-top:0 padding:10px ">
+          <td class="position:sticky top:0 background:white padding:0px_10px_10px">
     		    <input type="text" class="floating-label"
            	  filter-name="name" 
    			      template_id="datatable" 
@@ -24,7 +24,7 @@
                 </a>
               </span>
           </td>
-          <td class="position:sticky top:0 background:white padding:10px padding-top:0">
+          <td class="position:sticky top:0 background:white padding:0px_10px_10px">
       		  <input type="text" class="floating-label"
            	  filter-name="_id" 
            	 

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

@@ -12,7 +12,7 @@
     <div content_id="content" class="padding:5px">
       <table class="width:100% border-collapse:collapse">
         <tr class="border-bottom:1px_solid_darkgray">
-          <td class="position:sticky top:0 background:white padding-top:0 padding:10px ">
+          <td class="position:sticky top:0 background:white padding:0px_10px_10px">
     		    <input type="text" class="floating-label"
            	  filter-name="name" 
            	 
@@ -26,7 +26,7 @@
                 </a>
               </span>
           </td>
-          <td class="position:sticky top:0 background:white padding:10px padding-top:0">
+          <td class="position:sticky top:0 background:white padding:0px_10px_10px">
       		  <input type="text" class="floating-label"
            	  filter-name="_id" 
            	 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.4.0",
+  "version": "1.5.2",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -61,10 +61,10 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.4.1",
-    "@cocreate/crud-client": "^1.6.2",
-    "@cocreate/docs": "^1.3.1",
-    "@cocreate/elements": "^1.7.3",
+    "@cocreate/actions": "^1.4.2",
+    "@cocreate/crud-client": "^1.7.0",
+    "@cocreate/docs": "^1.3.2",
+    "@cocreate/elements": "^1.8.0",
     "mongodb": "^4.4.0"
   }
 }

package/src/client.js

@@ -30,14 +30,11 @@ const CoCreateOrganization = {
 			}
 			data[name] = value;
 		});
-		const room = config.organization_id;
 		
 		crud.send('createOrg', {
-			apiKey: config.apiKey,
-			organization_id: config.organization_id,
 			collection: 'organizations',
 			data: data
-		}, room);
+		});
 	},
 	
 	setDocumentId: function(collection, id) {
@@ -53,9 +50,63 @@ const CoCreateOrganization = {
 			});
 		}
 	},
+	
+	deleteOrg: async function(btn) {
+		const { collection, document_id } = crud.getAttr(btn);
+		const organization_id = document_id;
+
+		if(crud.checkAttrValue(collection) && crud.checkAttrValue(document_id)) {
+
+			crud.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.checkAttrValue(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.checkAttrValue(document_id)) {
+					crud.send('deleteOrg', {
+						collection,
+						document_id,
+						data: {
+							organization_id,
+						},
+						'metadata': 'deleteOrgs-action'
+					})
+				}
+			});
+
+			document.dispatchEvent(new CustomEvent('deletedOrgs', {
+				detail: {}
+			}));
+		}
+	}
 
 };
 
+
 action.init({
 	name: "createOrg",
 	endEvent: "createdOrg",
@@ -64,6 +115,22 @@ 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);
+	},
+});
+
 CoCreateOrganization.init();
 
 export default CoCreateOrganization;

package/src/server.js

@@ -9,8 +9,12 @@ class CoCreateOrganization {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createOrg',		(socket, data, socketInfo) => this.createOrg(socket, data, socketInfo));
-			this.wsManager.on('deleteOrg',		(socket, data, socketInfo) => this.deleteOrg(socket, data, socketInfo));
+			this.wsManager.on('createOrg', (socket, data, socketInfo) => 
+				this.createOrg(socket, data, socketInfo)
+			);
+			this.wsManager.on('deleteOrg', (socket, data, socketInfo) => 
+				this.deleteOrg(socket, data, socketInfo)
+			);
 		}
 	}
 
@@ -54,16 +58,14 @@ class CoCreateOrganization {
 		if(!data.data) return;
 		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{
 			const db = this.dbClient.db(organization_id);
 			db.dropDatabase().then(response => {
 				if (response === true){
-					console.log('deleteOrg response', response)
-				}
+					process.emit('deleteOrg', organization_id)
 
-				// delete org from platformDB
-				// if (organization_id != process.env.organization_id) {	
+					// delete org from platformDB
 					const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
 					const query = {
 						"_id": new ObjectId(organization_id)
@@ -72,12 +74,13 @@ class CoCreateOrganization {
 					platformDB.deleteOne(query, function(error, result) {
 						if (!error) {
 							let response = { ...data }
-							self.broadcast(socket, 'deleteDocument', response, socketInfo)
+							self.wsManager.send(socket, 'deleteOrg', response, socketInfo);
+							self.wsManager.broadcast(socket, response.namespace || response['organization_id'], response.room, 'deleteDocument', response, socketInfo);
 						} else {
 							self.wsManager.send(socket, 'ServerError', error, socketInfo);
 						}
 					})
-				// }	
+				}	
 			})
 		}catch(error){
 			console.log('deleteOrg error', error);