Merge branch 'master' into imed-docu-branch

Author: RafaelGB

src/cdm/TableStateInterface.ts

@@ -40,7 +40,7 @@ export interface DataState {
         updateCell: (rowIndex: number, column: TableColumn, value: Literal, columns: TableColumn[], ddbbConfig: LocalSettings, isMovingFile?: boolean) => void;
         parseDataOfColumn: (column: TableColumn, input: string, ddbbConfig: LocalSettings) => void;
         updateDataAfterLabelChange: (column: TableColumn, label: string, columns: TableColumn[], ddbbConfig: LocalSettings) => Promise<void>;
-        removeRow: (row: RowDataType) => void;
+        removeRow: (row: RowDataType) => Promise<void>;
         removeDataOfColumn: (column: TableColumn) => void;
         removeOptionForAllRows: (column: TableColumn, option: string, columns: TableColumn[],
             ddbbConfig: LocalSettings) => Promise<void>;

src/components/RowContextMenu.tsx

@@ -48,6 +48,7 @@ const rowContextMenuColumn: TableColumn = {
     const handleDeleteRow = () => {
       rowActions.removeRow(row.original);
     };
+
     return (
       <>
         <IconButton

src/components/Table.tsx

@@ -60,23 +60,26 @@ const defaultColumn: Partial<ColumnDef<RowDataType>> = {
 export function Table(tableData: TableDataType) {
   /** Main information about the table */
   const { view, tableStore } = tableData;
-  const [columns, columnActions, columnsInfo] = tableStore.columns((state) => [
-    state.columns,
-    state.actions,
-    state.info,
-  ]);
-  const [rows, dataActions] = tableStore.data((state) => [
-    state.rows,
-    state.actions,
-  ]);
+  const columns = tableStore.columns((state) => state.columns);
+  const columnActions = tableStore.columns((state) => state.actions);
+  const columnsInfo = tableStore.columns((state) => state.info);
+  const rows = tableStore.data((state) => state.rows);
+  const dataActions = tableStore.data((state) => state.actions);
+
   LOGGER.debug(
     `=> Table. number of columns: ${columns.length}. number of rows: ${rows.length}`
   );
 
-  const [ddbbConfig, globalConfig, configActions] = tableStore.configState(
-    (store) => [store.ddbbConfig, store.global, store.actions]
+  const cell_size_config = tableStore.configState(
+    (store) => store.ddbbConfig.cell_size
+  );
+  const sticky_first_column_config = tableStore.configState(
+    (store) => store.ddbbConfig.sticky_first_column
   );
 
+  const globalConfig = tableStore.configState((store) => store.global);
+  const configActions = tableStore.configState((store) => store.actions);
+  const configInfo = tableStore.configState((store) => store.info);
   /** Plugin services */
   const stateManager: StateManager = tableData.stateManager;
   const filePath = stateManager.file.path;
@@ -186,7 +189,6 @@ export function Table(tableData: TableDataType) {
     },
     [stateManager, filePath]
   );
-
   const table: Table<RowDataType> = useReactTable({
     columns: columns,
     data: rows,
@@ -236,7 +238,7 @@ export function Table(tableData: TableDataType) {
     onColumnOrderChange: setColumnOrder,
     // Hack to force react-table to use all columns when filtering
     getColumnCanGlobalFilter: (column) => true,
-    globalFilterFn: globalDatabaseFilterFn(ddbbConfig),
+    globalFilterFn: globalDatabaseFilterFn(configInfo.getLocalSettings()),
     meta: {
       tableState: tableStore,
       view: view,
@@ -262,7 +264,7 @@ export function Table(tableData: TableDataType) {
   }
 
   function handleAddNewRow() {
-    dataActions.addRow(inputNewRow, columns, ddbbConfig);
+    dataActions.addRow(inputNewRow, columns, configInfo.getLocalSettings());
     setInputNewRow("");
     newRowRef.current.value = "";
   }
@@ -303,8 +305,8 @@ export function Table(tableData: TableDataType) {
         key={`div-table`}
         className={`${c(
           "table noselect cell_size_" +
-            ddbbConfig.cell_size +
-            (ddbbConfig.sticky_first_column ? " sticky_first_column" : "")
+            cell_size_config +
+            (sticky_first_column_config ? " sticky_first_column" : "")
         )}`}
         onMouseOver={onMouseOver}
         onClick={onClick}

src/components/TableHeader.tsx

@@ -6,12 +6,6 @@ import { useDrag, useDrop } from "react-dnd";
 import { RowDataType } from "cdm/FolderModel";
 import { DnDConfiguration } from "helpers/Constants";
 
-interface DragItem {
-  index: number;
-  id: string;
-  type: string;
-}
-
 export default function TableHeader(headerProps: TableHeaderProps) {
   const { table, header, reorderColumn, headerIndex } = headerProps;
   const { view } = table.options.meta;

src/mock/mockDataviewUtils.ts

@@ -7,6 +7,6 @@ export const generateStateManager = (): StateManager => {
         app.workspace.getMostRecentLeaf(),
         null
     );
-    const stateManager = new StateManager(initialView, null, null, null);
+    const stateManager = new StateManager(initialView, null, null);
     return stateManager;
 };

src/services/NoteInfo.ts

@@ -9,7 +9,7 @@ import { resolve_tfile } from "helpers/FileManagement";
  * Keep info about a note and offer methods to manipulate it
  */
 export default class NoteInfo {
-    private filepath: string;
+    public filepath: string;
     private page: Record<string, Literal>;
     constructor(page: Record<string, Literal>) {
         this.page = page;

src/stateManagement/data/handlers/AddRowHandlerAction.ts

@@ -13,8 +13,18 @@ export default class AddRowlHandlerAction extends AbstractTableAction<DataState>
     handle(tableActionResponse: TableActionResponse<DataState>): TableActionResponse<DataState> {
         const { view, set, implementation } = tableActionResponse;
         implementation.actions.addRow = (filename: string, columns: TableColumn[], ddbbConfig: LocalSettings) => set((state) => {
-            const trimedFilename = filename.replace(/\.[^/.]+$/, "").trim();
-            const filepath = `${view.file.parent.path}/${trimedFilename}.md`;
+            let trimedFilename = filename.replace(/\.[^/.]+$/, "").trim();
+            let filepath = `${view.file.parent.path}/${trimedFilename}.md`;
+            // Validate possible duplicates
+            let sufixOfDuplicate = 0;
+            while (state.rows.find((row) => row.__note__.filepath === filepath)) {
+                sufixOfDuplicate++;
+                filepath = `${view.file.parent.path}/${trimedFilename}-${sufixOfDuplicate}.md`;
+            }
+            if (sufixOfDuplicate > 0) {
+                trimedFilename = `${trimedFilename}-${sufixOfDuplicate}`;
+                filename = `${trimedFilename} copy(${sufixOfDuplicate})`;
+            }
             const rowRecord: RowDatabaseFields = { inline: {}, frontmatter: {} };
             columns
                 .filter((column: TableColumn) => !column.isMetadata)

src/stateManagement/data/handlers/RemoveRowHandlerAction.ts

@@ -1,22 +1,30 @@
 import { RowDataType } from "cdm/FolderModel";
 import { DataState, TableActionResponse } from "cdm/TableStateInterface";
+import { Notice } from "obsidian";
 import { VaultManagerDB } from "services/FileManagerService";
 import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class RemoveRowHandlerAction extends AbstractTableAction<DataState> {
     handle(tableActionResponse: TableActionResponse<DataState>): TableActionResponse<DataState> {
         const { set, implementation } = tableActionResponse;
-        implementation.actions.removeRow = (rowToRemove: RowDataType) =>
-            set((state) => {
-                const filteredRows = state.rows.filter(
-                    (r) => r.__note__.getFile().path !== rowToRemove.__note__.getFile().path
-                );
-                VaultManagerDB.removeNote(rowToRemove.__note__.getFile());
-                return {
-                    rows: filteredRows
-                }
-            });
+        implementation.actions.removeRow = async (rowToRemove: RowDataType) => {
+            try {
+                await VaultManagerDB.removeNote(rowToRemove.__note__.getFile());
+                set((state) => {
+                    const filteredRows = state.rows.filter(
+                        (r) => r.__note__.filepath !== rowToRemove.__note__.filepath
+                    );
+                    return {
+                        rows: filteredRows
+                    }
+                })
+            } catch (error) {
+                new Notice(`Error: Could not remove note from database. path does not exist: ${rowToRemove.__note__.filepath}`);
+            }
+
+        };
         tableActionResponse.implementation = implementation;
         return this.goNext(tableActionResponse);
+
     }
 }