datadispatch

Author: RafaelGB

src/cdm/DatabaseModel.ts

@@ -47,3 +47,8 @@ export type CalendarProps = {
     column: TableColumn;
     cellProperties: Cell;
 };
+
+export type SortedType = {
+    id: string;
+    desc: boolean;
+}

src/components/HeaderMenu.tsx

@@ -89,6 +89,11 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
       {
         onClick: (e: any) => {
           const sortArray = generateSortedColumns(initialState, column, false);
+          // Update state
+          dispatch({
+            type: ActionTypes.SET_SORT_BY,
+            sortArray: sortArray,
+          });
           setSortBy(sortArray);
           setExpanded(false);
         },

src/components/behavior/SortingColumns.ts

@@ -1,22 +1,18 @@
+import { SortedType } from "cdm/DatabaseModel";
 import { TableColumn, TableDataType } from "cdm/FolderModel";
 import { LOGGER } from "services/Logger";
 
-type SortedType = {
-    id: string;
-    desc: boolean;
-}
 export function generateSortedColumns(tableDataType: TableDataType, currentCol: TableColumn, isSortedDesc: boolean): SortedType[] {
     LOGGER.debug(`=>generateSortedColumns currentCol ${currentCol.id} isSortedDesc ${isSortedDesc}`);
     const sortArray: SortedType[] = [];
     tableDataType.columns
         // Filter if col is already sorted or is current col
         .filter(col => col.id === currentCol.id || col.isSorted)
-        .map((col) => {
+        .forEach((col) => {
             if (currentCol.id === col.id) {
                 // When is current col
                 if (currentCol.isSorted && currentCol.isSortedDesc === isSortedDesc) {
                     // If sort direction is the same, remove sort
-                    col.isSorted = false;
                     tableDataType.view.diskConfig.updateColumnProperties(
                         currentCol.id,
                         {
@@ -25,7 +21,6 @@ export function generateSortedColumns(tableDataType: TableDataType, currentCol:
                     );
                 } else {
                     // If sort direction is different or not sorted, set sort
-                    col.isSorted = true;
                     sortArray.push({ id: currentCol.id, desc: isSortedDesc });
                     tableDataType.view.diskConfig.updateColumnProperties(
                         currentCol.id,
@@ -40,7 +35,6 @@ export function generateSortedColumns(tableDataType: TableDataType, currentCol:
                 // When is not current col
                 sortArray.push({ id: col.id, desc: col.isSortedDesc });
             }
-            return col;
         });
     LOGGER.debug(`<=generateSortedColumns`, `sortArray ${JSON.stringify(sortArray)}`);
     return sortArray;

src/components/reducers/DatabaseDispatch.tsx

@@ -17,6 +17,7 @@ import {
   DatabaseColumn,
   OptionSelect,
   RowDatabaseFields,
+  SortedType,
 } from "cdm/DatabaseModel";
 import NoteInfo from "services/NoteInfo";
 import { DataviewService } from "services/DataviewService";
@@ -427,6 +428,23 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
     case ActionTypes.ENABLE_RESET:
       return update(state, { skipReset: { $set: false } });
 
+    case ActionTypes.SET_SORT_BY:
+      const sortArray: SortedType[] = action.sortArray;
+      const modifiedColumns: TableColumn[] = state.columns.map((column) => {
+        const sortedColumn = sortArray.find((sort) => sort.id === column.id);
+        if (sortedColumn) {
+          column.isSorted = true;
+          column.isSortedDesc = sortedColumn.desc;
+        }
+        return column;
+      });
+
+      return update(state, {
+        columns: {
+          $set: modifiedColumns,
+        },
+      });
+
     // case ActionTypes.MODIFY_COLUMN_SORTING:
     case ActionTypes.MODIFY_COLUMN_CONFIG:
       // Altern between inline & frontmatter mode

src/helpers/Constants.ts

@@ -14,6 +14,7 @@ export const ActionTypes = Object.freeze({
   ENABLE_RESET: 'enable_reset',
   SETTINGS_COLUMN: 'settings_column',
   MODIFY_COLUMN_CONFIG: 'modify_column_config',
+  SET_SORT_BY: 'set_sort_by',
 });
 
 /** Flavours of data types */