vgapp 1.3.4 → 1.3.6

package/app/modules/vgdynamictable/js/summary-footer.js

@@ -1,6 +1,6 @@
-import {normalizeBooleanOption, normalizeEnabledFlag, safeQuerySelector} from "./utils/common";
-
-const summaryFooterMethods = {
+import {normalizeBooleanOption, normalizeEnabledFlag, safeQuerySelector} from "./utils/common";
+
+const summaryFooterMethods = {
     _renderSummary(meta = {}) {
         if (!this._isSummaryEnabled() || !this._summaryNode || !this._isRemote) {
             return;
@@ -28,14 +28,14 @@ const summaryFooterMethods = {
         this._summaryNode.hidden = false;
     },
 
-    _isSummaryEnabled() {
-        const options = this._params.summary || {};
-        if (options.enable !== undefined && options.enable !== null) {
-            return normalizeBooleanOption(options.enable, false);
-        }
-
-        const attr = this._element.getAttribute('data-summary-enable');
-        return normalizeEnabledFlag(attr, false);
+    _isSummaryEnabled() {
+        const options = this._params.summary || {};
+        if (options.enable !== undefined && options.enable !== null) {
+            return normalizeBooleanOption(options.enable, false);
+        }
+
+        const attr = this._element.getAttribute('data-summary-enable');
+        return normalizeEnabledFlag(attr, false);
     },
 
     _getActiveCriteria() {
@@ -69,14 +69,14 @@ const summaryFooterMethods = {
             return '';
         }
 
-        const shouldRefreshFormCache = this._filtersFormCacheSelector !== selector
-            || !this._filtersFormCacheNode
-            || !this._filtersFormCacheNode.isConnected;
-        if (shouldRefreshFormCache) {
-            this._filtersFormCacheSelector = selector;
-            this._filtersFormCacheNode = safeQuerySelector(selector);
-            this._filtersLabelCache = {};
-        }
+        const shouldRefreshFormCache = this._filtersFormCacheSelector !== selector
+            || !this._filtersFormCacheNode
+            || !this._filtersFormCacheNode.isConnected;
+        if (shouldRefreshFormCache) {
+            this._filtersFormCacheSelector = selector;
+            this._filtersFormCacheNode = safeQuerySelector(selector);
+            this._filtersLabelCache = {};
+        }
 
         const form = this._filtersFormCacheNode;
         if (!form) {
@@ -237,15 +237,15 @@ const summaryFooterMethods = {
         `;
     },
 
-    _isFooterEnabled() {
-        const options = this._params.footer || {};
-        if (options.enable !== undefined && options.enable !== null) {
-            return normalizeBooleanOption(options.enable, false);
-        }
-
-        const attr = this._element.getAttribute('data-footer-enable');
-        return normalizeEnabledFlag(attr, false);
-    },
+    _isFooterEnabled() {
+        const options = this._params.footer || {};
+        if (options.enable !== undefined && options.enable !== null) {
+            return normalizeBooleanOption(options.enable, false);
+        }
+
+        const attr = this._element.getAttribute('data-footer-enable');
+        return normalizeEnabledFlag(attr, false);
+    },
 
     _applyFooterVisibility() {
         const foot = this._element.tFoot || this._element.querySelector('tfoot');

package/app/modules/vgdynamictable/js/table-remote.js

@@ -1,43 +1,43 @@
-const tableRemoteMethods = {
-    _getRemoteRouteRequestConfig(route = '') {
-        const requestOptions = this._params.request || {};
-        const attrMethod = this._element.getAttribute('data-request-method');
-        const attrCredentials = this._element.getAttribute('data-request-credentials');
-        const attrParams = this._element.getAttribute('data-request-params');
-        let paramsFromAttr = {};
-
-        if (attrParams !== null && String(attrParams).trim() !== '') {
-            try {
-                const parsed = JSON.parse(attrParams);
-                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-                    paramsFromAttr = parsed;
-                }
-            } catch (error) {
-                paramsFromAttr = {};
-            }
-        }
-
-        return {
-            route: route || this._getRemoteDataRoute(),
-            method: attrMethod !== null ? attrMethod : requestOptions.method,
-            credentials: attrCredentials !== null ? attrCredentials : requestOptions.credentials,
-            headers: requestOptions.headers && typeof requestOptions.headers === 'object'
-                ? Object.assign({}, requestOptions.headers)
-                : { 'Accept': 'application/json' },
-            baseParams: Object.assign(
-                {},
-                requestOptions.params && typeof requestOptions.params === 'object' ? requestOptions.params : {},
-                paramsFromAttr
-            ),
-            responseType: 'json',
-        };
-    },
-
-    _isRemoteCacheEnabled() {
-        const requestOptions = this._params.request || {};
-        const requestCacheOptions = requestOptions.cache && typeof requestOptions.cache === 'object'
-            ? requestOptions.cache
-            : {};
+const tableRemoteMethods = {
+    _getRemoteRouteRequestConfig(route = '') {
+        const requestOptions = this._params.request || {};
+        const attrMethod = this._element.getAttribute('data-request-method');
+        const attrCredentials = this._element.getAttribute('data-request-credentials');
+        const attrParams = this._element.getAttribute('data-request-params');
+        let paramsFromAttr = {};
+
+        if (attrParams !== null && String(attrParams).trim() !== '') {
+            try {
+                const parsed = JSON.parse(attrParams);
+                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                    paramsFromAttr = parsed;
+                }
+            } catch (error) {
+                paramsFromAttr = {};
+            }
+        }
+
+        return {
+            route: route || this._getRemoteDataRoute(),
+            method: attrMethod !== null ? attrMethod : requestOptions.method,
+            credentials: attrCredentials !== null ? attrCredentials : requestOptions.credentials,
+            headers: requestOptions.headers && typeof requestOptions.headers === 'object'
+                ? Object.assign({}, requestOptions.headers)
+                : { 'Accept': 'application/json' },
+            baseParams: Object.assign(
+                {},
+                requestOptions.params && typeof requestOptions.params === 'object' ? requestOptions.params : {},
+                paramsFromAttr
+            ),
+            responseType: 'json',
+        };
+    },
+
+    _isRemoteCacheEnabled() {
+        const requestOptions = this._params.request || {};
+        const requestCacheOptions = requestOptions.cache && typeof requestOptions.cache === 'object'
+            ? requestOptions.cache
+            : {};
         const attr = this._element.getAttribute('data-request-cache-enable');
         if (attr !== null) {
             return this._isTruthy(attr);
@@ -321,11 +321,11 @@ const tableRemoteMethods = {
         return requestParams;
     },
 
-    exportRemote(format = 'csv', options = {}) {
-        if (!this._isRemote) {
-            return '';
-        }
-        const requestOptions = this._params.request || {};
+    exportRemote(format = 'csv', options = {}) {
+        if (!this._isRemote) {
+            return '';
+        }
+        const requestOptions = this._params.request || {};
 
         const normalizedFormat = String(format || 'csv').toLowerCase().trim() === 'xlsx'
             ? 'xlsx'
@@ -346,17 +346,17 @@ const tableRemoteMethods = {
             options.endpoint
             || (requestOptions.export && requestOptions.export.route)
             || this._element.getAttribute('data-request-export-route')
-            || this._getRemoteDataRoute()
-        ).trim();
-        const exportEndpoint = endpoint || this._getRemoteDataRoute();
-        const exportUrl = this._buildRouteUrl(
-            mappedRequestParams,
-            exportEndpoint,
-            this._getRemoteRouteRequestConfig(exportEndpoint)
-        ).toString();
-        if (options.open !== false && typeof window !== 'undefined' && typeof window.open === 'function') {
-            window.open(exportUrl, '_blank', 'noopener');
-        }
+            || this._getRemoteDataRoute()
+        ).trim();
+        const exportEndpoint = endpoint || this._getRemoteDataRoute();
+        const exportUrl = this._buildRouteUrl(
+            mappedRequestParams,
+            exportEndpoint,
+            this._getRemoteRouteRequestConfig(exportEndpoint)
+        ).toString();
+        if (options.open !== false && typeof window !== 'undefined' && typeof window.open === 'function') {
+            window.open(exportUrl, '_blank', 'noopener');
+        }
 
         this._emitAction('export', {
             format: normalizedFormat,
@@ -366,13 +366,13 @@ const tableRemoteMethods = {
             url: exportUrl,
         });
         return exportUrl;
-    },
-
-    async _loadRemotePage(page, perPage, userOnChange = null, requestMeta = null) {
-        if (!this._isRemote) {
-            return;
-        }
-
+    },
+
+    async _loadRemotePage(page, perPage, userOnChange = null, requestMeta = null) {
+        if (!this._isRemote) {
+            return;
+        }
+
         const safePage = this._normalizePositiveInt(page, 1);
         const safePerPage = this._clampPerPage(perPage, this._getInitialPerPage());
         const requestToken = ++this._requestToken;
@@ -450,22 +450,22 @@ const tableRemoteMethods = {
         if (!cachedResponse) {
             this._renderLoadingSkeleton();
         }
-
-        try {
-            const response = cachedResponse || await this._route(Object.assign(
-                {},
-                this._getRemoteRouteRequestConfig(endpoint),
-                {
-                    route: endpoint,
-                    method: 'GET',
-                    params: mappedRequestParams,
-                    signal: requestAbortController ? requestAbortController.signal : undefined,
-                    responseType: 'json',
-                }
-            ));
-            if (!cachedResponse) {
-                await this._waitMinLoadingDelay(requestStartedAt);
-            }
+
+        try {
+            const response = cachedResponse || await this._route(Object.assign(
+                {},
+                this._getRemoteRouteRequestConfig(endpoint),
+                {
+                    route: endpoint,
+                    method: 'GET',
+                    params: mappedRequestParams,
+                    signal: requestAbortController ? requestAbortController.signal : undefined,
+                    responseType: 'json',
+                }
+            ));
+            if (!cachedResponse) {
+                await this._waitMinLoadingDelay(requestStartedAt);
+            }
 
             if (requestToken !== this._requestToken) {
                 this._emitAction('staleresponse', {

package/app/modules/vgdynamictable/js/table-url-state.js

@@ -1,6 +1,6 @@
-import {normalizeBooleanOption, normalizeEnabledFlag, safeQuerySelector, toQueryParamValue} from "./utils/common";
-
-const tableUrlStateMethods = {
+import {normalizeBooleanOption, normalizeEnabledFlag, safeQuerySelector, toQueryParamValue} from "./utils/common";
+
+const tableUrlStateMethods = {
     _syncUrlState() {
         if (!this._isFiltersUrlStateEnabled() || !this._isFiltersUrlStateWriteOnChange()) {
             return;
@@ -26,12 +26,12 @@ const tableUrlStateMethods = {
             url.searchParams.delete(key);
         });
 
-        Object.keys(nextState).forEach((key) => {
-            const rawValue = nextState[key];
-            const value = toQueryParamValue(rawValue);
-            if (value === undefined || value === null || value === '') {
-                return;
-            }
+        Object.keys(nextState).forEach((key) => {
+            const rawValue = nextState[key];
+            const value = toQueryParamValue(rawValue);
+            if (value === undefined || value === null || value === '') {
+                return;
+            }
             url.searchParams.set(key, String(value));
         });
 
@@ -200,8 +200,8 @@ const tableUrlStateMethods = {
     },
 
     _isUrlStatePopStateEnabled() {
-        const attr = this._element.getAttribute('data-filters-urlstate-listen-popstate');
-        return normalizeEnabledFlag(attr, true);
+        const attr = this._element.getAttribute('data-filters-urlstate-listen-popstate');
+        return normalizeEnabledFlag(attr, true);
     },
 
     _getInitialRemoteParams() {
@@ -393,15 +393,15 @@ const tableUrlStateMethods = {
             this._filterParamKeysCache = null;
             return null;
         }
-        const shouldRefresh = this._filtersFormCacheSelector !== selector
-            || !this._filtersFormCacheNode
-            || !this._filtersFormCacheNode.isConnected;
-        if (shouldRefresh) {
-            this._filtersFormCacheSelector = selector;
-            this._filtersFormCacheNode = safeQuerySelector(selector);
-            this._filterParamKeysCache = null;
-        }
-        return this._filtersFormCacheNode;
+        const shouldRefresh = this._filtersFormCacheSelector !== selector
+            || !this._filtersFormCacheNode
+            || !this._filtersFormCacheNode.isConnected;
+        if (shouldRefresh) {
+            this._filtersFormCacheSelector = selector;
+            this._filtersFormCacheNode = safeQuerySelector(selector);
+            this._filterParamKeysCache = null;
+        }
+        return this._filtersFormCacheNode;
     },
 
     _getFiltersUrlStateConfig() {
@@ -421,24 +421,24 @@ const tableUrlStateMethods = {
 
     _isFiltersUrlStateEnabled() {
         const config = this._getFiltersUrlStateConfig();
-        const attr = this._element.getAttribute('data-filters-urlstate-enable');
-        const raw = attr !== null ? attr : config.enable;
-        return normalizeBooleanOption(raw, false);
+        const attr = this._element.getAttribute('data-filters-urlstate-enable');
+        const raw = attr !== null ? attr : config.enable;
+        return normalizeBooleanOption(raw, false);
     },
 
     _isFiltersUrlStateReadOnInit() {
         const config = this._getFiltersUrlStateConfig();
-        const attr = this._element.getAttribute('data-filters-urlstate-read-on-init');
-        const raw = attr !== null ? attr : config.readOnInit;
-        return normalizeEnabledFlag(raw, true);
+        const attr = this._element.getAttribute('data-filters-urlstate-read-on-init');
+        const raw = attr !== null ? attr : config.readOnInit;
+        return normalizeEnabledFlag(raw, true);
     },
 
     _isFiltersUrlStateWriteOnChange() {
         const config = this._getFiltersUrlStateConfig();
-        const attr = this._element.getAttribute('data-filters-urlstate-write-on-change');
-        const raw = attr !== null ? attr : config.writeOnChange;
-        return normalizeEnabledFlag(raw, true);
-    },
-};
+        const attr = this._element.getAttribute('data-filters-urlstate-write-on-change');
+        const raw = attr !== null ? attr : config.writeOnChange;
+        return normalizeEnabledFlag(raw, true);
+    },
+};
 
 export default tableUrlStateMethods;

package/app/modules/vgdynamictable/js/utils/common.js

@@ -1,48 +1,48 @@
-export function normalizeNonNegativeInt(value, fallback = 0) {
-    const parsed = Number.parseInt(value, 10);
-    return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
-}
-
-export function normalizeBooleanOption(value, fallback = false) {
-    if (value === undefined || value === null) {
-        return fallback;
-    }
-    const normalized = String(value).toLowerCase().trim();
-    if (normalized === 'true' || normalized === '1') {
-        return true;
-    }
-    if (normalized === 'false' || normalized === '0') {
-        return false;
-    }
-    return Boolean(value);
-}
-
-export function normalizeEnabledFlag(value, fallback = true) {
-    if (value === undefined || value === null) {
-        return fallback;
-    }
-    const normalized = String(value).toLowerCase().trim();
-    return normalized !== 'false' && normalized !== '0';
-}
-
-export function safeQuerySelector(selector, root = document) {
-    const normalized = String(selector || '').trim();
-    if (!normalized || !root || typeof root.querySelector !== 'function') {
-        return null;
-    }
-    try {
-        return root.querySelector(normalized);
-    } catch (error) {
-        return null;
-    }
-}
-
-export function toQueryParamValue(value) {
-    if (!Array.isArray(value)) {
-        return value;
-    }
-    return value
-        .map((item) => String(item || '').trim())
-        .filter((item) => item !== '')
-        .join(',');
-}
+export function normalizeNonNegativeInt(value, fallback = 0) {
+    const parsed = Number.parseInt(value, 10);
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
+}
+
+export function normalizeBooleanOption(value, fallback = false) {
+    if (value === undefined || value === null) {
+        return fallback;
+    }
+    const normalized = String(value).toLowerCase().trim();
+    if (normalized === 'true' || normalized === '1') {
+        return true;
+    }
+    if (normalized === 'false' || normalized === '0') {
+        return false;
+    }
+    return Boolean(value);
+}
+
+export function normalizeEnabledFlag(value, fallback = true) {
+    if (value === undefined || value === null) {
+        return fallback;
+    }
+    const normalized = String(value).toLowerCase().trim();
+    return normalized !== 'false' && normalized !== '0';
+}
+
+export function safeQuerySelector(selector, root = document) {
+    const normalized = String(selector || '').trim();
+    if (!normalized || !root || typeof root.querySelector !== 'function') {
+        return null;
+    }
+    try {
+        return root.querySelector(normalized);
+    } catch (error) {
+        return null;
+    }
+}
+
+export function toQueryParamValue(value) {
+    if (!Array.isArray(value)) {
+        return value;
+    }
+    return value
+        .map((item) => String(item || '').trim())
+        .filter((item) => item !== '')
+        .join(',');
+}