@cocreate/api 1.2.16 → 1.2.20

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [1.2.20](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.19...v1.2.20) (2021-12-31)
+
+
+### Bug Fixes
+
+* clean code ([a44ef95](https://github.com/CoCreate-app/CoCreate-api/commit/a44ef95a5fb2e0686d811fdd11144d093c2e0455))
+* removed data- and added elements.getValue ([d339cbd](https://github.com/CoCreate-app/CoCreate-api/commit/d339cbd783f9fe5f244337907dc3ec3cd2d2cf54))
+
+## [1.2.19](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.18...v1.2.19) (2021-12-15)
+
+
+### Bug Fixes
+
+* update dependencies ([c50ad0d](https://github.com/CoCreate-app/CoCreate-api/commit/c50ad0d654955591a26a7eb2ccb903584d302227))
+
+## [1.2.18](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.17...v1.2.18) (2021-12-14)
+
+
+### Bug Fixes
+
+* update dependencies ([f500f91](https://github.com/CoCreate-app/CoCreate-api/commit/f500f917cca28ee96fd3618173f24f51aade7047))
+
+## [1.2.17](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.16...v1.2.17) (2021-11-27)
+
+
+### Bug Fixes
+
+* actions import typo ([4030ac2](https://github.com/CoCreate-app/CoCreate-api/commit/4030ac2ea256133a5481d35731a5dcb38e9db4e1))
+
 ## [1.2.16](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.15...v1.2.16) (2021-11-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.2.16",
+  "version": "1.2.20",
   "description": "A simple api helper component in vanilla javascript used by JavaScript developers to create thirdparty api intergrations. CoCreate-api includes the client component and server side for api processing. Thirdparty apis can be accessible using HTML5 attributes and/or JavaScript API. ",
   "keywords": [
     "thirdparty-api-intergration",
@@ -62,11 +62,12 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.3.23",
-    "@cocreate/crud-client": "^1.4.38",
-    "@cocreate/docs": "^1.2.60",
-    "@cocreate/hosting": "^1.2.56",
-    "@cocreate/render": "^1.3.21",
-    "@cocreate/socket-client": "^1.4.14"
+    "@cocreate/actions": "^1.3.25",
+    "@cocreate/crud-client": "^1.4.40",
+    "@cocreate/docs": "^1.2.62",
+    "@cocreate/elements": "^1.5.0",
+    "@cocreate/hosting": "^1.2.58",
+    "@cocreate/render": "^1.3.24",
+    "@cocreate/socket-client": "^1.4.16"
   }
 }

package/src/client.js

@@ -1,7 +1,8 @@
 /*globals CustomEvent, config*/
 import CoCreateSocket from "@cocreate/socket-client";
-import CoCreateAction from '@cocreate/action';
+import CoCreateAction from '@cocreate/actions';
 import CoCreateRender from '@cocreate/render';
+import CoCreateElements from '@cocreate/elements';
 
 let socketApi = new CoCreateSocket('api');
 
@@ -44,9 +45,9 @@ const CoCreateApi = {
 		}
 	},
 	
-	__responseProcess: function(m_name, data) {
+	__responseProcess: function(id, data) {
 		const {type, response} = data;
-		const m_instance = this.modules[m_name];
+		const m_instance = this.modules[id];
 		
 		if (type && response && m_instance) {
 		
@@ -65,24 +66,29 @@ const CoCreateApi = {
 	},
 	
 	__commonAction: function(id, action, element) {
-		const container = element.closest("form") || document;
-		let data = CoCreateApi.getFormData(id, action,  container);
+		const form = element.closest("form") || document;
+		let data = CoCreateApi.getFormData(id, action,  form);
 		CoCreateApi.send(id, action, data);
 	},
 	
 	
-	getFormData : function(m_name, action, container){
-		const mainAttr = `data-${m_name}`;
+	getFormData: function(id, action, form){
+		const mainAttr = id;
 		const self = this;
-		const elements = container.querySelectorAll(`[${mainAttr}^="${action}."]`);
+		const elements = form.querySelectorAll(`[${mainAttr}^="${action}."]`);
 
 		let data = {};
 		elements.forEach(element => {
 			let name = element.getAttribute(mainAttr);
-			let array_name = element.getAttribute(mainAttr + "_array");
-			let value = self.__getElValue(element);
-			
 			if (!name) return;
+			
+			let array_name = element.getAttribute(mainAttr + "_array");
+
+			let value;
+			if(element.getValue)
+				value = element.getValue(element);
+			else
+				value = CoCreateElements.getValue(element);
 
 			if (action) {
 				let re = new RegExp(`^${action}.`, 'i');
@@ -97,7 +103,7 @@ const CoCreateApi = {
 				if (!data[name]) {
 					data[name] = [];
 				}
-				data[name].push(self.getFormData(m_name, array_name, element));
+				data[name].push(self.getFormData(id, array_name, element));
 			} else if (value != null) {
 				data[name] = value;
 			}
@@ -118,31 +124,6 @@ const CoCreateApi = {
 		return objectData;
 	},
 	
-	__getElValue: function(element) {
-		let value = null;
-		if(element.getValue)
-			value = element.getValue(element);
-		else if (typeof element.value !== "undefined") {
-			switch (element.type.toLocaleLowerCase()) {
-				case 'checkbox':
-					if (element.checked) {
-						value = element.value;
-					}
-					break;
-				default:
-					value = element.value;
-					break;
-			}
-		} else {
-			value = element.getAttribute('value');
-			if (!value) {
-				value = element.innerHTML;
-			}
-		}
-		
-		return value;
-	},
-	
 	__mergeObject: function(target, source) {
 		target = target || {};
 		for (let key of Object.keys(source)) {
@@ -180,13 +161,12 @@ const CoCreateApi = {
 		});
 	},
 	
-	getCommonParams: function(info) 
-	{
+	getCommonParams: function(info) {
 		return {
 			"apiKey":           info.apiKey || config.apiKey,
 			"organization_id":  info.organization_id || config.organization_Id,
-		}
+		};
 	}
-}
+};
                 
 export default CoCreateApi;