@osimatic/helpers-js 1.1.0 → 1.1.1

package/contact_details.js

@@ -88,7 +88,7 @@ class TelephoneNumber {
 			const number = libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode);
 			return number != null ? number.formatInternational() : null;
 		} catch (error) {
-			console.log(error);
+			console.error(error);
 		}
 		return '';
 	}

package/data_table.js

@@ -158,7 +158,7 @@ class DataTable {
 
 		}
 
-		console.log('defaultFilters', defaultFilters);
+		//console.log('defaultFilters', defaultFilters);
 
 		DataTable.setDefaultFilters(defaultFilters);
 		DataTable.setCallbackOnLoadData(options.on_load_data);
@@ -335,7 +335,7 @@ class DataTable {
 			DataTable.removeLoader(div);
 		}
 		catch (e) {
-			console.log(e);
+			console.error(e);
 		}
 	}
 

package/google_maps.js

@@ -40,7 +40,7 @@ class GoogleMap {
 	}
 
 	addMarkers(listLocation, icon) {
-		console.log(listLocation);
+		//console.log(listLocation);
 		if (listLocation.length == 0) {
 			return;
 		}

package/google_recaptcha.js

@@ -49,7 +49,7 @@ class GoogleRecaptcha {
 				GoogleRecaptcha.grecaptchaWidgets[id] = grecaptcha.render(id, googleReCaptchaDatas);
 			}
 			catch (e) {
-				console.log('Exception during grecaptcha.render', e);
+				console.error('Exception during grecaptcha.render', e);
 			}
 		}
 		else {

package/http_client.js

@@ -177,8 +177,6 @@ class HTTPClient {
 	}
 
 	static async request(method, url, data, successCallback, errorCallback, formErrorCallback) {
-		method = method.toUpperCase();
-
 		if (!window.fetch) {
 			return;
 		}
@@ -186,19 +184,17 @@ class HTTPClient {
 		let body = null;
 		method = method.toUpperCase();
 
-		if ('POST' !== method && 'PATCH' !== method) {
-			url += (!url.includes('?') ? '?' : '') + HTTPClient.formatQueryString(data);
-			data = null;
-		}
-
-		if (method === 'PATCH') {
+		if ('PATCH' === method) {
 			HTTPClient.setHeader('Content-Type', 'application/x-www-form-urlencoded');
 			body = new URLSearchParams(HTTPClient.formatFormData(data)).toString();
 		}
-
-		if ('POST' === method) {
+		else if ('POST' === method) {
 			body = HTTPClient.formatFormData(data);
 		}
+		else {
+			url += (!url.includes('?') ? '?' : '') + HTTPClient.formatQueryString(data);
+			data = null;
+		}
 
 		const requestOptions = {
 			headers: HTTPClient.getHeaders(),
@@ -252,33 +248,46 @@ class HTTPClient {
 		}
 	}
 
-	static async download(method, url, data, errorCallback, completeCallback) {
-		method = typeof method == 'undefined' || null == method ? 'GET' : method;
-
-		if ('GET' === method) {
-			url += (!url.includes('?') ? '?' : '') + HTTPClient.formatQueryString(data);
-			data = null;
-		}
+	static download(method, url, data, errorCallback, completeCallback) {
+		HTTPClient.requestBlob(method, url, data,
+			(blobData, response) => File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition')),
+			errorCallback,
+			completeCallback
+		);
+	}
 
+	static async requestBlob(method, url, data, successCallback, errorCallback, completeCallback) {
 		if (!window.fetch) {
 			return;
 		}
 
-		let requestOptions = {
+		let body = null;
+		method = method.toUpperCase();
+
+		if ('PATCH' === method) {
+			HTTPClient.setHeader('Content-Type', 'application/x-www-form-urlencoded');
+			body = new URLSearchParams(HTTPClient.formatFormData(data)).toString();
+		}
+		else if ('POST' === method) {
+			body = HTTPClient.formatFormData(data);
+		}
+		else {
+			url += (!url.includes('?') ? '?' : '') + HTTPClient.formatQueryString(data);
+			data = null;
+		}
+
+		const requestOptions = {
 			method: method,
 			headers: HTTPClient.getHeaders(),
+			body: body,
 			mode: 'cors',
 			cache: 'no-cache'
 		}
 
-		if ('GET' !== method) {
-			requestOptions['body'] = HTTPClient.formatFormData(data);
-		}
-
 		const response = await fetch(url, requestOptions);
 		try {
 			if (response.status === 401 && response.statusText === 'Expired JWT Token') {
-				HTTPClient.refreshToken(() => HTTPClient.download(method, url, data, errorCallback, completeCallback), errorCallback);
+				HTTPClient.refreshToken(() => HTTPClient.requestBlob(method, url, data, successCallback, errorCallback, completeCallback), errorCallback);
 				return;
 			}
 
@@ -289,7 +298,9 @@ class HTTPClient {
 
 			if (response.ok) {
 				const blobData = await response.blob();
-				File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));
+				if (typeof successCallback != 'undefined' && successCallback != null) {
+					successCallback(blobData, response);
+				}
 			}
 			else {
 				HTTPClient.logRequestFailure(response, null);

package/import_from_csv.js

@@ -42,7 +42,7 @@ class ImportFromCsv {
 					},
 					complete: function(results, file) {
 						isFileParsed = true;
-						console.log(file, results);
+						//console.log(file, results);
 
 						if (false === CSV.checkFile(file.name, file.type)) {
 							$('#form_import_upload div.errors').html(errorMessageFileNotValid).removeClass('hide');
@@ -63,7 +63,7 @@ class ImportFromCsv {
 				error: function(err, file, inputElem, reason) {
 					isFileParsed = true;
 					formUpload.find('div.errors').html(errorMessageFileNotValid).removeClass('hide');
-					console.log(err, file, reason);
+					console.error(err, file, reason);
 				},
 				complete: function() {
 					if (!isFileParsed) {
@@ -82,7 +82,7 @@ class ImportFromCsv {
 			divResult.find('table tr').removeClass('danger');
 			
 			let tabLink = ImportFromCsv.getTabLink(formMatching);
-			console.log('tabLink', tabLink);
+			//console.log('tabLink', tabLink);
 
 			if ($.isEmptyObject(tabLink)) {
 				formMatching.find('div.errors').html(errorMessageImportSelectColumns).removeClass('hide');
@@ -91,12 +91,12 @@ class ImportFromCsv {
 			}
 
 			let dataToImport = ImportFromCsv.getDataToImport(divResult, tabLink);
-			console.log('dataToImport', dataToImport);
+			//console.log('dataToImport', dataToImport);
 
 			requestImportData(dataToImport,
 				// fonction callback en cas d'erreur de formulaire
 				(json) => {
-					console.log(json);
+					//console.log(json);
 					if (typeof json['import_list'] !== 'undefined') {
 						formMatching.find('div.errors').html(json['import_list']).removeClass('hide');
 					}
@@ -133,7 +133,7 @@ class ImportFromCsv {
 					}
 				}
 			});
-			console.log('lineData', lineData);
+			//console.log('lineData', lineData);
 			importListWithFieldNames.push(lineData);
 		});
 		return importListWithFieldNames;
@@ -222,7 +222,7 @@ class ImportFromCsv {
 		let resultError = errorMessageImportFailed;
 		resultError += '<ul>';
 		$.each(json, function(idx, errorData) {
-			console.log(errorData);
+			console.error(errorData);
 			divResult.find('table tr[data-line="'+errorData.line+'"]').addClass('danger');
 
 			resultError += '<li>'+lineLabel.format(errorData.line)+'<ul>';

package/media.js

@@ -66,8 +66,7 @@ class AudioMedia {
 			request.send();
 		}
 		catch (e) {
-			console.log(e);
-			console.log('web audio api not supported');
+			console.error('web audio api not supported', e);
 		}
 	}
 
@@ -86,7 +85,7 @@ class AudioMedia {
 
 		analyser.fftSize = 256;
 		let bufferLength = analyser.frequencyBinCount;
-		console.log(bufferLength);
+		//console.log(bufferLength);
 		let dataArray = new Uint8Array(bufferLength);
 
 		canvasCtx.clearRect(0, 0, canvasWidth, canvasHeight);

package/open_street_map.js

@@ -81,7 +81,7 @@ class OpenStreetMap {
 
 		//marker.on('click', () => {
 		marker.on('popupopen', () => {
-			console.log('popupopen');
+			//console.log('popupopen');
 			if (typeof options['on_click'] == 'function') {
 				options['on_click']();
 			}

package/package.json

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