Merge branch 'feat/sort-columns' into alpha

gisce · Sep 6, 2024 · 90044ec · 90044ec
2 parents 7d2ab05 + a1e9df4
commit 90044ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/helpers/treeHelper.tsx b/src/helpers/treeHelper.tsx
@@ -77,7 +77,7 @@ const getTableColumns = (
         return 0;
       },
       isSortable:
-        type !== "one2many" && type !== "many2one" && column.isFunction,
+        type !== "one2many" && type !== "many2one" && !column.isFunction,
     };
   });
   return tableColumns;

diff --git a/src/widgets/base/one2many/useOne2manyColumnStorage.ts b/src/widgets/base/one2many/useOne2manyColumnStorage.ts
@@ -39,14 +39,20 @@ export const useOne2manyColumnStorage = (dataForHash: DataForHashWithModel) => {
 
   const updateColumnState = useDeepCompareCallback(
     async (state: ColumnState[]) => {
+      // sort status for columns should not be stored
+      const columnStatesWithoutSort = state.map((columnState) => {
+        const { sort, ...columnStateWithoutSort } = columnState;
+        return columnStateWithoutSort;
+      });
+
       if (!remoteUserViewPrefsEnabled) {
-        return updateLocalColumnState(state);
+        return updateLocalColumnState(columnStatesWithoutSort);
       }
       try {
-        return updateRemoteColumnState(state);
+        return updateRemoteColumnState(columnStatesWithoutSort);
       } catch (err) {
         console.error(err);
-        return updateLocalColumnState(state);
+        return updateLocalColumnState(columnStatesWithoutSort);
       }
     },
     [dataForHash],