directual-web-components-v2 3.11.326 → 3.11.327

package/dist/index.js

@@ -14741,6 +14741,7 @@ function FpsCards2(_ref2) {
   const [loading, setLoading] = React.useState(false);
   const [initialLoading, setInitialLoading] = React.useState(debug ? false : true);
   const isFirstRender = React.useRef(true);
+  const isRestoringFromUrl = React.useRef(false);
   const cardsContainerRef = React.useRef(null);
   const updatePageInUrl = newPage => {
     const urlParams = new URLSearchParams(window.location.search);
@@ -14755,6 +14756,11 @@ function FpsCards2(_ref2) {
     console.log(sort);
     setDQL(dql);
     setSort(sort);
+    if (isRestoringFromUrl.current) {
+      console.log('Restoring filters from URL, skipping refresh');
+      isRestoringFromUrl.current = false;
+      return;
+    }
     if (page == 0) {
       refresh(dql, sort);
     } else {
@@ -15189,31 +15195,79 @@ function FpsCards2(_ref2) {
       console.log("Cards2 Debug mode: using data from props, skipping API calls");
       return;
     }
-    const hasFiltersInUrl = () => {
-      if (!comp_ID || typeof window === 'undefined') return false;
+    const getFiltersFromUrl = () => {
+      if (!comp_ID || typeof window === 'undefined') return {
+        dql: '',
+        sort: {}
+      };
       const urlParams = new URLSearchParams(window.location.search);
-      return urlParams.has("filters_" + comp_ID) || urlParams.has("sort_" + comp_ID);
+      const filtersParam = urlParams.get("filters_" + comp_ID);
+      const sortParam = urlParams.get("sort_" + comp_ID);
+      let urlDql = '';
+      let urlSort = {};
+      if (filtersParam) {
+        try {
+          const filters = JSON.parse(decodeURIComponent(filtersParam));
+          const dqlParts = Object.keys(filters).filter(key => {
+            return filters[key].value || filters[key].valueFrom || filters[key].valueTo;
+          }).map(key => {
+            const f = filters[key];
+            if (f.type === 'string' || f.type === 'boolean') {
+              return "('" + key + "' like '" + f.value + "')";
+            }
+            if (f.type === 'multiOptions' && f.value) {
+              return '(' + Object.keys(f.value).map(v => "('" + key + "' like '" + v + "')").join(' OR ') + ')';
+            }
+            if (f.type === 'date' || f.type === 'number') {
+              const parts = [];
+              if (f.valueFrom) parts.push("('" + key + "' >= '" + f.valueFrom + "')");
+              if (f.valueTo) parts.push("('" + key + "' <= '" + f.valueTo + "')");
+              return parts.join(' AND ');
+            }
+            return '';
+          }).filter(Boolean);
+          urlDql = dqlParts.join(' AND ');
+        } catch (e) {
+          console.error('Failed to parse filters from URL:', e);
+        }
+      }
+      if (sortParam && sortParam.includes(':')) {
+        const [field, direction] = sortParam.split(':');
+        urlSort = {
+          field,
+          direction
+        };
+      }
+      return {
+        dql: urlDql,
+        sort: urlSort
+      };
     };
     const urlPage = getPageFromUrl() || 0;
-    if (hasFiltersInUrl()) {
-      console.log("Filters found in URL, skipping initial load - TableTitle will handle it");
-      setInitialLoading(false);
-      return;
+    const {
+      dql: urlDql,
+      sort: urlSort
+    } = getFiltersFromUrl();
+    if (urlDql || urlSort.field) {
+      isRestoringFromUrl.current = true;
+      setDQL(urlDql);
+      setSort(urlSort);
     }
     if (data && data.sl) {
-      console.log("Loading initial page from URL: " + urlPage);
+      console.log("Loading initial data from URL: page=" + urlPage + ", dql=" + urlDql);
       setPageLoading(true);
+      const sortString = urlSort && urlSort.field ? urlSort.field + ":" + (urlSort.direction || 'asc') : '';
       callEndpointGET(data.sl, {
         pageSize: data.pageSize || 10,
         page: urlPage,
-        dql: '',
-        sort: ''
-      }, (result, data) => {
-        const dataInfo = _$1__default.get(data, "result.data", {});
-        if (dataInfo && dataInfo.content) {
-          delete dataInfo.content;
+        dql: urlDql,
+        sort: sortString
+      }, (result, responseData) => {
+        const newDataInfo = _$1__default.get(responseData, "result.data", {});
+        if (newDataInfo && newDataInfo.content) {
+          delete newDataInfo.content;
         }
-        setDataInfo(dataInfo);
+        setDataInfo(newDataInfo);
         setObjects(result);
         setPageLoading(false);
         setInitialLoading(false);
@@ -23129,6 +23183,7 @@ function FpsTable(_ref) {
   const [pageLoading, setPageLoading] = React.useState(false);
   const [dataInfo, setDataInfo] = React.useState({});
   const isFirstRender = React.useRef(true);
+  const isRestoringFromUrl = React.useRef(false);
   function callEndpointGET(endpoint, params, finish) {
     console.log('===> calling endpoint GET /' + endpoint);
     const httpParams = _$1__default.get(currentData, "params.httpParams") || _$1__default.get(currentData, "httpParams") || {};
@@ -23170,6 +23225,11 @@ function FpsTable(_ref) {
     setSort(sortParam);
     setCurrentDQL(dqlParam);
     setCurrentSort(sortParam);
+    if (isRestoringFromUrl.current) {
+      console.log('Restoring filters from URL, skipping refresh');
+      isRestoringFromUrl.current = false;
+      return;
+    }
     if (page == 0) {
       refresh(dqlParam, sortParam);
     } else {
@@ -23443,24 +23503,75 @@ function FpsTable(_ref) {
     refresh(dql, sort);
   }, [page]);
   React.useEffect(() => {
-    const hasFiltersInUrl = () => {
-      if (!comp_ID || typeof window === 'undefined') return false;
+    const getFiltersFromUrl = () => {
+      if (!comp_ID || typeof window === 'undefined') return {
+        dql: '',
+        sort: {}
+      };
       const urlParams = new URLSearchParams(window.location.search);
-      return urlParams.has("filters_" + comp_ID) || urlParams.has("sort_" + comp_ID);
+      const filtersParam = urlParams.get("filters_" + comp_ID);
+      const sortParam = urlParams.get("sort_" + comp_ID);
+      let urlDql = '';
+      let urlSort = {};
+      if (filtersParam) {
+        try {
+          const filters = JSON.parse(decodeURIComponent(filtersParam));
+          const dqlParts = Object.keys(filters).filter(key => {
+            return filters[key].value || filters[key].valueFrom || filters[key].valueTo;
+          }).map(key => {
+            const f = filters[key];
+            if (f.type === 'string' || f.type === 'boolean') {
+              return "('" + key + "' like '" + f.value + "')";
+            }
+            if (f.type === 'multiOptions' && f.value) {
+              return '(' + Object.keys(f.value).map(v => "('" + key + "' like '" + v + "')").join(' OR ') + ')';
+            }
+            if (f.type === 'date' || f.type === 'number') {
+              const parts = [];
+              if (f.valueFrom) parts.push("('" + key + "' >= '" + f.valueFrom + "')");
+              if (f.valueTo) parts.push("('" + key + "' <= '" + f.valueTo + "')");
+              return parts.join(' AND ');
+            }
+            return '';
+          }).filter(Boolean);
+          urlDql = dqlParts.join(' AND ');
+        } catch (e) {
+          console.error('Failed to parse filters from URL:', e);
+        }
+      }
+      if (sortParam && sortParam.includes(':')) {
+        const [field, direction] = sortParam.split(':');
+        urlSort = {
+          field,
+          direction
+        };
+      }
+      return {
+        dql: urlDql,
+        sort: urlSort
+      };
     };
-    if (hasFiltersInUrl()) {
-      console.log("Filters found in URL, skipping initial load - TableTitle will handle it");
-      return;
-    }
     const urlPage = getPageFromUrl() || 0;
+    const {
+      dql: urlDql,
+      sort: urlSort
+    } = getFiltersFromUrl();
+    if (urlDql || urlSort.field) {
+      isRestoringFromUrl.current = true;
+      setDQL(urlDql);
+      setSort(urlSort);
+      setCurrentDQL(urlDql);
+      setCurrentSort(urlSort);
+    }
     if (currentData && currentData.sl) {
-      console.log("Loading initial page from URL: " + urlPage);
+      console.log("Loading initial data from URL: page=" + urlPage + ", dql=" + urlDql);
       setPageLoading(true);
+      const sortString = urlSort && urlSort.field ? urlSort.field + ":" + (urlSort.direction || 'asc') : '';
       callEndpointGET(currentData.sl, {
         pageSize: currentData.pageSize || 10,
         page: urlPage,
-        dql: '',
-        sort: ''
+        dql: urlDql,
+        sort: sortString
       }, (result, responseData) => {
         const newDataInfo = _$1__default.get(responseData, "result.data", {});
         if (newDataInfo && newDataInfo.content) delete newDataInfo.content;