Update documentation

Author: imed-ghomari

src/cdm/TableStateInterface.ts

@@ -72,9 +72,6 @@ export interface ColumnSortingState {
     sortBy: SortingState;
     actions: {
         alterSorting: (alternativeSorting: SortingState) => void;
-    },
-    info: {
-        generateSorting: (currentCol: TableColumn, isSortedDesc: boolean) => SortingState;
     }
 }
 export interface RowTemplateState {

src/components/behavior/SortingColumns.ts

@@ -43,23 +43,33 @@ function sortingUpButton(headerActionResponse: HeaderActionResponse) {
   const { table, column } = headerActionResponse.headerMenuProps.headerProps;
 
   const tablecolumn = column.columnDef as TableColumn;
-  const [sortingInfo, sortingActions] = table.options.meta.tableState.sorting(
-    (store) => [store.info, store.actions]
-  );
   const columnActions = table.options.meta.tableState.columns(
     (store) => store.actions
   );
 
-  const sortingUpOnClick = (e: any) => {
-    const sortArray = sortingInfo.generateSorting(tablecolumn, false);
+  const sortingUpOnClick = () => {
     tablecolumn.isSorted =
       tablecolumn.isSorted && !tablecolumn.isSortedDesc ? false : true;
     tablecolumn.isSortedDesc = false;
     hooks.setExpanded(false);
     // Update state
     columnActions.alterSorting(tablecolumn);
-    sortingActions.alterSorting(sortArray);
-    table.setSorting(sortArray);
+
+    let currentSorting = [...table.options.state.sorting];
+    if (tablecolumn.isSorted) {
+      currentSorting.remove(
+        currentSorting.find((s) => s.id === tablecolumn.id)
+      );
+      currentSorting.push({
+        id: tablecolumn.id,
+        desc: tablecolumn.isSortedDesc,
+      });
+    } else {
+      currentSorting.remove(
+        currentSorting.find((s) => s.id === tablecolumn.id)
+      );
+    }
+    table.setSorting(currentSorting);
   };
   const isAscSorted = column.getIsSorted() === "asc";
   return headerButtonComponent({
@@ -75,25 +85,36 @@ function sortingDownButton(headerActionResponse: HeaderActionResponse) {
     headerActionResponse.headerMenuProps.headerProps;
 
   const tablecolumn = column.columnDef as TableColumn;
-  const [sortingInfo, sortingActions] = table.options.meta.tableState.sorting(
-    (store) => [store.info, store.actions]
-  );
+
   const columnActions = table.options.meta.tableState.columns(
     (store) => store.actions
   );
 
-  const sortingDownOnClick = (e: any) => {
-    const sortArray = sortingInfo.generateSorting(tablecolumn, true);
+  const sortingDownOnClick = () => {
     tablecolumn.isSorted =
       tablecolumn.isSorted && tablecolumn.isSortedDesc ? false : true;
     tablecolumn.isSortedDesc = true;
 
     hooks.setExpanded(false);
     // Update state
     columnActions.alterSorting(tablecolumn);
-    sortingActions.alterSorting(sortArray);
-    table.setSorting(sortArray);
+    let currentSorting = [...table.options.state.sorting];
+    if (tablecolumn.isSorted) {
+      currentSorting.remove(
+        currentSorting.find((s) => s.id === tablecolumn.id)
+      );
+      currentSorting.push({
+        id: tablecolumn.id,
+        desc: tablecolumn.isSortedDesc,
+      });
+    } else {
+      currentSorting.remove(
+        currentSorting.find((s) => s.id === tablecolumn.id)
+      );
+    }
+    table.setSorting(currentSorting);
   };
+
   return headerButtonComponent({
     onClick: sortingDownOnClick,
     icon:

src/components/headerActions/handlers/buttons/SortHandlerAction.tsx

@@ -1,5 +1,5 @@
 import { ColumnSort } from "@tanstack/react-table";
-import { InitialType, RowDataType, TableColumn } from "cdm/FolderModel";
+import { InitialType, TableColumn } from "cdm/FolderModel";
 
 function obtainInitialType(columns: TableColumn[]): InitialType {
     const initialType: InitialType = {};

src/helpers/InitialType.ts

@@ -4,13 +4,20 @@ import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class AlterSortingColumnHandlerAction extends AbstractTableAction<ColumnsState> {
     handle(tableActionResponse: TableActionResponse<ColumnsState>): TableActionResponse<ColumnsState> {
-        const { set, implementation } = tableActionResponse;
+        const { view, set, implementation } = tableActionResponse;
         implementation.actions.alterSorting = (column: TableColumn) =>
             set((updater) => {
                 const newColumns = [...updater.columns];
                 const index = newColumns.findIndex((c) => c.id === column.id);
                 newColumns[index].isSorted = column.isSorted;
                 newColumns[index].isSortedDesc = column.isSortedDesc;
+                view.diskConfig.updateColumnProperties(
+                    column.id,
+                    {
+                        isSorted: column.isSorted,
+                        isSortedDesc: column.isSortedDesc,
+                    }
+                );
                 return { columns: newColumns };
             });
 

src/stateManagement/columns/handlers/AlterSortingColumnAction.ts

@@ -1,7 +1,5 @@
 import { SortingState } from "@tanstack/react-table";
-import { TableColumn } from "cdm/FolderModel";
 import { ColumnSortingState } from "cdm/TableStateInterface"
-import { generateSortedColumns } from "components/behavior/SortingColumns";
 import { DatabaseView } from "DatabaseView";
 import create from "zustand"
 
@@ -11,15 +9,6 @@ const useSortingStore = (view: DatabaseView) => {
             sortBy: view.initial.sortBy,
             actions: {
                 alterSorting: (alternativeSorting: SortingState) => set(() => ({ sortBy: alternativeSorting }))
-            },
-            info: {
-                generateSorting: (currentCol: TableColumn, isSortedDesc: boolean) => {
-                    return generateSortedColumns(
-                        view,
-                        currentCol,
-                        isSortedDesc
-                    )
-                }
             }
         }),
     );