@osimatic/helpers-js 1.0.31 → 1.0.34

package/changelog.txt

@@ -37,4 +37,9 @@ let httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
 remplacer l'utilisation des variables httpHeaders / _httpHeaders par HTTPRequest.getHeaders()
 
 FlashMessage.displayRequestFailure(status, exception, modal) -> FlashMessage.displayError(labelErrorOccured, modal)
-FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)
+FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)
+
+Location.checkCoordinates(...) -> GeographicCoordinates.check(...) (car Location est déjà défini en javascript natif)
+
+FormHelper.getFormErrorTextBis(...) -> FormHelper.getFormErrorText(...)
+FormHelper.displayFormErrorsFromXhr(form, btnSubmit, xhr) -> FormHelper.displayFormErrors(form, btnSubmit, xhr.responseJSON)

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/form_helper.js

@@ -183,16 +183,6 @@ class FormHelper {
 	}
 
 	static getFormErrorText(errors) {
-		let errorLabels = '';
-		for (let property in errors) {
-			if (typeof errors[property] != 'function') {
-				errorLabels += '<span>' + errors[property] + '</span><br>';
-			}
-		}
-		return errorLabels;
-	}
-
-	static getFormErrorTextBis(errors) {
 		let errorLabels = '';
 		for (let property in errors) {
 			// console.log(property);
@@ -208,7 +198,7 @@ class FormHelper {
 	}
 
 	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
-		this.displayFormErrorsFromText(form, this.getFormErrorTextBis(errors), errorWrapperDiv);
+		this.displayFormErrorsFromText(form, this.getFormErrorText(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
 			if (btnSubmit.buttonLoader != null) {
 				btnSubmit.buttonLoader('reset');
@@ -218,10 +208,6 @@ class FormHelper {
 		}
 	}
 
-	static displayFormErrorsFromXhr(form, btnSubmit, xhr) {
-		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
-	}
-
 	static displayFormErrorsFromText(form, errorLabels, errorWrapperDiv) {
 		let errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
 
@@ -255,12 +241,48 @@ class FormHelper {
 	}
 
 
+	static buttonLoader(button, action) {
+		button = $(button);
+		if (action === 'start' || action === 'loading') {
+			if (button.attr('disabled')) {
+				return self;
+			}
+			button.attr('disabled', true);
+			button.attr('data-btn-text', button.html());
+			//let text = '<span class="spinner"><i class=\'fa fa-circle-notch fa-spin\'></i></span>Traitement en cours…';
+			let text = '<i class=\'fa fa-circle-notch fa-spin\'></i> Traitement en cours…';
+			if (button.data('load-text') != undefined && button.data('load-text') != null && button.data('load-text') != '') {
+				text = button.data('load-text');
+			}
+			if (button.data('loading-text') != undefined && button.data('loading-text') != null && button.data('loading-text') != '') {
+				text = button.data('loading-text');
+			}
+			button.html(text);
+			button.addClass('disabled');
+		}
+		if (action === 'stop' || action === 'reset') {
+			button.html(button.attr('data-btn-text'));
+			button.removeClass('disabled');
+			button.attr('disabled', false);
+			//button.removeAttr("disabled");
+		}
+		return button;
+	}
+	
+	
+	
+	
 
 	/** @deprecated **/
 	static logRequestFailure(status, exception) {
 		console.log('request failure. Status: '+status+' ; Exception: '+exception);
 	}
 
+	/** @deprecated **/
+	static displayFormErrorsFromXhr(form, btnSubmit, xhr) {
+		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
+	}
+
 }
 
 module.exports = { FormHelper };

package/index.js

@@ -15,7 +15,7 @@ const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./da
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
 const { FormHelper } = require('./form_helper');
-const { Country, PostalAddress, Location } = require('./location');
+const { Country, PostalAddress, GeographicCoordinates } = require('./location');
 const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
 const { chr, ord, trim, empty } = require('./php.min');
@@ -40,11 +40,9 @@ const { GoogleRecaptcha } = require('./google_recaptcha');
 const { GoogleMap } = require('./google_maps');
 const { OpenStreetMap } = require('./open_street_map');
 
-// deprecated
-
 module.exports = {
 	Array, Object, Number, String,
-	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, Location, SocialNetwork,
+	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
 	DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap

package/location.js

@@ -394,10 +394,10 @@ class PostalAddress {
 	}
 }
 
-class Location {
-	static checkCoordinates(str) {
+class GeographicCoordinates {
+	static check(str) {
 		return /^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/.test(str);
 	}
 }
 
-module.exports = { Country, PostalAddress, Location };
+module.exports = { Country, PostalAddress, GeographicCoordinates };

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);
@@ -78,27 +82,27 @@ class HTTPRequest {
 				//console.log(url, jsonData);
 				//console.log(response.status, response.statusText, jsonData['error']);
 
-				if (response.status == 401 && (response.statusText === "Expired JWT Token" || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
+				if (response.status == 401 && (response.statusText === 'Expired JWT Token' || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
 					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
 
 				if (response.ok) {
-					successCallback(jsonData);
+					successCallback(jsonData, response);
 					return;
 				}
 			}
 			catch (e) {
 				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, e);
+					errorCallback(response);
 				}
 				return;
 			}
 
 			HTTPRequest.logRequestFailure(response, jsonData);
 			if (typeof errorCallback != 'undefined' && errorCallback != null) {
-				errorCallback(response, response.status, null, jsonData);
+				errorCallback(response, jsonData);
 			}
 			return;
 		}
@@ -108,19 +112,23 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			dataType: 'json',
 			cache: false,
-			success: (data) => successCallback(data),
+			success: (data, status, jqxhr) => {
+				if (typeof successCallback != 'undefined' && successCallback != null) {
+					successCallback(data, jqxhr);
+				}
+			},
 			error: (jqxhr, status, errorThrown) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+				if (jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token'  || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
 
 				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, status, errorThrown);
+					errorCallback(jqxhr, jqxhr.responseJSON);
 				}
 			}
 		});
@@ -153,7 +161,7 @@ class HTTPRequest {
 				/*console.log(url);
 				console.log(blobData);*/
 
-				if (response.status == 401 && response.statusText === "Expired JWT Token") {
+				if (response.status == 401 && response.statusText === 'Expired JWT Token') {
 					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
@@ -164,18 +172,18 @@ class HTTPRequest {
 				else {
 					HTTPRequest.logRequestFailure(response, null);
 					if (typeof errorCallback != 'undefined' && errorCallback != null) {
-						errorCallback(response, response.status, null);
+						errorCallback(response);
 					}
 				}
 			}
 			catch (e) {
 				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, e);
+					errorCallback(response);
 				}
 			}
 			if (typeof completeCallback != 'undefined' && completeCallback != null) {
-				completeCallback(response, response.status);
+				completeCallback(response);
 			}
 			return;
 		}
@@ -183,11 +191,10 @@ class HTTPRequest {
 		//l'api fetch n'est pas dispo pour ce navigateur => normalement ce cas ne devrait pas arriver car le polyfill est chargé
 		console.error('fetch\'s polyfill used');
 
-
 		let ajaxOptions = {
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			cache: false,
 			xhrFields: {
 				responseType: 'blob'
@@ -203,19 +210,19 @@ class HTTPRequest {
 		$.ajax(Object.assign({...ajaxOptions}, {
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
 			error: (jqxhr, status, errorThrown) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+				if (jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
 
 				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, status, errorThrown);
+					errorCallback(jqxhr);
 				}
 			},
-			complete: (jqxhr, status) => {
+			complete: (jqxhr) => {
 				if (typeof completeCallback != 'undefined' && completeCallback != null) {
-					completeCallback(jqxhr, status);
+					completeCallback(jqxhr);
 				}
 			}
 		}));
@@ -224,7 +231,7 @@ class HTTPRequest {
 	static async post(url, formData, successCallback, errorCallback, formErrorCallback) {
 		formData = this.formatFormData(formData);
 
-		if (window.fetch && false) {
+		if (window.fetch) {
 			const response = await fetch(url, {
 				method: 'POST',
 				body: formData,
@@ -235,37 +242,39 @@ class HTTPRequest {
 
 			let jsonData = {};
 			try {
-				jsonData = await response.json();
+				if (response.statusText !== 'No Content') {
+					jsonData = await response.json();
+				}
 				//console.log(url, jsonData);
 
-				if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
+				if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === 'Expired JWT Token' || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
 
 				if (response.ok) {
 					if (typeof successCallback != 'undefined' && successCallback != null) {
-						successCallback(jsonData);
+						successCallback(jsonData, response);
 					}
 					return;
 				}
 
 				if (response.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
-					formErrorCallback(response, response.status, jsonData);
+					formErrorCallback(jsonData, response);
 					return;
 				}
 			}
 			catch (e) {
 				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, e);
+					errorCallback(response);
 				}
 				return;
 			}
 
 			HTTPRequest.logRequestFailure(response, jsonData);
 			if (typeof errorCallback != 'undefined' && errorCallback != null) {
-				errorCallback(response, response.status, null, jsonData);
+				errorCallback(response, jsonData);
 			}
 			return;
 		}
@@ -275,30 +284,30 @@ 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,
 			contentType: false,
 			processData: false,
-			success: (data) => {
+			success: (data, status, jqxhr) => {
 				if (typeof successCallback != 'undefined' && successCallback != null) {
-					successCallback(data);
+					successCallback(data, jqxhr);
 				}
 			},
 			error: (jqxhr, status, errorThrown) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && url !== HTTPRequest.refreshTokenUrl && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+				if (url !== HTTPRequest.refreshTokenUrl && jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
 				if (jqxhr.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
-					formErrorCallback(jqxhr, status, errorThrown);
+					formErrorCallback(jqxhr.responseJSON, jqxhr);
 					return;
 				}
 
 				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, status, errorThrown);
+					errorCallback(jqxhr, jqxhr.responseJSON);
 				}
 			}
 		});

package/package.json

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

package/todos/button_loader.js

@@ -1,50 +0,0 @@
-
-// Loading button plugin (removed from BS4)
-(function($) {
-	"use strict";
-
-	$.fn.extend({
-		/*
-		button: function (action) {
-			console.log(action);
-			if (action === 'loading' && this.data('loading-text')) {
-				console.log('loading');
-				this.data('original-text', this.html()).html(this.data('loading-text')).prop('disabled', true);
-			}
-			if (action === 'reset' && this.data('original-text')) {
-				console.log('reset');
-				this.html(this.data('original-text')).prop('disabled', false);
-			}
-		},
-		*/
-
-		buttonLoader: function (action) {
-			//console.log(action);
-			var self = $(this);
-			if (action === 'start' || action === 'loading') {
-				if ($(self).attr('disabled')) {
-					return self;
-				}
-				$(self).attr('disabled', true);
-				$(self).attr('data-btn-text', $(self).html());
-				//let text = '<span class="spinner"><i class=\'fa fa-circle-notch fa-spin\'></i></span>Traitement en cours…';
-				let text = '<i class=\'fa fa-circle-notch fa-spin\'></i> Traitement en cours…';
-				if ($(self).data('load-text') != undefined && $(self).data('load-text') != null && $(self).data('load-text') != '') {
-					text = $(self).data('load-text');
-				}
-				if ($(self).data('loading-text') != undefined && $(self).data('loading-text') != null && $(self).data('loading-text') != '') {
-					text = $(self).data('loading-text');
-				}
-				$(self).html(text);
-				$(self).addClass('disabled');
-			}
-			if (action === 'stop' || action === 'reset') {
-				$(self).html($(self).attr('data-btn-text'));
-				$(self).removeClass('disabled');
-				$(self).attr('disabled', false);
-				//$(self).removeAttr("disabled");
-			}
-			return self;
-		}
-	});
-}(jQuery));