Merge branch '305-bug-refresh-another-uses-cases-were-not-resolved-yet'

Author: RafaelGB

src/cdm/StyleModel.ts

@@ -1,8 +1,8 @@
-import { DatabaseView } from "DatabaseView";
 import { RowSelectOption } from "cdm/ComponentsModel";
+import { ColumnSettingsModal } from "components/modals/columnSettings/ColumnSettingsModal";
 
 export type ColorPickerProps = {
-    view: DatabaseView;
+    modal: ColumnSettingsModal;
     options: RowSelectOption[];
     option: RowSelectOption;
     columnKey: string;

src/components/ColorPicker.tsx

@@ -5,7 +5,8 @@ import { c } from "helpers/StylesHelper";
 import { castHslToString } from "helpers/Colors";
 
 export function ColorPicker(colorPickerProps: ColorPickerProps) {
-  const { view, options, option, columnKey } = colorPickerProps;
+  const { modal, options, option, columnKey } = colorPickerProps;
+  const { view } = modal;
   const [colorState, setColorState] = React.useState(option.backgroundColor);
   const [showColorPicker, setShowColorPicker] = React.useState(false);
   /**
@@ -28,6 +29,7 @@ export function ColorPicker(colorPickerProps: ColorPickerProps) {
     await view.diskConfig.updateColumnProperties(columnKey, {
       options: options,
     });
+    modal.enableReset = true;
   }
   return (
     <>

src/components/HeaderMenu.tsx

@@ -115,8 +115,21 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
       o === column.id ? newKey : o
     );
     table.setColumnOrder(updateOrderWithNewKey);
-    // Update state of altered column
+
     setkeyState(newKey);
+
+    // Update sorted columns
+    if (column.getIsSorted()) {
+      const alterSort = table.options.state.sorting.map((o) => {
+        if (o.id === column.id) {
+          o.id = newKey;
+        }
+        return o;
+      });
+      table.setSorting(alterSort);
+    }
+
+    // Update state of altered column
     columnActions
       .alterColumnLabel(column.columnDef as TableColumn, labelState)
       .then(() => {

src/components/modals/columnSettings/handlers/SelectedColumnOptionsHandler.tsx

@@ -64,7 +64,7 @@ export class SelectedColumnOptionsHandler extends AbstractHandlerClass<ColumnSet
 
     options.forEach((option, index) => {
       const colorPickerProps: ColorPickerProps = {
-        view: view,
+        modal: columnSettingsManager.modal,
         options: options,
         option: option,
         columnKey: column.key,