@osimatic/helpers-js 1.0.97 → 1.0.99

package/CHANGELOG

@@ -52,3 +52,8 @@ DataTable.displayErrorFromXhr -> DataTable.displayError
 
 1.0.96
 var intlTelInputUtilsPath = 'xxx'; -> TelephoneNumber.setIntlTelInputUtilsPath('xxx');
+
+1.0.99
+JwtSession.isSimulationConnexion() -> non remplacé
+JwtSession.cancelSimulationConnexion() -> non remplacé
+HTTPRequest -> HTTPClient

package/data_table.js

@@ -1,9 +1,11 @@
 
 class DataTable {
-	// criteres = {};
 
-	constructor() {
-		this.criteres = {};
+	static setOptions(options) {
+		DataTable.dateTableOptions = Object.assign(...DataTable.getOptions(), options);
+	}
+	static getOptions() {
+		return DataTable.dateTableOptions || {};
 	}
 
 	static setCallbackOnLoadData(callback) {
@@ -39,8 +41,8 @@ class DataTable {
 	// ------------------------------------------------------------
 
 	static init(options) {
-		var div = options.div;
-		var defaultFilters = options.default_filters || {};
+		let div = options.div;
+		let defaultFilters = options.default_filters || {};
 
 		//let form = div.find('.filter_popover_content form');
 		//if (typeof form != 'undefined') {
@@ -49,7 +51,7 @@ class DataTable {
 		//}
 
 		// Bouton filtrer
-		var filterLink = div.find('a.filter_link');
+		let filterLink = div.find('a.filter_link');
 		if (filterLink.length) {
 			filterLink.popover({
 				content: div.find('.filter_popover_content').html(),
@@ -68,7 +70,7 @@ class DataTable {
 			});
 
 			filterLink.on('shown.bs.popover', function () {
-				var form = $('.filter_popover form');
+				let form = $('.filter_popover form');
 
 				DataTable.populateFormFromFilters(form);
 
@@ -89,7 +91,7 @@ class DataTable {
 		}
 
 		// Bouton exporter
-		var exportLink = div.find('a.export_link');
+		let exportLink = div.find('a.export_link');
 		if (exportLink.length) {
 			if (typeof options.export_modal_enabled == 'undefined' || !options.export_modal_enabled) {
 				// sans modal
@@ -111,9 +113,9 @@ class DataTable {
 				});
 
 				$('div#modal_export').on('show.bs.modal', function (event) {
-					var button = $(event.relatedTarget);
-					var modal = $(this);
-					var form = modal.find('form');
+					let button = $(event.relatedTarget);
+					let modal = $(this);
+					let form = modal.find('form');
 
 					// Fonction de callback permettant d'initialiser contenu du modal export, cette fonction doit renvoyer le contenu du modal
 					if (typeof options.set_export_form != 'undefined' && options.set_export_form != null) {
@@ -125,7 +127,7 @@ class DataTable {
 						modal.find('modal-body').html(options.on_show_export_form(modal, button));
 					}
 
-					var btnSubmit = form.find('button[type="submit"]').attr('disabled', false).button('reset');
+					let btnSubmit = form.find('button[type="submit"]').attr('disabled', false).button('reset');
 					btnSubmit.off('click').click(function(e) {
 						e.preventDefault();
 						$(this).attr('disabled', true).button('loading');
@@ -255,9 +257,9 @@ class DataTable {
 	}
 	static displayMessage(div, msg, cssClass /*, removeLoader=false*/) {
 		this.resetContent(div);
-		var table = div.find('table');
+		let table = div.find('table');
 		table.find('thead,tfoot').addClass('hide');
-		var msgHtml = '<div class="text-'+cssClass+' center">'+msg+'</div>';
+		let msgHtml = '<div class="text-'+cssClass+' center">'+msg+'</div>';
 		if (table.find('tbody').length == 0) {
 			table.append('<tbody></tbody>');
 		}
@@ -269,7 +271,7 @@ class DataTable {
 	}
 
 	static displayError(div, data, defaultMessage) {
-		var error = null;
+		let error = null;
 		if (data != null) {
 			if (typeof data.error != 'undefined') {
 				error = data.error;
@@ -286,9 +288,9 @@ class DataTable {
 	}
 
 	static getDefaultColumnsForDisplayedTable(div) {
-		var table = div.find('table');
-		var columns = [];
-		var defaultHiddenColumns = table.data('hidden_fields') != null ? table.data('hidden_fields').split(',') : [];
+		let table = div.find('table');
+		let columns = [];
+		let defaultHiddenColumns = table.data('hidden_fields') != null ? table.data('hidden_fields').split(',') : [];
 		table.find('thead tr th').each(function(idx, th) {
 			if (defaultHiddenColumns.indexOf($(th).data('key')) == -1) {
 				columns.push($(th).data('key'));
@@ -300,12 +302,12 @@ class DataTable {
 
 	static setDataContent(div, data, displayLineCallback, completeCallback) {
 		//console.log('setDataContent');
-		var table = div.find('table').removeClass('hide');
+		let table = div.find('table').removeClass('hide');
 
 		try {
 			DataTable.resetContent(div);
-			var tableBody = table.find('tbody');
-			for (var i = 0; i < data.length; i++) {
+			let tableBody = table.find('tbody');
+			for (let i = 0; i < data.length; i++) {
 				tableBody.append(displayLineCallback(data[i]));
 			}
 
@@ -339,7 +341,7 @@ class DataTable {
 
 	static initDataContent(div) {
 		//console.log('initDataContent');
-		var table = div.find('table');
+		let table = div.find('table');
 
 		// Popover/Tooltip
 		div.find('[data-toggle="popover"]').popover({'trigger':'hover', 'html':true});
@@ -355,16 +357,16 @@ class DataTable {
 
 		if (table.length > 0 && !table.is('[data-no_datatables="1"]') && !$.fn.dataTable.isDataTable(table)) {
 			if (table.data('page_length') != null) {
-				dateTablesOptions.pageLength = table.data('page_length');
+				DataTable.getOptions()['pageLength'] = table.data('page_length');
 			}
-			table.DataTable(dateTablesOptions);
+			table.DataTable(DataTable.getOptions());
 		}
 
 		DataTable.updateDataContent(div);
 	}
 
 	static updateDataContent(div) {
-		var table = div.find('table');
+		let table = div.find('table');
 
 		// Maj colonnes
 		if (table.length > 0 && typeof div.data('table_name') != 'undefined' && div.data('table_name') != null && div.data('display_items').split(',').indexOf('table_columns') != -1) {
@@ -372,7 +374,7 @@ class DataTable {
 				// table.find('.'+$(th).data('key')+':not(.select):not(.action)').hide();
 				table.find('.'+$(th).data('key')+':not(.select):not(.action)').addClass('hide');
 			});
-			var columns = this.getDisplayParam(div, 'html', null, 'columns').split(',').removeEmptyValues();
+			let columns = this.getDisplayParam(div, 'html', null, 'columns').split(',').removeEmptyValues();
 			$.each(columns, function(idx, key) {
 				table.find('.'+key).removeClass('hide');
 				// table.find('.'+key).show();
@@ -391,7 +393,7 @@ class DataTable {
 
 		$.fn.dataTable.ext.search = [];
 		//$.fn.dataTable.ext.search.pop();
-		var dataTableObject = table.DataTable();
+		let dataTableObject = table.DataTable();
 		$.fn.dataTable.ext.search.push(
 			function(settings, searchData, index, rowData, counter) {
 				return callback($(dataTableObject.row(index).node()));

package/duration.js

@@ -21,7 +21,8 @@ class Duration {
 		minutes = Math.floor(minutes / 60);
 		// minutes = minutes - (minutes % 60);
 		let minCentieme = Math.round( (minutes / 60 ) * 100 );
-		return parseFloat(hour+'.'+minCentieme);
+		return hour+(minCentieme/100);
+		//return parseFloat(hour+'.'+minCentieme);
 	}
 
 	static convertToDurationAsInputTimeValue(durationInSeconds) {

package/form_helper.js

@@ -161,33 +161,35 @@ class FormHelper {
 		//if ( $('[type="date"]').prop('type') != 'date' ) {
 		//	$('[type="date"]').datepicker();
 		//}
-		if (!Modernizr.inputtypes.date) {
-			// $.fn.datepicker.defaults.language = 'fr';
-			// $.datepicker.setDefaults( $.datepicker.regional["fr"]);
-			form.find('input[type="date"]')
-				.css('max-width', '120px')
-				// 28/06/2021 : désactivation du datepicker car safari le gere en natif
-				/*
-				.datepicker({
-					dateFormat: 'yy-mm-dd',
-					changeMonth: true,
-					changeYear: true,
-					showOn: "both",
-					buttonImage: ROOT_PATH+'images/icons/calendar-alt.png',
-					buttonImageOnly: true,
-				})
-				*/
-			;
-			//form.find('input[type="date"]').datepicker({dateFormat: 'yy-mm-dd', minDate: "-10Y", maxDate: "+3Y"});
-			// $("#date_conf").datepicker("option", $.datepicker.regional["fr"]);
-			// $("#date_conf").datepicker("option", "dateFormat", "yy-mm-dd");
-		}
-		if (!Modernizr.inputtypes.time) {
-			form.find('input[type="time"]')
-				.css('max-width', '100px')
-				.attr('placeholder', 'hh:mm')
-			;
-			form.find('input[type="time"][step="1"]').attr('placeholder', 'hh:mm:ss');
+		if (typeof Modernizr != 'undefined') {
+			if (!Modernizr.inputtypes.date) {
+				// $.fn.datepicker.defaults.language = 'fr';
+				// $.datepicker.setDefaults( $.datepicker.regional["fr"]);
+				form.find('input[type="date"]')
+					.css('max-width', '120px')
+					// 28/06/2021 : désactivation du datepicker car safari le gere en natif
+					/*
+					.datepicker({
+						dateFormat: 'yy-mm-dd',
+						changeMonth: true,
+						changeYear: true,
+						showOn: "both",
+						buttonImage: ROOT_PATH+'images/icons/calendar-alt.png',
+						buttonImageOnly: true,
+					})
+					*/
+				;
+				//form.find('input[type="date"]').datepicker({dateFormat: 'yy-mm-dd', minDate: "-10Y", maxDate: "+3Y"});
+				// $("#date_conf").datepicker("option", $.datepicker.regional["fr"]);
+				// $("#date_conf").datepicker("option", "dateFormat", "yy-mm-dd");
+			}
+			if (!Modernizr.inputtypes.time) {
+				form.find('input[type="time"]')
+					.css('max-width', '100px')
+					.attr('placeholder', 'hh:mm')
+				;
+				form.find('input[type="time"][step="1"]').attr('placeholder', 'hh:mm:ss');
+			}
 		}
 
 		// Show/Hide password

package/http_client.js

@@ -332,13 +332,9 @@ class HTTPClient {
 
 		HTTPClient.request('POST', HTTPClient.refreshTokenUrl, payload,
 			(data) => {
-				JwtSession.setToken(data['token']);
-				JwtSession.setRefreshToken(data['refresh_token']);
-
+				JwtSession.updateToken(data['token'], data['refresh_token']);
 				HTTPClient.setAuthorizationToken(JwtSession.getToken());
-
 				onRefreshTokenComplete();
-
 			},
 			() => {
 				JwtSession.logout();

package/jwt.js

@@ -9,15 +9,6 @@ class JwtToken {
 		return JSON.parse(jsonPayload);
 	}
 
-	static hasRole(token, role) {
-		if (token == null) {
-			return false;
-		}
-
-		let payload = JwtToken.parseJwt(token);
-		return typeof payload['roles'] != 'undefined' && payload['roles'].indexOf(role) !== -1;
-	}
-
 	static getData(token, key) {
 		if (token == null) {
 			return null;
@@ -29,52 +20,70 @@ class JwtToken {
 		}
 		return null;
 	}
-}
 
-class JwtSession {
-	static denyAccessUnlessGranted(roles) {
-		let hasRole = false;
-		
-		roles.forEach(role => {
-			if (JwtSession.isGranted(role)) {
-				hasRole = true;
-			}
-		});
+	static hasRole(token, role) {
+		if (token == null) {
+			return false;
+		}
 
-		return hasRole;
+		let payload = JwtToken.parseJwt(token);
+		return typeof payload['roles'] != 'undefined' && payload['roles'].indexOf(role) !== -1;
 	}
+}
 
-	static setToken(token) {
-		localStorage.setItem('access_token', token);
+class JwtSession {
+	static setOnNewTokenCallback(callback) {
+		JwtSession.onNewTokenCallback = callback;
+	}
+	static setOnLogoutCallback(callback) {
+		JwtSession.onLogoutCallback = callback;
 	}
 
 	static getToken() {
 		return localStorage.getItem('access_token');
 	}
-
-	static setRefreshToken(token) {
-		localStorage.setItem('refresh_token', token);
+	static setToken(token) {
+		localStorage.setItem('access_token', token);
 	}
 
 	static getRefreshToken() {
 		return localStorage.getItem('refresh_token');
 	}
+	static setRefreshToken(token) {
+		localStorage.setItem('refresh_token', token);
+	}
 
-	static isSimulationConnexion() {
-		return localStorage.getItem('admin_refresh_token') != null && localStorage.getItem('admin_access_token') != null;
+	static login(accessToken, refreshToken) {
+		console.log('JwtSession.login()');
+		JwtSession.setToken(accessToken);
+		JwtSession.setRefreshToken(refreshToken);
 	}
 
-	static cancelSimulationConnexion() {
-		localStorage.setItem('refresh_token', localStorage.getItem('admin_refresh_token'));
-		localStorage.setItem('access_token', localStorage.getItem('admin_access_token'));
+	static updateToken(accessToken, refreshToken) {
+		console.log('JwtSession.updateToken()');
+		JwtSession.setToken(accessToken);
+
+		if (typeof refreshToken != 'undefined' && null != refreshToken) {
+			JwtSession.setRefreshToken(refreshToken);
+		}
 
-		localStorage.removeItem('admin_refresh_token');
-		localStorage.removeItem('admin_access_token');
+		if (typeof JwtSession.onNewTokenCallback == 'function') {
+			JwtSession.onNewTokenCallback();
+		}
 	}
 
-	static logout() {
+	static logout(redirectUrl) {
+		console.log('JwtSession.logout()');
 		localStorage.removeItem('access_token');
 		localStorage.removeItem('refresh_token');
+
+		if (typeof JwtSession.onLogoutCallback == 'function') {
+			JwtSession.onLogoutCallback();
+		}
+
+		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
+			window.location.href = redirectUrl;
+		}
 	}
 
 	static getData(key) {
@@ -88,21 +97,21 @@ class JwtSession {
 	static isGranted(role) {
 		return JwtToken.hasRole(JwtSession.getToken(), role);
 	}
-}
 
-class ApiTokenSession {
 	static denyAccessUnlessGranted(roles) {
 		let hasRole = false;
 
 		roles.forEach(role => {
-			if (ApiTokenSession.isGranted(role)) {
+			if (JwtSession.isGranted(role)) {
 				hasRole = true;
 			}
 		});
 
 		return hasRole;
 	}
+}
 
+class ApiTokenSession {
 	static getToken() {
 		return localStorage.getItem('api_token');
 	}
@@ -158,6 +167,18 @@ class ApiTokenSession {
 
 		return roles.indexOf(role) !== -1;
 	}
+
+	static denyAccessUnlessGranted(roles) {
+		let hasRole = false;
+
+		roles.forEach(role => {
+			if (ApiTokenSession.isGranted(role)) {
+				hasRole = true;
+			}
+		});
+
+		return hasRole;
+	}
 }
 
 module.exports = { JwtToken, JwtSession, ApiTokenSession };

package/network.js

@@ -1,3 +1,4 @@
+/** @deprecated */
 class HTTPRequest {
 	static init() {
 		require('whatwg-fetch'); //fetch polyfill loaded in window.fetch

package/package.json

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

package/visitor.js

@@ -12,6 +12,7 @@ class Browser {
 		return !!window.chrome && !!window.chrome.webstore;
 	}
 	static isIE() {
+		//return window.navigator.userAgent.indexOf("MSIE ") > 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./);
 		return /*@cc_on!@*/false || !!document.documentMode;
 	}
 	static isEdge() {