@osimatic/helpers-js 1.1.54 → 1.1.56

package/form_helper.js

@@ -264,18 +264,18 @@ class FormHelper {
 	}
 
 	static getFormErrorText(errors) {
-		let errorLabels = '';
+		let errorLabels = [];
 		for (let property in errors) {
 			// console.log(property);
 			if (typeof errors[property] != 'function') {
 				if (typeof errors[property]['error_description'] === 'undefined') {
-					errorLabels += '<span>' + errors[property] + '</span><br>';
+					errorLabels.push(errors[property]);
 				} else {
-					errorLabels += '<span>' + errors[property]['error_description'] + '</span><br>';
+					errorLabels.push(errors[property]['error_description']);
 				}
 			}
 		}
-		return errorLabels;
+		return errorLabels.removeEmptyValues().map(errorLabel => '<span>' + errorLabel + '</span>').join('<br/>');
 	}
 
 	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {

package/http_client.js

@@ -156,6 +156,10 @@ class HTTPClient {
 	}
 
 	static logRequestFailure(response, json) {
+		if (null == response) {
+			console.error('Request failure : network error.');
+			return;
+		}
 		console.error('Request failure. Status: '+response.statusText+' ; HTTP Code : '+response.status, json);
 	}
 	static logJqueryRequestFailure(jqxhr, status, errorThrown) {
@@ -222,18 +226,20 @@ class HTTPClient {
 			data = null;
 		}
 
-		const requestOptions = {
-			method: method,
-			headers: headers,
-			body: body,
-			mode: 'cors',
-			cache: 'no-cache'
-		}
-
-		const response = await fetch(url, requestOptions);
-
+		let response = null;
 		let jsonData = {};
 		try {
+			const requestOptions = {
+				method: method,
+				headers: headers,
+				body: body,
+				mode: 'cors',
+				cache: 'no-cache'
+			}
+
+			// On met le fetch dans un try catch pour détecter les erreurs de connexion réseau (si pas de connexion, une exception est déclenchée par fetch)
+			response = await fetch(url, requestOptions);
+
 			if (response.status !== 204 && response.statusText !== 'No Content') {
 				jsonData = await response.json();
 			}
@@ -309,16 +315,19 @@ class HTTPClient {
 			data = null;
 		}
 
-		const requestOptions = {
-			method: method,
-			headers: headers,
-			body: body,
-			mode: 'cors',
-			cache: 'no-cache'
-		}
-
-		const response = await fetch(url, requestOptions);
+		let response = null;
 		try {
+			const requestOptions = {
+				method: method,
+				headers: headers,
+				body: body,
+				mode: 'cors',
+				cache: 'no-cache'
+			}
+
+			// On met le fetch dans un try catch pour détecter les erreurs de connexion réseau (si pas de connexion, une exception est déclenchée par fetch)
+			response = await fetch(url, requestOptions);
+
 			if (response.status === 401 && response.statusText === 'Expired JWT Token') {
 				HTTPClient.refreshToken(() => HTTPClient.requestBlob(method, url, data, successCallback, errorCallback, completeCallback, additionalHeaders), errorCallback);
 				return;

package/import_from_csv.js

@@ -162,7 +162,7 @@ class ImportFromCsv {
 		tableContent += '<tbody>';
 		$.each(data, function (index, line) {
 			tableContent += '<tr data-line="'+(index+1)+'">';
-			tableContent += '<td class="gras text-end select_line_checkbox"><input type="checkbox" class="import_line_checkbox pull-left" checked="checked" /> '+(index+1)+'.</td>';
+			tableContent += '<td class="text-bold text-end select_line_checkbox"><input type="checkbox" class="import_line_checkbox pull-left" checked="checked" /> '+(index+1)+'.</td>';
 			$.each(line, function (key, value) {
 				tableContent += '<td data-key="'+key+'">'+(value!==null?value:'')+'</td>';
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.1.54",
+  "version": "1.1.56",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"