@osimatic/helpers-js 1.0.31 → 1.0.32

package/data_table.js

@@ -284,7 +284,7 @@ class DataTable {
 		}
 
 		if (error == null) {
-			return this.displayErrorMessage(div, (typeof defaultMessage != 'undefined' ? defaultMessage : labelErrorOccured));
+			return this.displayErrorMessage(div, (typeof defaultMessage != 'undefined' ? defaultMessage : (typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')));
 		}
 		return this.displayErrorMessage(div, 'Critères sélectionnés incorrect.');
 	}

package/details_sub_array.js

@@ -5,7 +5,7 @@ class DetailsSubArray {
 			return tr.closest('table').find('thead tr').children().length;
 		}
 		function displayErrorRow(tr) {
-			tr.after($('<tr class="text-error"><td colspan="'+getNbColumns(tr)+'">'+labelErrorOccured+'</td></tr>'));
+			tr.after($('<tr class="text-error"><td colspan="'+getNbColumns(tr)+'">'+(typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')+'</td></tr>'));
 		}
 		function displayDetailsRow(tr, content) {
 			var trContent = $(''
@@ -74,14 +74,15 @@ class DetailsSubArray {
 				return;
 			}
 
+			function onComplete() {
+				hideLoading(link);
+				setHideDetailsLink(link);
+				//link.attr('disabled', false).button('reset');
+			}
+
 			//link.attr('disabled', true).button('loading');
-			$.ajax({
-				url: link.data("url_details"),
-				method: 'GET',
-				headers: HTTPRequest.getHeaders(),
-				cache: false,
-				dataType: 'json',
-				success: function (jsonObj) {
+			HTTPRequest.get(link.data('url_details'), {},
+				(jsonObj) => {
 					if (jsonObj == null) {
 						if (typeof callbackOnDetailsActionRequestError != 'undefined' && callbackOnDetailsActionRequestError != null) {
 							callbackOnDetailsActionRequestError(link);
@@ -94,24 +95,21 @@ class DetailsSubArray {
 					if (typeof callbackOnDetailsActionRequestSuccess != 'undefined' && callbackOnDetailsActionRequestSuccess != null) {
 						displayDetailsRow(link.closest('tr'), callbackOnDetailsActionRequestSuccess(jsonObj, link));
 					}
-				},
-				error: function (jqxhr, status, exception) {
-					console.log('Detail request failure. Status: '+status+' ; Exception: '+exception);
 
+					onComplete();
+				},
+				() => {
 					if (typeof callbackOnDetailsActionRequestError != 'undefined' && callbackOnDetailsActionRequestError != null) {
 						callbackOnDetailsActionRequestError(link);
 						return;
 					}
 
-					link.closest('tr').after($('<tr class="error"><td colspan="6" class="center">'+labelErrorOccured+'</td></tr>'));
+					link.closest('tr').after($('<tr class="error"><td colspan="6" class="center">'+(typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')+'</td></tr>'));
+
+					onComplete();
 					//window.location.replace(decodeURIComponent(urlRetour));
 				},
-				complete: function() {
-					hideLoading(link);
-					setHideDetailsLink(link);
-					//link.attr('disabled', false).button('reset');
-				}
-			});
+			);
 		}
 
 		table.find('a.details_link').each(function(idx, link) {

package/file.js

@@ -103,7 +103,7 @@ class Img {
 		$.ajax({
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			cache: false,
 			xhrFields: {responseType: 'blob'},
 			success: (data) => {

package/flash_message.js

@@ -31,7 +31,7 @@ class FlashMessage {
 	/** @deprecated **/
 	static displayRequestFailure(status, exception, modal) {
 		console.log('request failure. Status: ', status, ' Exception: ', exception);
-		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  "Une erreur s'est produite.", false, modal);
+		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.', false, modal);
 	}
 }
 

package/network.js

@@ -14,7 +14,7 @@ class HTTPRequest {
 		this.headers[key] = value;
 	}
 
-	static getHeaders() {
+	static getHeaders(asObject) {
 		//if (typeof httpHeaders != 'undefined') {
 		//	return httpHeaders;
 		//}
@@ -23,6 +23,10 @@ class HTTPRequest {
 			this.headers = {};
 		}
 
+		if (typeof asObject != 'undefined' && asObject) {
+			return this.headers;
+		}
+
 		let httpHeaders = new Headers();
 		Object.entries(this.headers).forEach(([key, value]) => {
 			httpHeaders.append(key, value);
@@ -108,7 +112,7 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			dataType: 'json',
 			cache: false,
 			success: (data) => successCallback(data),
@@ -187,7 +191,7 @@ class HTTPRequest {
 		let ajaxOptions = {
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			cache: false,
 			xhrFields: {
 				responseType: 'blob'
@@ -275,7 +279,7 @@ class HTTPRequest {
 		$.ajax({
 			type: 'POST',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			dataType: 'json', // 22/09/2020 : à voir si cette ligne pose pb (utilisé pour requete import et peut être d'autres
 			data: formData,
 			cache: false,

package/package.json

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