inviton-powerduck 0.0.173 → 0.0.175

package/app/powerduck-initializer.ts

@@ -4,6 +4,7 @@ import type { IPowerduckSystemResources } from './powerduck-system-resources';
 import jquery from 'jquery';
 import moment from 'moment';
 import select2 from 'select2';
+import StorageProvider from '../common/local-storage-shim';
 import { isNullOrEmpty } from '../common/utils/is-null-or-empty';
 import { LanguageUtils } from '../common/utils/language-utils';
 import TemporalUtils from '../common/utils/temporal-utils';
@@ -29,9 +30,9 @@ export default class PowerduckInitializer {
 
 			globalState.addEventListener('vite:preloadError', (event) => {
 				const key = `${PowerduckState.getAppPrefix()}errLastReload`;
-				const lastTry = Number(localStorage.getItem(key) || '0');
+				const lastTry = Number(StorageProvider.getString(key) || '0');
 				if (TemporalUtils.dateNowMs() - lastTry > 3000) {
-					localStorage.setItem(key, TemporalUtils.dateNowMs().toString());
+					StorageProvider.setString(key, TemporalUtils.dateNowMs().toString());
 
 					if (globalState.__routerNextTo != null && !isNullOrEmpty(globalState.__routerNextTo.path)) {
 						location.href = globalState.__routerNextTo.path;

package/app/powerduck-state.ts

@@ -2,6 +2,7 @@ import type { IDynamicComponentContainer } from '../components/app/dynamic-compo
 import type { IPowerduckSystemResources } from './powerduck-system-resources';
 import { Language } from '../common/enums/language';
 import { ModalSectionMode } from '../common/enums/modal';
+import StorageProvider from '../common/local-storage-shim';
 import { isNullOrEmpty } from '../common/utils/is-null-or-empty';
 import { documentWrap, globalState } from './global-state';
 
@@ -100,8 +101,8 @@ export default class PowerduckState {
 
 	static getModalSectionMode(): ModalSectionMode {
 		if ((PowerduckState as any)._modalSectionMode == null) {
-			if (localStorage.getItem(`${PowerduckState._prefix}modalSectionMode`) != null) {
-				(PowerduckState as any)._modalSectionMode = Number(localStorage.getItem(`${PowerduckState._prefix}modalSectionMode`));
+			if (StorageProvider.getString(`${PowerduckState._prefix}modalSectionMode`) != null) {
+				(PowerduckState as any)._modalSectionMode = Number(StorageProvider.getString(`${PowerduckState._prefix}modalSectionMode`));
 			} else {
 				PowerduckState.setModalSectionMode(ModalSectionMode.navPills);
 			}
@@ -111,7 +112,7 @@ export default class PowerduckState {
 	}
 
 	static setModalSectionMode(mode: ModalSectionMode): void {
-		localStorage.setItem(`${PowerduckState._prefix}modalSectionMode`, mode.toString());
+		StorageProvider.setString(`${PowerduckState._prefix}modalSectionMode`, mode.toString());
 		(PowerduckState as any)._modalSectionMode = mode;
 	}
 

package/common/api-http.ts

@@ -194,14 +194,23 @@ export interface AjaxLogProvider {
 	log: (level: 'debug' | 'info' | 'warning' | 'error', message: string, data: any) => any;
 }
 
+export interface AjaxMiddlewareArgs {
+	response: any;
+	httpCode: number;
+}
+
+export type AjaxMiddleware = (args: AjaxMiddlewareArgs) => Promise<void>;
+
 export class AppHttpProvider {
 	static getRetryCount = 0;
 	static postRetryCount = 0;
 	static appLanguage: string = null;
 	static logProvider: AjaxLogProvider = null;
+	static arraySerializeForGet: (val: any[]) => string;
 	static defaultRequestProvider: AppHttpRequestProvider = 'xhr';
 	static xhrRequestProvider: AjaxRequestProvider = new AjaxProviderXhr();
 	static cordovaRequestProvider: AjaxRequestProvider = null;
+	static middlewares: AjaxMiddleware[] = [];
 	static getRequestTimeoutMessage(): string {
 		return PowerduckState.getResourceValue('requestTimeout');
 	}
@@ -302,10 +311,14 @@ export class AppHttpProvider {
 				for (const key in data) {
 					const value = data[key];
 					if (value != null) {
-						if (value.constructor === Array) {
+						if (Array.isArray(value)) {
 							const encodedKey = encodeURIComponent(key);
-							for (let i = 0; i < value.length; i++) {
-								query.push(`${encodedKey}=${value[i]}`);
+							if (AppHttpProvider.arraySerializeForGet != null) {
+								query.push(`${encodedKey}=${AppHttpProvider.arraySerializeForGet(value)}`);
+							} else {
+								for (let i = 0; i < value.length; i++) {
+									query.push(`${encodedKey}=${value[i]}`);
+								}
 							}
 						} else {
 							query.push(`${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`);
@@ -402,7 +415,7 @@ export class AppHttpProvider {
 						timeout: args.timeout,
 						url,
 					})
-					.then((resp) => {
+					.then(async (resp) => {
 						if (blockUiEnabled) {
 							try {
 								this.unblockUi(args);
@@ -415,6 +428,20 @@ export class AppHttpProvider {
 							AppHttpProvider.postProcessJsObject(jsonData, args.jsonAdapter);
 						}
 
+						if (AppHttpProvider.middlewares?.length > 0) {
+							for (const middleware of this.middlewares) {
+								try {
+									await middleware({
+										httpCode: resp.httpCode,
+										response: jsonData ?? resp.responseText,
+									});
+								} catch (e) {
+									reject(e);
+									return;
+								}
+							}
+						}
+
 						if (resp.httpCode < 300 && resp.httpCode > 0) {
 							if (resp.httpCode == 204) {
 								AppHttpProvider.log('info', `Request success to ${url}, took ${stop - start}ms`);
@@ -745,7 +772,7 @@ export class AppHttpProvider {
 	public static apiGet<T>(
 		apiMethodName: string,
 		data: object | string,
-		timeout: number = null,
+        timeout: number = null,
 	): Promise<T> {
 		return this.getJSON(
 			this.getApiUrl(
@@ -770,7 +797,7 @@ export class AppHttpProvider {
 	public static privateApiGet<T>(
 		apiMethodName: string,
 		data: object | string,
-		timeout: number = null,
+        timeout: number = null,
 	): Promise<T> {
 		return this.getJSON(
 			this.getApiUrl(

package/common/base-component.tsx

@@ -9,6 +9,7 @@ import { globalState } from '../app/global-state';
 import PowerduckState from '../app/powerduck-state';
 import NotificationProvider from './../components/ui/notification';
 import { TryCallApiResult } from './enums/api';
+import StorageProvider from './local-storage-shim';
 import ScrollUtils from './scroll-utils';
 import { isNullOrEmpty } from './utils/is-null-or-empty';
 import { PortalUtils } from './utils/utils';
@@ -193,12 +194,12 @@ export abstract class PowerduckViewModelBase extends Vue {
 	 * Validates current viewModel state based on given valdiation ruleset
 	 */
 	async validate(showErrorMessage?: boolean, silent?: boolean): Promise<boolean> {
-		if (localStorage.getItem('disableValidation') == '1') {
+		if (StorageProvider.getString('disableValidation') == '1') {
 			return true;
 		}
 
 		if (this.v$ == null) {
-			throw 'Validation rules not specified, has to be specified in @Component declaration!';
+			throw new Error('Validation rules not specified, has to be specified in @Component declaration!');
 		}
 
 		const isInvalid = !(await this.v$.$validate());

package/components/datatable/datatable.tsx

@@ -13,6 +13,7 @@ import { DialogResult, DialogUtils } from '../../common/dialog-utils';
 import { DialogIcons } from '../../common/enums/dialog-icons';
 import { sortBy } from '../../common/extensions/array-extensions';
 import { capitalize, latinize } from '../../common/extensions/string-extensions';
+import StorageProvider from '../../common/local-storage-shim';
 import { QueryStringUtils } from '../../common/query-string-utils';
 import CheckboxUtils from '../../common/utils/checkbox-utils';
 import DropdownUtils from '../../common/utils/dropdown-utils';
@@ -213,7 +214,7 @@ class StorageHelper {
 	}
 
 	static getStoredState(id: string): StoredState {
-		const retVal = localStorage.getItem(StorageHelper.getStorageKey(id));
+		const retVal = StorageProvider.getString(StorageHelper.getStorageKey(id));
 		if (retVal != null) {
 			try {
 				return JSON.parse(retVal);
@@ -224,7 +225,7 @@ class StorageHelper {
 	}
 
 	static saveStoredState(id: string, state: StoredState): void {
-		localStorage.setItem(StorageHelper.getStorageKey(id), JSON.stringify(state));
+		StorageProvider.setString(StorageHelper.getStorageKey(id), JSON.stringify(state));
 	}
 
 	static storeSortOrder(id: string, sortOrder: string[]) {

package/components/input/plugins/daterangepicker/jquery.daterangepicker.ts

@@ -9,6 +9,7 @@ import DateUtils from '../../../../common/utils/date-utils';
 import TemporalUtils from '../../../../common/utils/temporal-utils';
 import DaterangePickerConfig from './daterangepicker-config';
 import './daterangepicker.css';
+import '../../../../app/css/input-effects.css';
 import { utcEpochMilliseconds } from '../../../../common/extensions/temporal-extensions';
 import { globalState } from '../../../../app/global-state';
 
@@ -2086,23 +2087,31 @@ import { globalState } from '../../../../app/global-state';
 				return;
 			}
 
+            let afterAnimFired = false
 			const afterAnim = function () {
+                if (afterAnimFired) {
+                    return;
+                }
+
+                afterAnimFired = true;
+				box.hide();
 				$(self).data('date-picker-opened', false);
 				$(self).trigger('datepicker-closed', {
 					relatedTarget: box,
 				});
+				box.removeClass('pd-dropdown-open-animation pd-dropdown-open-animation-above pd-dropdown-close-animation pd-dropdown-close-animation-above');
 			};
 			if (opt.customCloseAnimation) {
 				opt.customCloseAnimation.call(box.get(0), afterAnim);
 			} else {
 				box.removeClass('pd-dropdown-open-animation pd-dropdown-open-animation-above pd-dropdown-close-animation pd-dropdown-close-animation-above');
 				box[0].offsetWidth; // reflow
-				box.addClass('pd-dropdown-close-animation');
 
-				box.one('animationend', function () {
-					box.hide();
-					afterAnim();
-					box.removeClass('pd-dropdown-open-animation pd-dropdown-open-animation-above pd-dropdown-close-animation pd-dropdown-close-animation-above');
+				box.addClass('pd-dropdown-close-animation');
+				const timeout = setTimeout(afterAnim, 450)
+				box.one('animationend', () => {
+						clearTimeout(timeout)
+						afterAnim()
 				});
 			}
 

package/components/open-street-map/open-street-map.tsx

@@ -183,7 +183,9 @@ export class OpenStreetMapComponent extends TsxComponent<OpenStreetMapArgs> impl
 	@Watch('geoJSON')
 	onGeoJsonChanged () {
 		if (this.geoJSONClustering) {
-			this.initCluster();
+			this.waitForLeaflet().then(() => {
+				this.initCluster()
+			})
 		}
 	}
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "inviton-powerduck",
 	"type": "module",
-	"version": "0.0.173",
+	"version": "0.0.175",
 	"files": [
 		"app/",
 		"common/",