ods-component-lib 1.18.65 → 1.18.67

package/dist/components/devextreme/OdsRemoteDataGrid.d.ts

@@ -37,7 +37,7 @@ interface IAxiosProps {
     requestData?: any;
     apiUrl: string;
     environmentUrl: string;
-    requestQueryString?: string;
+    requestQueryString?: any;
     requestType: string;
 }
 interface IEditingoptions extends IEditingProps {

package/dist/index.js

@@ -16635,6 +16635,9 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var _useState3 = React.useState(false),
     loading = _useState3[0],
     setLoading = _useState3[1];
+  var _useState4 = React.useState(false),
+    contentReady = _useState4[0],
+    setContentReady = _useState4[1];
   var onCancelEditEvent = new CustomEvent('cancelEdit', {
     bubbles: true,
     detail: {
@@ -16693,6 +16696,45 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       gridRef.current.instance.updateDimensions();
     }
   }, []);
+  React.useEffect(function () {
+    if (contentReady) checkSortingPropertyForInitilaize();
+  }, [contentReady]);
+  var checkSortingPropertyForInitilaize = function checkSortingPropertyForInitilaize() {
+    var onOptionChanged = props.onOptionChanged;
+    if (onOptionChanged) {
+      var dataGridInstance = gridRef.current.instance;
+      var sortingState = dataGridInstance.getVisibleColumns().map(function (column, index) {
+        return {
+          index: index - 1,
+          dataField: column.dataField,
+          sortOrder: column.sortOrder
+        };
+      });
+      var sortedColumn = sortingState.find(function (column) {
+        return column.sortOrder !== undefined;
+      });
+      console.log("sorted column", sortedColumn);
+      if (sortedColumn) {
+        if (sortedColumn.sortOrder) {
+          dataGridInstance.option("columns[" + sortedColumn.index + "].sortOrder", sortedColumn.sortOrder);
+          var fullName = "columns[" + sortedColumn.index + "].sortOrder";
+          var gridEvent = {
+            component: dataGridInstance,
+            fullName: fullName,
+            name: 'optionChanged',
+            value: sortedColumn.sortOrder,
+            previousValue: null,
+            element: null
+          };
+          onOptionChanged(gridEvent);
+        }
+      }
+    }
+  };
+  var checkRequestDataHasOnlySortingProperty = function checkRequestDataHasOnlySortingProperty(obj) {
+    var keys = Object.keys(obj);
+    return keys.length === 1 && keys[0] === 'Sorting';
+  };
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {
       if (props.actionButtonGroup.length >= 2 && !props.edit) {
@@ -16718,22 +16760,21 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var fetchData = React.useCallback(function () {
     try {
       if (props.axiosRequest == undefined) return Promise.resolve();
-      var _temp2 = function () {
+      return Promise.resolve(function () {
         if (props.isServerSide) {
           var _props$axiosRequest$r;
+          if (props.axiosRequest.requestData && checkRequestDataHasOnlySortingProperty(props.axiosRequest.requestData)) return;
           var apiUrl = props.axiosRequest.environmentUrl + "" + props.axiosRequest.apiUrl;
           if (((_props$axiosRequest$r = props.axiosRequest.requestData) === null || _props$axiosRequest$r === void 0 ? void 0 : _props$axiosRequest$r.PaginatedRequest) !== undefined) {
             props.axiosRequest.requestData.PaginatedRequest.PageNumber = loadedPageCount;
             props.axiosRequest.requestData.PaginatedRequest.PageSize = props.pageSize;
           }
           if (props.axiosRequest.requestQueryString !== undefined) {
-            var queryParams = queryString.parse(props.axiosRequest.requestQueryString);
-            queryParams.maxResultCount = props.pageSize.toString();
-            var query = props.axiosRequest.requestQueryString;
+            props.axiosRequest.requestQueryString.maxResultCount = props.pageSize;
             if (loadedPageCount > 1 && totalPageCount >= loadedPageCount) {
-              queryParams.skipCount = ((loadedPageCount - 1) * props.pageSize).toString();
+              props.axiosRequest.requestQueryString.skipCount = ((loadedPageCount - 1) * props.pageSize).toString();
             }
-            query = queryString.stringify(queryParams);
+            var query = queryString.stringify(props.axiosRequest.requestQueryString);
             apiUrl = apiUrl + "?" + query;
           }
           var requestOptions = {
@@ -16768,8 +16809,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
           });
           if (_temp && _temp.then) return _temp.then(function () {});
         }
-      }();
-      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+      }());
     } catch (e) {
       return Promise.reject(e);
     }
@@ -16992,6 +17032,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     var dataGridInstance = e.component;
     var filteredDataCount = dataGridInstance.totalCount();
     if (filterApplied.current && filteredDataCount > 0) setFilteredRowCount(filteredDataCount);
+    if (!contentReady) setContentReady(true);
   };
   var onFilterValueChange = function onFilterValueChange(e) {
     if (e !== null) filterApplied.current = true;else {