@osimatic/helpers-js 1.0.60 → 1.0.63

package/CHANGELOG

@@ -45,4 +45,7 @@ FormHelper.getFormErrorTextBis(...) -> FormHelper.getFormErrorText(...)
 FormHelper.displayFormErrorsFromXhr(form, btnSubmit, xhr) -> FormHelper.displayFormErrors(form, btnSubmit, xhr.responseJSON)
 
 1.0.35 :
-ajout méthode HTTPRequest.init() (charge le polyfill de fetch)
+ajout méthode HTTPRequest.init() (charge le polyfill de fetch)
+
+1.0.61
+DataTable.displayErrorFromXhr -> DataTable.displayError

package/data_table.js

@@ -268,10 +268,6 @@ class DataTable {
 		// }
 	}
 
-	static displayErrorFromXhr(div, jqxhr, defaultMessage) {
-		this.displayError(div, JSON.parse(jqxhr.responseJSON), defaultMessage);
-	}
-
 	static displayError(div, data, defaultMessage) {
 		var error = null;
 		if (data != null) {

package/file.js

@@ -111,7 +111,7 @@ class Img {
 				// $(img).attr('src', urlCreator.createObjectURL(data));
 				Img.setBlobToImg($(img), data);
 			},
-			error: (jqxhr, status, exception) => console.log('request failure. Status: '+status+'Exception: '+exception),
+			error: (jqxhr, status, errorThrown) => HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown),
 		});
 	}
 

package/import_from_csv.js

@@ -95,13 +95,13 @@ class ImportFromCsv {
 
 			requestImportData(dataToImport,
 				// fonction callback en cas d'erreur de formulaire
-				function (jqxhr) {
-					console.log(jqxhr.responseJSON);
-					if (typeof jqxhr.responseJSON['import_list'] !== 'undefined') {
-						formMatching.find('div.errors').html(jqxhr.responseJSON['import_list']).removeClass('hide');
+				(json) => {
+					console.log(json);
+					if (typeof json['import_list'] !== 'undefined') {
+						formMatching.find('div.errors').html(json['import_list']).removeClass('hide');
 					}
 					else {
-						formMatching.find('div.errors').html(ImportFromCsv.getErrorsHtmlOfImportData(jqxhr.responseJSON, divResult)).removeClass('hide');
+						formMatching.find('div.errors').html(ImportFromCsv.getErrorsHtmlOfImportData(json, divResult)).removeClass('hide');
 					}
 					formMatching.find('button[type="submit"]').buttonLoader('reset');
 				}

package/network.js

@@ -1,3 +1,4 @@
+const { JwtSession } = require('@osimatic/helpers-js/jwt');
 
 class HTTPRequest {
 	static init() {
@@ -138,10 +139,8 @@ class HTTPRequest {
 			let jsonData = {};
 			try {
 				jsonData = await response.json();
-				//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['message'] != 'undefined' && jsonData['message'] === 'Expired JWT Token') || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
@@ -303,7 +302,7 @@ class HTTPRequest {
 				}
 				//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 jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -386,6 +385,9 @@ class HTTPRequest {
 			(data) => {
 				JwtSession.setToken(data.token);
 				JwtSession.setRefreshToken(data.refresh_token);
+
+				HTTPRequest.setAuthorizationHeader(JwtSession.getToken());
+
 				onCompleteCallback();
 			}, 
 			() => {

package/number.js

@@ -1,10 +1,6 @@
 
 Number.prototype.format = Number.prototype.format || function(nbDecimal, locale) {
-	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
-	return new Intl.NumberFormat(locale, {
-		minimumFractionDigits: nbDecimal,
-		maximumFractionDigits: nbDecimal
-	}).format(this);
+	return Number.format(this, nbDecimal, locale);
 }
 
 if (!Number.format) {
@@ -32,32 +28,44 @@ Number.prototype.formatForDisplay = Number.prototype.formatForDisplay || functio
 };
 
 Number.prototype.formatCurrency = Number.prototype.formatCurrency || function(currency, nbDecimal, locale) {
+	return Number.formatCurrency(this, currency, nbDecimal, locale);
+}
+Number.formatCurrency = Number.formatCurrency || function(number, currency, nbDecimal, locale) {
 	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
 	return new Intl.NumberFormat(locale, {
 		style: 'currency',
 		currency: currency,
 		minimumFractionDigits: nbDecimal,
 		maximumFractionDigits: nbDecimal
-	}).format(this);
+	}).format(number);
 }
 
 Number.prototype.formatPercent = Number.prototype.formatPercent || function(nbDecimal, locale) {
+	return Number.formatPercent(this, nbDecimal, locale);
+}
+Number.formatPercent = Number.formatPercent || function(number, nbDecimal, locale) {
 	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
 	return new Intl.NumberFormat(locale, {
 		style: 'percent',
 		minimumFractionDigits: nbDecimal,
 		maximumFractionDigits: nbDecimal
-	}).format(this);
+	}).format(number);
 }
 
-Number.prototype.padLeft2 = Number.prototype.padLeft2 || function(n) {
-	return this > 9 ? "" + this : "0" + this;
+Number.prototype.padLeft2 = Number.prototype.padLeft2 || function() {
+	return Number.padLeft2(this);
+}
+Number.padLeft2 = Number.padLeft2 || function(n) {
+	return n > 9 ? "" + n : "0" + n;
 }
 
 Number.prototype.roundDecimal = Number.prototype.roundDecimal || function(precision) {
+	return Number.roundDecimal(this, precision);
+}
+Number.roundDecimal = Number.roundDecimal || function(number, precision) {
 	precision = precision || 2;
-	var tmp = Math.pow(10, precision);
-	return Math.round(this*tmp) / tmp;
+	let tmp = Math.pow(10, precision);
+	return Math.round(number*tmp) / tmp;
 }
 
 if (!Number.random) {
@@ -65,24 +73,3 @@ if (!Number.random) {
 		return Math.floor(Math.random() * (max - min + 1)) + min;
 	};
 }
-
-/** @deprecated */
-Number.prototype.formatAsString = function(locale, minimumFractionDigits) {
-	minimumFractionDigits = (typeof minimumFractionDigits != 'undefined'?minimumFractionDigits:0);
-	return new Intl.NumberFormat(locale, {minimumFractionDigits: minimumFractionDigits}).format(this);
-};
-/** @deprecated */
-Number.prototype.formatAsCurrency = function(locale, currency, nbFractionDigits) {
-	nbFractionDigits = (typeof nbFractionDigits != 'undefined'?nbFractionDigits:2);
-	return new Intl.NumberFormat(locale, {
-		style: 'currency',
-		currency: 'EUR',
-		minimumFractionDigits: nbFractionDigits,
-		maximumFractionDigits: nbFractionDigits
-	}).format(this);
-};
-/** @deprecated */
-Number.prototype.formatAsPercent = function(locale, minimumFractionDigits) {
-	minimumFractionDigits = (typeof minimumFractionDigits != 'undefined'?minimumFractionDigits:0);
-	return new Intl.NumberFormat(locale, {style: 'percent', minimumFractionDigits:minimumFractionDigits}).format(this);
-};

package/package.json

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

package/.idea/helpers-js.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>