directual-web-components-v2 3.11.324 → 3.11.326

package/dist/index.js

@@ -23108,21 +23108,74 @@ function FpsTable(_ref) {
   const pageSize = currentData.pageSize || 0;
   const totalPages = currentData.totalPages || 0;
   const currentPage = currentData.pageNumber || 0;
-  function performFiltering(dql, sort) {
+  const comp_ID = _$1__default.get(currentData, "params.comp_ID") || id;
+  const getPageFromUrl = () => {
+    const urlParams = new URLSearchParams(window.location.search);
+    const savedPage = urlParams.get("page_" + comp_ID);
+    return savedPage ? Number(savedPage) : 0;
+  };
+  const updatePageInUrl = newPage => {
+    const urlParams = new URLSearchParams(window.location.search);
+    if (newPage > 0) {
+      urlParams.set("page_" + comp_ID, newPage);
+    } else {
+      urlParams.delete("page_" + comp_ID);
+    }
+    window.history.replaceState({}, '', window.location.pathname + "?" + urlParams.toString());
+  };
+  const [page, setPageState] = React.useState(getPageFromUrl);
+  const [dql, setDQL] = React.useState('');
+  const [sort, setSort] = React.useState({});
+  const [pageLoading, setPageLoading] = React.useState(false);
+  const [dataInfo, setDataInfo] = React.useState({});
+  const isFirstRender = React.useRef(true);
+  function callEndpointGET(endpoint, params, finish) {
+    console.log('===> calling endpoint GET /' + endpoint);
+    const httpParams = _$1__default.get(currentData, "params.httpParams") || _$1__default.get(currentData, "httpParams") || {};
+    const requestParams = _extends({}, httpParams, params);
+    callEndpoint && callEndpoint(endpoint, "GET", undefined, requestParams, (result, content, json, data) => {
+      if (result == "ok") {
+        finish && finish(content, data);
+      } else {
+        finish && finish([]);
+      }
+    });
+  }
+  function refresh(dqlParam, sortParam) {
+    if (currentData && currentData.sl) {
+      setPageLoading(true);
+      const sortString = sortParam && sortParam.field ? sortParam.field + ":" + (sortParam.direction || 'asc') : '';
+      callEndpointGET(currentData.sl, {
+        pageSize: currentData.pageSize || 10,
+        page: page,
+        dql: dqlParam,
+        sort: sortString
+      }, (result, responseData) => {
+        const newDataInfo = _$1__default.get(responseData, "result.data", {});
+        if (newDataInfo && newDataInfo.content) delete newDataInfo.content;
+        setDataInfo(newDataInfo);
+        setCardsData(result);
+        setPageLoading(false);
+        setLoading(false);
+      });
+    }
+  }
+  function performFiltering(dqlParam, sortParam) {
     clearTimeout(cx);
     console.log('=== F I L T E R I N G ! ===');
-    console.log(dql);
-    setCurrentDQL(dql);
-    setCurrentSort(sort);
+    console.log(dqlParam);
     console.log('=== S O R T I N G ! ===');
-    console.log(sort);
-    const page = 0;
-    sendMsg({
-      dql,
-      sort
-    }, null, {
-      page
-    });
+    console.log(sortParam);
+    setDQL(dqlParam);
+    setSort(sortParam);
+    setCurrentDQL(dqlParam);
+    setCurrentSort(sortParam);
+    if (page == 0) {
+      refresh(dqlParam, sortParam);
+    } else {
+      setPageState(0);
+      updatePageInUrl(0);
+    }
   }
   React.useEffect(() => {
     setLoading(false);
@@ -23170,7 +23223,6 @@ function FpsTable(_ref) {
     clearTimeout(cx);
     if (value) {
       setSearchValue(value);
-      !currentDQL && !page && removeUrlParam(id + '_page');
       const fieldsDQL = currentData.headers && currentData.headers.map(i => i.sysName);
       const requestDQL = fieldsDQL.map(i => "'" + i + "'" + ' like ' + "'" + value + "'").join(' OR ');
       setCurrentDQL(requestDQL);
@@ -23182,8 +23234,6 @@ function FpsTable(_ref) {
     } else {
       setSearchValue('');
       setCurrentDQL('');
-      removeUrlParam(id + '_dql');
-      removeUrlParam(id + '_page');
       sendMsg({
         dql: ''
       }, null, {
@@ -23191,43 +23241,13 @@ function FpsTable(_ref) {
       });
     }
   }
-  const refresh = skipLoading => {
-    console.log("refresh");
-    console.log(skipLoading);
-    !skipLoading && setLoading(true);
-    !skipLoading && setCurrentDQL('');
-    !skipLoading && setCurrentSort({});
-    !skipLoading && setSearchValue('');
-    onEvent({
-      dql: '',
-      page: currentPage,
-      _id: id
-    });
-    !skipLoading && removeUrlParam(id + '_dql');
-  };
   const [lazyLoadingHandler, setLazyLoadingHandler] = React.useState(false);
-  function setPage(page) {
+  function setPage(newPage) {
     if (_$1__default.get(currentData, "params.lazyLoading")) {
       setLazyLoadingHandler(true);
     }
-    let prom = onEvent({
-      dql: currentDQL,
-      sort: currentSort,
-      _id: id
-    }, {
-      page: page
-    }, {
-      reqParam1: "true"
-    });
-    page !== 0 ? addUrlParam({
-      key: id + '_page',
-      value: page
-    }) : removeUrlParam(id + '_page');
-    if (prom && prom.finally) {
-      prom.finally(() => {
-        setLoading(false);
-      });
-    }
+    setPageState(newPage);
+    updatePageInUrl(newPage);
   }
   const submit = model => {
     const saveModel = _extends({}, model);
@@ -23414,6 +23434,42 @@ function FpsTable(_ref) {
       });
     }
   }, [showObject]);
+  React.useEffect(() => {
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+      return;
+    }
+    console.log("page => " + page);
+    refresh(dql, sort);
+  }, [page]);
+  React.useEffect(() => {
+    const hasFiltersInUrl = () => {
+      if (!comp_ID || typeof window === 'undefined') return false;
+      const urlParams = new URLSearchParams(window.location.search);
+      return urlParams.has("filters_" + comp_ID) || urlParams.has("sort_" + comp_ID);
+    };
+    if (hasFiltersInUrl()) {
+      console.log("Filters found in URL, skipping initial load - TableTitle will handle it");
+      return;
+    }
+    const urlPage = getPageFromUrl() || 0;
+    if (currentData && currentData.sl) {
+      console.log("Loading initial page from URL: " + urlPage);
+      setPageLoading(true);
+      callEndpointGET(currentData.sl, {
+        pageSize: currentData.pageSize || 10,
+        page: urlPage,
+        dql: '',
+        sort: ''
+      }, (result, responseData) => {
+        const newDataInfo = _$1__default.get(responseData, "result.data", {});
+        if (newDataInfo && newDataInfo.content) delete newDataInfo.content;
+        setDataInfo(newDataInfo);
+        setCardsData(result);
+        setPageLoading(false);
+      });
+    }
+  }, []);
   const params = (currentData || {}).params || {};
   const {
     hideExpandTD,
@@ -23430,10 +23486,10 @@ function FpsTable(_ref) {
     const interval = setInterval(() => {
       count++;
       console.log('autoRefresh rerender № ' + count);
-      refresh(true);
+      refresh(dql, sort);
     }, autoRefreshPeriod);
     return () => clearInterval(interval);
-  }, []);
+  }, [dql, sort]);
   if (!currentData || currentData == {} || !currentData.params) {
     return /*#__PURE__*/React__default.createElement("div", null);
   }
@@ -23459,7 +23515,7 @@ function FpsTable(_ref) {
     lang: lang,
     auth: auth,
     firstCard: true,
-    refresh: refresh,
+    refresh: () => refresh(dql, sort),
     checkActionCond: (cond, obj) => checkActionCond(edenrichConds(cond, obj)),
     shareble: true,
     executeAction: submitAction,
@@ -23521,7 +23577,9 @@ function FpsTable(_ref) {
     loading: loading,
     dict: dict,
     lang: lang,
-    onFilter: () => {}
+    onFilter: () => {},
+    urlKey: comp_ID,
+    headers: currentData.headers
   }), /*#__PURE__*/React__default.createElement(Table, {
     currentBP: currentBP,
     data: currentData,
@@ -23571,13 +23629,13 @@ function FpsTable(_ref) {
     className: styles$n.pagination
   }, /*#__PURE__*/React__default.createElement(Paging, {
     setPage: setPage,
-    pageSize: pageSize,
+    pageSize: _$1__default.get(dataInfo, 'pageable.pageSize', pageSize),
     dict: dict,
     lang: lang,
-    totalPages: totalPages,
-    currentPage: currentPage,
+    totalPages: Math.max(1, Math.ceil(_$1__default.get(dataInfo, 'total', 0) / _$1__default.get(dataInfo, 'pageable.pageSize', pageSize))),
+    currentPage: _$1__default.get(dataInfo, 'pageable.page', page),
     setLoading: setLoading,
-    loading: loading
+    loading: pageLoading || loading
   })));
 }
 FpsTable.propTypes = {
@@ -26330,6 +26388,12 @@ function Comments(props) {
       }
     });
   }
+  function updateCommentText(commentId, newText) {
+    const textField = _$1__default.get(data, "params._textField");
+    setComments(prevComments => prevComments.map(comment => comment.id === commentId ? _extends({}, comment, {
+      [textField]: newText
+    }) : comment));
+  }
   const allowAttachment = _$1__default.includes(data.writeFields, _$1__default.get(data, "params._fileField"));
   const allowSend = _$1__default.includes(data.writeFields, _$1__default.get(data, "params._textField"));
   const allowEdit = _$1__default.get(data, "params.general.allowEdit");
@@ -26351,6 +26415,7 @@ function Comments(props) {
     className: styles$N.commentsList
   }, comments.filter(comment => !_$1__default.get(comment, _$1__default.get(data, "params._replyField")) || _$1__default.get(comment, _$1__default.get(data, "params._replyField")) == 'root').map(comment => /*#__PURE__*/React__default.createElement(Comment, _extends({}, props, {
     sendComment: sendComment,
+    updateCommentText: updateCommentText,
     lang: lang,
     allowSend: allowSend,
     allowEdit: allowEdit,
@@ -26371,7 +26436,8 @@ function Comment(props) {
     parent,
     allowSend,
     allowEdit,
-    sendComment
+    sendComment,
+    updateCommentText
   } = props;
   const [addReply, setAddReply] = React.useState(false);
   const [isEditing, setIsEditing] = React.useState(false);
@@ -26433,14 +26499,13 @@ function Comment(props) {
   const saveEdit = () => {
     if (!comment.id) return;
     setLocalLoading(true);
+    updateCommentText(comment.id, editText);
+    setIsEditing(false);
     let payload = {
       id: comment.id
     };
     _$1__default.set(payload, _$1__default.get(data, "params._textField"), editText);
-    sendComment(payload, () => {
-      setLocalLoading(false);
-      setIsEditing(false);
-    }, true);
+    sendComment(payload, () => setLocalLoading(false), true);
   };
   const cancelEdit = () => {
     setEditText(commentText);
@@ -26491,7 +26556,6 @@ function Comment(props) {
       gap: '8px'
     }
   }, /*#__PURE__*/React__default.createElement(Button, {
-    loading: localLoading,
     onClick: saveEdit,
     small: true,
     height: 32,