ods-component-lib 1.18.160 → 1.18.162

package/dist/index.js

@@ -34259,7 +34259,14 @@ var getRequestHeaders = function getRequestHeaders(props) {
   });
 };
 var OdsTransfer = function OdsTransfer(props) {
-  var _props$targetItems, _props$axiosRequest$r, _props$axiosRequest, _props$axiosRequest$r2, _props$axiosRequest2, _props$axiosRequest5, _props$axiosRequest6, _props$axiosRequest7;
+  var _props$targetItems, _props$axiosRequest4, _props$axiosRequest5, _props$axiosRequest10, _props$axiosRequest11, _props$axiosRequest12, _props$axiosRequest13, _props$axiosRequest14;
+  var initializeTargetItems = function initializeTargetItems(items) {
+    return items.map(function (item) {
+      return _extends({}, item, {
+        key: item.key || item.Id
+      });
+    });
+  };
   var _useState = React.useState([]),
     data = _useState[0],
     setData = _useState[1];
@@ -34272,51 +34279,40 @@ var OdsTransfer = function OdsTransfer(props) {
     })) || []),
     targetKeys = _useState3[0],
     setTargetKeys = _useState3[1];
-  var _useState4 = React.useState(data || []),
-    transferDataSource = _useState4[0],
-    setTransferDataSource = _useState4[1];
-  var _useState5 = React.useState(1),
-    currentPage = _useState5[0],
-    setCurrentPage = _useState5[1];
-  var _useState6 = React.useState(0),
-    total = _useState6[0],
-    setTotal = _useState6[1];
-  var _useState7 = React.useState((_props$axiosRequest$r = (_props$axiosRequest = props.axiosRequest) === null || _props$axiosRequest === void 0 ? void 0 : _props$axiosRequest.requestData) != null ? _props$axiosRequest$r : undefined),
-    axiosRequestData = _useState7[0],
-    setAxiosRequestData = _useState7[1];
-  var axiosRequestQueryString = (_props$axiosRequest$r2 = (_props$axiosRequest2 = props.axiosRequest) === null || _props$axiosRequest2 === void 0 ? void 0 : _props$axiosRequest2.requestQueryString) != null ? _props$axiosRequest$r2 : undefined;
-  React.useEffect(function () {
-    setAxiosRequestData(function (prevState) {
-      var _props$axiosRequest3;
-      return _extends({}, prevState, (_props$axiosRequest3 = props.axiosRequest) === null || _props$axiosRequest3 === void 0 ? void 0 : _props$axiosRequest3.requestData);
-    });
-  }, [props.axiosRequest]);
+  var _useState4 = React.useState(initializeTargetItems(props.targetItems || [])),
+    targetItems = _useState4[0],
+    setTargetItems = _useState4[1];
+  var _useState5 = React.useState(data || []),
+    transferDataSource = _useState5[0],
+    setTransferDataSource = _useState5[1];
   React.useEffect(function () {
-    var _props$axiosRequest4;
-    if (props.axiosRequest && axiosRequestData && (Object.keys((_props$axiosRequest4 = props.axiosRequest) === null || _props$axiosRequest4 === void 0 ? void 0 : _props$axiosRequest4.requestData).length > 0 || axiosRequestQueryString)) {
+    var _props$axiosRequest, _props$axiosRequest2, _props$axiosRequest3;
+    if (props.axiosRequest && (_props$axiosRequest = props.axiosRequest) !== null && _props$axiosRequest !== void 0 && _props$axiosRequest.requestData && (Object.keys((_props$axiosRequest2 = props.axiosRequest) === null || _props$axiosRequest2 === void 0 ? void 0 : _props$axiosRequest2.requestData).length > 0 || (_props$axiosRequest3 = props.axiosRequest) !== null && _props$axiosRequest3 !== void 0 && _props$axiosRequest3.requestQueryString)) {
       setData([]);
       fetchData();
     }
-  }, [axiosRequestData, axiosRequestQueryString]);
+  }, [(_props$axiosRequest4 = props.axiosRequest) === null || _props$axiosRequest4 === void 0 ? void 0 : _props$axiosRequest4.requestData, (_props$axiosRequest5 = props.axiosRequest) === null || _props$axiosRequest5 === void 0 ? void 0 : _props$axiosRequest5.requestQueryString]);
   var fetchData = React.useCallback(function () {
     try {
+      var _props$axiosRequest6, _props$axiosRequest6$, _props$axiosRequest7, _props$axiosRequest9;
       if (!props.axiosRequest) return Promise.resolve();
       var apiUrl = "" + props.axiosRequest.environmentUrl + props.axiosRequest.apiUrl;
-      if (axiosRequestData !== null && axiosRequestData !== void 0 && axiosRequestData.PaginatedRequest) {
-        axiosRequestData.PaginatedRequest.PageSize = props.pageSize;
+      if ((_props$axiosRequest6 = props.axiosRequest) !== null && _props$axiosRequest6 !== void 0 && (_props$axiosRequest6$ = _props$axiosRequest6.requestData) !== null && _props$axiosRequest6$ !== void 0 && _props$axiosRequest6$.PaginatedRequest) {
+        props.axiosRequest.requestData.PaginatedRequest.PageSize = props.pageSize;
       }
-      if (axiosRequestQueryString) {
-        axiosRequestQueryString.maxResultCount = props.pageSize;
+      if ((_props$axiosRequest7 = props.axiosRequest) !== null && _props$axiosRequest7 !== void 0 && _props$axiosRequest7.requestQueryString) {
+        var _props$axiosRequest8;
+        props.axiosRequest.requestQueryString.maxResultCount = props.pageSize;
         if (constants$1.loadedPageCount > 1 && constants$1.totalPageCount >= constants$1.loadedPageCount) {
-          axiosRequestQueryString.skipCount = ((constants$1.loadedPageCount - 1) * props.pageSize).toString();
+          props.axiosRequest.requestQueryString.skipCount = ((constants$1.loadedPageCount - 1) * props.pageSize).toString();
         }
-        var query = queryString.stringify(axiosRequestQueryString);
+        var query = queryString.stringify((_props$axiosRequest8 = props.axiosRequest) === null || _props$axiosRequest8 === void 0 ? void 0 : _props$axiosRequest8.requestQueryString);
         apiUrl = apiUrl + "?" + query;
       }
       var requestOptions = {
         method: props.axiosRequest.requestType,
         headers: getRequestHeaders(props),
-        body: JSON.stringify(axiosRequestData)
+        body: JSON.stringify((_props$axiosRequest9 = props.axiosRequest) === null || _props$axiosRequest9 === void 0 ? void 0 : _props$axiosRequest9.requestData)
       };
       var _temp = _finallyRethrows(function () {
         return _catch(function () {
@@ -34332,7 +34328,6 @@ var OdsTransfer = function OdsTransfer(props) {
                 });
               }
               getTotalCount(response, newData);
-              setTotal(props.isServerSide ? newData.RowCount : newData.Data.length || 0);
             });
           });
         }, function (error) {
@@ -34346,7 +34341,7 @@ var OdsTransfer = function OdsTransfer(props) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [axiosRequestData, (_props$axiosRequest5 = props.axiosRequest) === null || _props$axiosRequest5 === void 0 ? void 0 : _props$axiosRequest5.apiUrl, (_props$axiosRequest6 = props.axiosRequest) === null || _props$axiosRequest6 === void 0 ? void 0 : _props$axiosRequest6.environmentUrl, axiosRequestQueryString, (_props$axiosRequest7 = props.axiosRequest) === null || _props$axiosRequest7 === void 0 ? void 0 : _props$axiosRequest7.requestType, props.pageSize, props.isServerSide]);
+  }, [(_props$axiosRequest10 = props.axiosRequest) === null || _props$axiosRequest10 === void 0 ? void 0 : _props$axiosRequest10.requestData, (_props$axiosRequest11 = props.axiosRequest) === null || _props$axiosRequest11 === void 0 ? void 0 : _props$axiosRequest11.apiUrl, (_props$axiosRequest12 = props.axiosRequest) === null || _props$axiosRequest12 === void 0 ? void 0 : _props$axiosRequest12.environmentUrl, (_props$axiosRequest13 = props.axiosRequest) === null || _props$axiosRequest13 === void 0 ? void 0 : _props$axiosRequest13.requestQueryString, (_props$axiosRequest14 = props.axiosRequest) === null || _props$axiosRequest14 === void 0 ? void 0 : _props$axiosRequest14.requestType, props.pageSize, props.isServerSide]);
   var getTotalCount = function getTotalCount(response, data) {
     if (data !== null && data !== void 0 && data.PageCount || data !== null && data !== void 0 && data.RowCount) {
       constants$1.totalPageCount = data.PageCount;
@@ -34360,66 +34355,61 @@ var OdsTransfer = function OdsTransfer(props) {
       constants$1.totalPageCount = Math.ceil(constants$1.totalRecordCount / props.pageSize);
     }
   };
+  var removeDuplicates = function removeDuplicates(items, keyExpr) {
+    var seen = new Set();
+    return items.filter(function (item) {
+      var key = item[keyExpr];
+      return !seen.has(key) && seen.add(key);
+    });
+  };
   React.useEffect(function () {
-    setTransferDataSource(data.map(function (item) {
+    var combinedData = props.targetItems ? [].concat(props.targetItems, data) : data;
+    var uniqueData = removeDuplicates(combinedData, props.keyExpr);
+    setTransferDataSource(uniqueData.map(function (item) {
       return _extends({}, item, {
         key: item[props.keyExpr]
       });
     }));
-  }, [data]);
-  var onPageChange = function onPageChange(page) {
-    setCurrentPage(page);
-    if (props.isServerSide) {
-      constants$1.loadedPageCount = page;
-      setAxiosRequestData(function (prevState) {
-        return _extends({}, prevState, {
-          PaginatedRequest: _extends({}, prevState.PaginatedRequest, {
-            PageNumber: constants$1.loadedPageCount,
-            PageSize: props.pageSize
-          })
-        });
-      });
-    }
-  };
+  }, [data, props.targetItems]);
   React.useEffect(function () {
-    if (props.targetItems) {
+    if (targetItems) {
       setTransferDataSource(function (prevData) {
-        return [].concat(props.targetItems.map(function (item) {
+        var updatedTargetItems = targetItems.map(function (item) {
           return _extends({}, item, {
             key: item[props.keyExpr]
           });
-        }), prevData);
+        });
+        var combinedData = [].concat(updatedTargetItems, prevData);
+        var uniqueData = removeDuplicates(combinedData, props.keyExpr);
+        return uniqueData;
       });
-      setTargetKeys(props.targetItems.map(function (item) {
+      setTargetKeys(targetItems.map(function (item) {
         return item[props.keyExpr];
       }));
     }
-  }, [props.targetItems]);
-  var handleChange = React.useCallback(function (nextTargetKeys) {
-    setTargetKeys(nextTargetKeys);
+  }, [targetItems, props.keyExpr]);
+  var handleChange = React.useCallback(function (targetKeys, direction, moveKey) {
+    setTargetKeys(targetKeys);
     var selectedItems = transferDataSource.filter(function (item) {
-      return nextTargetKeys.includes(item[props.keyExpr]);
+      return targetKeys.includes(item[props.keyExpr]);
+    });
+    setTargetItems(function (prevTargetItems) {
+      var updatedItems = [].concat(prevTargetItems, selectedItems);
+      return removeDuplicates(direction === 'left' ? updatedItems.filter(function (item) {
+        return !moveKey.includes(item[props.keyExpr]);
+      }) : updatedItems, props.keyExpr);
     });
     if (props.onTargetChange) {
-      props.onTargetChange(selectedItems);
+      var updatedItems = [].concat(targetItems, selectedItems);
+      var uniqueItems = removeDuplicates(direction === 'left' ? updatedItems.filter(function (item) {
+        return !moveKey.includes(item[props.keyExpr]);
+      }) : updatedItems, props.keyExpr);
+      props.onTargetChange(uniqueItems);
     }
   }, [data, transferDataSource]);
   var handleSelectChange = React.useCallback(function (sourceSelectedKeys, targetSelectedKeys) {
     setSelectedKeys([].concat(sourceSelectedKeys, targetSelectedKeys));
   }, []);
-  var footerRender = function footerRender() {
-    return props.isServerSide ? React__default.createElement(antd.Pagination, {
-      current: currentPage,
-      defaultCurrent: currentPage,
-      pageSize: 5,
-      total: total,
-      onChange: onPageChange,
-      showLessItems: true,
-      hideOnSinglePage: false,
-      simple: true,
-      showSizeChanger: false
-    }) : null;
-  };
   return React__default.createElement("div", null, React__default.createElement("style", null, props.isServerSide && ".dx-pager { display: none; }"), React__default.createElement(antd.Transfer, {
     dataSource: transferDataSource,
     targetKeys: targetKeys,
@@ -34430,8 +34420,7 @@ var OdsTransfer = function OdsTransfer(props) {
     titles: ['Source', 'Target'],
     render: function render(item) {
       return item.title;
-    },
-    footer: footerRender
+    }
   }, function (_ref) {
     var direction = _ref.direction,
       filteredItems = _ref.filteredItems,
@@ -34446,11 +34435,12 @@ var OdsTransfer = function OdsTransfer(props) {
     };
     var leftSideEmpty = direction === 'left' && filteredItems.length === 0;
     var rightSideEmpty = direction === 'right' && targetKeys.length === 0;
+    var combinedDataSource = direction === 'right' ? removeDuplicates([].concat(filteredItems, targetItems), props.keyExpr) : filteredItems;
     return leftSideEmpty || rightSideEmpty ? React__default.createElement(NoListItems, {
       mainText: props.noContentMainText,
       subText: props.noContentSubText
     }) : React__default.createElement(DataGrid__default, {
-      dataSource: filteredItems,
+      dataSource: combinedDataSource,
       keyExpr: props.keyExpr,
       showBorders: true,
       paging: {
@@ -34641,7 +34631,6 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     };
     if (e.fullName.includes("sortOrder")) {
       dataGrid.getScrollable().scrollTo(0);
-      setHeaderFilterData([]);
     }
     if (e.fullName.includes("filterValue") || e.fullName.includes("filter") || e.fullName === "searchPanel.text") {
       var active = updateFilterStatus();