Merge branch '121-fr-remove-all-values-of-notes-with-an-option-is-removed-tags-too'

RafaelGB · RafaelGB · commit d3bf45f6231d · 2022-08-31T13:24:09.000+02:00
diff --git a/src/cdm/ModalsModel.ts b/src/cdm/ModalsModel.ts
@@ -1,8 +1,10 @@
 import { TableColumn } from "cdm/FolderModel";
-import { ColumnsState } from "cdm/TableStateInterface";
+import { ColumnsState, ConfigState, DataState } from "cdm/TableStateInterface";
 import { ColumnSettingsManager } from "components/modals/columnSettings/ColumnSettingsModal";
 import { AddColumnModalManager } from "components/modals/newColumn/addColumnModal";
 import { FilterSettings, LocalSettings } from "cdm/SettingsModel";
+import { HeaderMenuProps } from "cdm/HeaderModel";
+import { DatabaseView } from "DatabaseView";
 
 /**
  * Base class for all modal responses.
@@ -20,6 +22,13 @@ export type ColumnSettingsHandlerResponse = {
     columnSettingsManager: ColumnSettingsManager
 } & BaseModalHandlerResponse
 
+export type ColumnSettingsModalProps = {
+    dataState: Pick<DataState, "actions">,
+    columnState: Pick<ColumnsState, "info">,
+    configState: Pick<ConfigState, "info">,
+    view: DatabaseView,
+    headerMenuProps: HeaderMenuProps
+}
 
 export type AddColumnModalProps = {
     columnsState: Partial<ColumnsState>;
diff --git a/src/cdm/TableStateInterface.ts b/src/cdm/TableStateInterface.ts
@@ -42,6 +42,8 @@ export interface DataState {
         updateDataAfterLabelChange: (column: TableColumn, label: string, columns: TableColumn[], ddbbConfig: LocalSettings) => Promise<void>;
         removeRow: (row: RowDataType) => void;
         removeDataOfColumn: (column: TableColumn) => void;
+        removeOptionForAllRows: (column: TableColumn, option: string, columns: TableColumn[],
+            ddbbConfig: LocalSettings) => Promise<void>;
         dataviewRefresh: (column: TableColumn[], ddbbConfig: LocalSettings, filterConfig: FilterSettings) => void;
     }
 }
diff --git a/src/components/HeaderMenu.tsx b/src/components/HeaderMenu.tsx
@@ -269,10 +269,13 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
                   <div
                     className="menu-item sort-button"
                     onClick={() => {
-                      new ColumnSettingsModal(
-                        table.options.meta.view,
-                        headerMenuProps
-                      ).open();
+                      new ColumnSettingsModal({
+                        dataState: { actions: dataActions },
+                        columnState: { info: columnsInfo },
+                        configState: { info: configInfo },
+                        view: table.options.meta.view,
+                        headerMenuProps: headerMenuProps,
+                      }).open();
                       setExpanded(false);
                     }}
                   >
diff --git a/src/components/modals/columnSettings/ColumnSettingsModal.ts b/src/components/modals/columnSettings/ColumnSettingsModal.ts
@@ -3,21 +3,28 @@ import { DatabaseView } from "DatabaseView";
 import { Modal } from "obsidian";
 import { add_setting_header } from "settings/SettingsComponents";
 import { StyleClasses } from "helpers/Constants";
-import { ColumnSettingsHandlerResponse } from "cdm/ModalsModel";
+import { ColumnSettingsHandlerResponse, ColumnSettingsModalProps } from "cdm/ModalsModel";
 import { particular_settings_section, behavior_settings_section } from "components/modals/columnSettings/ColumnSections";
 import { HeaderMenuProps } from "cdm/HeaderModel";
+import { ColumnsState, ConfigState, DataState } from "cdm/TableStateInterface";
 
 export class ColumnSettingsModal extends Modal {
     view: DatabaseView;
     headerMenuProps: HeaderMenuProps;
     columnSettingsManager: ColumnSettingsManager;
+    dataState: Partial<DataState>;
+    configState: Partial<ConfigState>;
+    columnsState: Partial<ColumnsState>;
     enableReset: boolean = false;
     constructor(
-        view: DatabaseView,
-        headerMenuProps: HeaderMenuProps
+        props: ColumnSettingsModalProps
     ) {
+        const { view, headerMenuProps, dataState, configState, columnState } = props;
         super(view.app);
         this.view = view;
+        this.dataState = dataState;
+        this.configState = configState;
+        this.columnsState = columnState;
         this.headerMenuProps = headerMenuProps;
         this.columnSettingsManager = new ColumnSettingsManager(this);
     }
diff --git a/src/components/modals/columnSettings/handlers/SelectedColumnOptionsHandler.tsx b/src/components/modals/columnSettings/handlers/SelectedColumnOptionsHandler.tsx
@@ -6,6 +6,7 @@ import { ButtonComponent, Notice, Setting } from "obsidian";
 import { AbstractHandlerClass } from "patterns/AbstractHandler";
 import React from "react";
 import { createRoot } from "react-dom/client";
+import { LOGGER } from "services/Logger";
 
 export class SelectedColumnOptionsHandler extends AbstractHandlerClass<ColumnSettingsHandlerResponse> {
   settingTitle: string = "Column Options";
@@ -14,7 +15,8 @@ export class SelectedColumnOptionsHandler extends AbstractHandlerClass<ColumnSet
   ): ColumnSettingsHandlerResponse {
     const { column, containerEl, columnSettingsManager } =
       columnHandlerResponse;
-    const { view } = columnSettingsManager.modal;
+    const { view, dataState, configState, columnsState } =
+      columnSettingsManager.modal;
     let newLabel = "";
     const options = column.options;
     const onClickAddPromise = async (): Promise<void> => {
@@ -72,11 +74,33 @@ export class SelectedColumnOptionsHandler extends AbstractHandlerClass<ColumnSet
         cb.setIcon("cross")
           .setTooltip("Delete")
           .onClick(async (): Promise<void> => {
+            const removedOption = options[index];
             options.splice(index, 1);
             // Persist changes
             await view.diskConfig.updateColumnProperties(column.key, {
               options: options,
             });
+
+            dataState.actions
+              .removeOptionForAllRows(
+                column,
+                removedOption.label,
+                columnsState.info.getAllColumns(),
+                configState.info.getLocalSettings()
+              )
+              .then(() => {
+                new Notice(
+                  `Option ${removedOption.label} was removed from all rows`,
+                  1500
+                );
+              })
+              .catch((err) => {
+                const errMsg = `Error removing ${removedOption.label}`;
+                LOGGER.error(errMsg, err);
+                new Notice(errMsg, 3000);
+              });
+            columnHandlerResponse.columnSettingsManager.modal.enableReset =
+              true;
             // Force refresh of settings
             columnSettingsManager.reset(columnHandlerResponse);
           });
diff --git a/src/stateManagement/columns/handlers/AlterColumnLabelAction.ts b/src/stateManagement/columns/handlers/AlterColumnLabelAction.ts
@@ -19,7 +19,6 @@ export default class AlterColumnLabelHandlerAction extends AbstractTableAction<C
                 alteredColumns[labelIndex].accessorKey = newKey;
                 // Update configuration & row files on disk
                 view.diskConfig.updateColumnKey(column.id, newKey, newLabel);
-                console.log(alteredColumns);
                 return { columns: alteredColumns };
             });
         tableActionResponse.implementation = implementation;
diff --git a/src/stateManagement/data/DataStateActions.ts b/src/stateManagement/data/DataStateActions.ts
@@ -7,6 +7,7 @@ import RemoveRowHandlerAction from "stateManagement/data/handlers/RemoveRowHandl
 import RemoveDataOfColumnHandlerAction from "stateManagement/data/handlers/RemoveDataOfColumnHandlerAction";
 import ParseDataOfColumnHandlerAction from "stateManagement/data/handlers/ParseDataOfColumnHandlerAction";
 import DataviewRefreshHandlerAction from "stateManagement/data/handlers/DataviewRefreshHandlerAction";
+import RemoveOptionForAllRowsAction from "stateManagement/data/handlers/RemoveOptionForAllRowsAction";
 import { AbstractHandler } from "patterns/AbstractHandler";
 
 class DataStateActions extends AbstractChain<TableActionResponse<DataState>> {
@@ -18,7 +19,8 @@ class DataStateActions extends AbstractChain<TableActionResponse<DataState>> {
             new UpdateDataAfterLabelChangeHandlerAction(),
             new RemoveRowHandlerAction(),
             new RemoveDataOfColumnHandlerAction(),
-            new DataviewRefreshHandlerAction()
+            new DataviewRefreshHandlerAction(),
+            new RemoveOptionForAllRowsAction()
         ];
     }
 }
diff --git a/src/stateManagement/data/handlers/RemoveOptionForAllRowsAction.ts b/src/stateManagement/data/handlers/RemoveOptionForAllRowsAction.ts
@@ -0,0 +1,61 @@
+import { TableColumn } from "cdm/FolderModel";
+import { LocalSettings } from "cdm/SettingsModel";
+import { DataState, TableActionResponse } from "cdm/TableStateInterface";
+import { InputType, UpdateRowOptions } from "helpers/Constants";
+import { updateRowFileProxy } from "helpers/VaultManagement";
+import { Literal } from "obsidian-dataview";
+import { AbstractTableAction } from "stateManagement/AbstractTableAction";
+
+export default class RemoveOptionForAllRowsAction extends AbstractTableAction<DataState> {
+    handle(tableActionResponse: TableActionResponse<DataState>): TableActionResponse<DataState> {
+        const { get, implementation } = tableActionResponse;
+        implementation.actions.removeOptionForAllRows = async (column: TableColumn, option: string, columns: TableColumn[],
+            ddbbConfig: LocalSettings) => {
+            let lambdaFilter = (cellValue: Literal) => {
+                return (cellValue?.toString().length > 0 && cellValue?.toString() === option);
+            };
+            switch (column.input) {
+                case InputType.TAGS:
+                    lambdaFilter = (cellValue: Literal) => {
+                        const array = Array.isArray(cellValue)
+                            ? (cellValue as Literal[])
+                            : []
+                        return array.length > 0 && array.some(value => value?.toString() === option);
+                    }
+                    break;
+                default:
+                // Do nothing
+            }
+            const rowCandidates = get().rows.filter((row) => {
+                return lambdaFilter(row[column.id] as Literal);
+            });
+            rowCandidates.map((row) => {
+                const rowTFile = row.__note__.getFile();
+                switch (column.input) {
+                    case InputType.TAGS:
+                        row[column.id] = Array.isArray(
+                            row[column.id] as Literal
+                        ) ?
+                            (
+                                row[column.id] as Literal[]
+                            )
+                                .filter(value => value !== option) :
+                            [];
+                        break;
+                    default:
+                        row[column.id] = "";
+                }
+                updateRowFileProxy(
+                    rowTFile,
+                    column.id,
+                    row[column.id] as Literal,
+                    columns,
+                    ddbbConfig,
+                    UpdateRowOptions.COLUMN_VALUE
+                );
+            });
+        }
+        tableActionResponse.implementation = implementation;
+        return this.goNext(tableActionResponse);
+    }
+}
diff --git a/src/stateManagement/data/handlers/UpdateDataAfterLabelChangeHandlerAction.ts b/src/stateManagement/data/handlers/UpdateDataAfterLabelChangeHandlerAction.ts
@@ -24,13 +24,11 @@ export default class UpdateDataAfterLabelChangeHandlerAction extends AbstractTab
             });
 
             // Save on memory
-            console.log(state.rows);
             const alterRows = state.rows.map((row) => {
                 row[newKey] = row[column.id];
                 delete row[column.id];
                 return row;
             });
-            console.log(alterRows);
             return { rows: alterRows };
         }
         );
diff --git a/src/stateManagement/useDataStore.ts b/src/stateManagement/useDataStore.ts
@@ -30,6 +30,7 @@ function mockDataState(): DataState {
             updateDataAfterLabelChange: null,
             removeRow: null,
             removeDataOfColumn: null,
+            removeOptionForAllRows: null,
             parseDataOfColumn: null,
             dataviewRefresh: null,
         },

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ export interface DataState {`
`42`	`42`	`updateDataAfterLabelChange: (column: TableColumn, label: string, columns: TableColumn[], ddbbConfig: LocalSettings) => Promise<void>;`
`43`	`43`	`removeRow: (row: RowDataType) => void;`
`44`	`44`	`removeDataOfColumn: (column: TableColumn) => void;`
	`45`	`+ removeOptionForAllRows: (column: TableColumn, option: string, columns: TableColumn[],`
	`46`	`+ ddbbConfig: LocalSettings) => Promise<void>;`
`45`	`47`	`dataviewRefresh: (column: TableColumn[], ddbbConfig: LocalSettings, filterConfig: FilterSettings) => void;`
`46`	`48`	`}`
`47`	`49`	`}`