fixed concurrency problem

Author: RafaelGB

src/cdm/TableStateInterface.ts

@@ -60,7 +60,7 @@ export interface ColumnsState {
         addToRight: (column: TableColumn, customName?: string) => void;
         remove: (column: TableColumn) => void;
         alterSorting: (column: TableColumn) => void;
-        addOptionToColumn: (column: TableColumn, option: string, backgroundColor: string) => Promise<void>;
+        addOptionToColumn: (column: TableColumn, option: string, backgroundColor: string) => void;
         alterColumnType: (column: TableColumn, input: string, parsedRows?: RowDataType[]) => Promise<void>;
         alterColumnId: (column: TableColumn, root: string, nestedIds: string[]) => Promise<void>;
         alterColumnLabel: (column: TableColumn, label: string) => Promise<void>;

src/components/cellTypes/SelectCell.tsx

@@ -77,7 +77,7 @@ const SelectCell = (popperProps: CellComponentProps) => {
     [selectRow]
   );
 
-  const handleOnChange = (
+  const handleOnChange = async (
     newValue: OnChangeValue<SelectValue, false>,
     actionMeta: ActionMeta<RowSelectOption>
   ) => {
@@ -102,7 +102,11 @@ const SelectCell = (popperProps: CellComponentProps) => {
       selectValue &&
       !tableColumn.options.find((option) => option.label === selectValue)
     ) {
-      columnActions.addOptionToColumn(tableColumn, selectValue, randomColor());
+      await columnActions.addOptionToColumn(
+        tableColumn,
+        selectValue,
+        randomColor()
+      );
     }
     setShowSelect(false);
   };

src/stateManagement/columns/handlers/AlterOptionToColumnAction.ts

@@ -4,26 +4,34 @@ import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class AlterOptionToColumnHandlerAction extends AbstractTableAction<ColumnsState> {
     handle(tableActionResponse: TableActionResponse<ColumnsState>): TableActionResponse<ColumnsState> {
-        const { view, set, implementation } = tableActionResponse;
-        implementation.actions.addOptionToColumn = async (
+        const { view, set, get, implementation } = tableActionResponse;
+        implementation.actions.addOptionToColumn = (
             column: TableColumn,
             option: string,
             backgroundColor: string
         ) => {
-            // Save on disk
-            const newOptions = [...column.options, { label: option, backgroundColor: backgroundColor }];
-            await view.diskConfig.updateColumnProperties(column.id, {
-                options: newOptions,
-            });
-            // Save on memory
-            set((updater) => {
-                const optionIndex = updater.columns.findIndex(
-                    (col: TableColumn) => col.id === column.id
-                );
-                const updatedColumns = [...updater.columns];
-                updatedColumns[optionIndex].options = newOptions;
-                return { columns: updatedColumns };
-            });
+            // Wrap in a promise of a queue to avoid concurrency issues
+            const columnIndex = get().columns.findIndex(
+                (col: TableColumn) => col.id === column.id
+            );
+            const memoryColumn = get().columns[columnIndex];
+            // Check if the option already exists
+            const optionIndex = memoryColumn.options.findIndex((o) => o.label === option);
+            // Add the option to the column if it doesn't exist
+            if (optionIndex === -1) {
+                // Save on disk
+                const newOptions = [...memoryColumn.options, { label: option, backgroundColor: backgroundColor }];
+                view.diskConfig.updateColumnProperties(column.id, {
+                    options: newOptions,
+                });
+
+                // Save on memory
+                set((updater) => {
+                    memoryColumn.options = newOptions;
+                    updater.columns[columnIndex] = memoryColumn;
+                    return { columns: updater.columns };
+                });
+            }
         }
 
         tableActionResponse.implementation = implementation;