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

Author: RafaelGB

package.json

@@ -18,11 +18,11 @@
 	"author": "Rafael Gomez Bermejo",
 	"license": "MIT",
 	"devDependencies": {
-		"@faker-js/faker": "7.4.0",
+		"@faker-js/faker": "7.5.0",
 		"@rollup/plugin-commonjs": "22.0.2",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/plugin-node-resolve": "13.3.0",
-		"@rollup/plugin-typescript": "8.3.4",
+		"@rollup/plugin-typescript": "8.4.0",
 		"@testing-library/jest-dom": "5.16.5",
 		"@testing-library/react": "13.3.0",
 		"@types/jest": "28.1.8",
@@ -49,15 +49,15 @@
 	},
 	"dependencies": {
 		"@emotion/styled": "11.10.0",
-		"@mui/icons-material": "5.10.2",
-		"@mui/material": "5.10.2",
+		"@mui/icons-material": "5.10.3",
+		"@mui/material": "5.10.3",
 		"@popperjs/core": "2.11.6",
 		"@tanstack/match-sorter-utils": "8.1.1",
 		"@tanstack/react-table": "8.5.11",
 		"luxon": "3.0.1",
 		"fuse.js": "6.6.2",
 		"monkey-around": "2.3.0",
-		"obsidian-dataview": "0.5.42",
+		"obsidian-dataview": "0.5.43",
 		"react": "18.2.0",
 		"react-color": "2.19.3",
 		"react-csv": "2.2.2",

src/cdm/TableStateInterface.ts

@@ -27,6 +27,9 @@ export interface ConfigState {
         alterFilters: (filters: Partial<FilterSettings>) => void;
         alterConfig: (config: Partial<LocalSettings>) => void;
     }
+    info: {
+        getLocalSettings: () => LocalSettings;
+    }
 }
 
 export interface DataState {
@@ -57,6 +60,7 @@ export interface ColumnsState {
         alterIsHidden: (column: TableColumn, isHidden: boolean) => void;
     }
     info: {
+        getAllColumns: () => TableColumn[];
         getValueOfAllColumnsAsociatedWith: <K extends keyof TableColumn>(key: K) => TableColumn[K][];
         getVisibilityRecord: () => Record<string, boolean>;
     }

src/components/RowContextMenu.tsx

@@ -59,6 +59,7 @@ const rowContextMenuColumn: TableColumn = {
           aria-controls={open ? `row-context-button-${row.id}` : undefined}
           aria-expanded={open ? "true" : undefined}
           aria-haspopup="true"
+          sx={{ border: 0, borderRadius: 0 }}
           onClick={handleClick}
           key={`row-context-button-${row.id}`}
         >

src/components/cellTypes/CheckboxCell.tsx

@@ -8,19 +8,25 @@ function CheckboxCell(props: CellComponentProps) {
   const { row, column, table } = defaultCell;
   const tableColumn = column.columnDef as TableColumn;
 
-  const [rows, dataActions] = table.options.meta.tableState.data((state) => [
-    state.rows,
-    state.actions,
-  ]);
-  const columns = table.options.meta.tableState.columns(
-    (state) => state.columns
+  const dataActions = table.options.meta.tableState.data(
+    (state) => state.actions
   );
-  const ddbbConfig = table.options.meta.tableState.configState(
-    (state) => state.ddbbConfig
+
+  const checkboxCell = table.options.meta.tableState.data(
+    (state) => state.rows[row.index]
+  );
+
+  const columnsInfo = table.options.meta.tableState.columns(
+    (state) => state.info
   );
+
+  const configInfo = table.options.meta.tableState.configState(
+    (state) => state.info
+  );
+
   /** state of cell value */
   const [checked, setChecked] = useState(
-    Boolean(rows[row.index][tableColumn.key])
+    Boolean(checkboxCell[tableColumn.key])
   );
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const newValue = event.target.checked ? 1 : 0;
@@ -29,8 +35,8 @@ function CheckboxCell(props: CellComponentProps) {
       row.index,
       column.columnDef as TableColumn,
       newValue,
-      columns,
-      ddbbConfig
+      columnsInfo.getAllColumns(),
+      configInfo.getLocalSettings()
     );
     setChecked(event.target.checked);
   };

src/components/cellTypes/EditorCell.tsx

@@ -11,14 +11,14 @@ const EditorCell = (props: EditorCellComponentProps) => {
   /** Ref to cell container */
   const editableMdRef = useRef<HTMLInputElement>();
   /** Columns information */
-  const columns = table.options.meta.tableState.columns(
-    (state) => state.columns
+  const columnsInfo = table.options.meta.tableState.columns(
+    (state) => state.info
   );
   const dataActions = table.options.meta.tableState.data(
     (state) => state.actions
   );
-  const ddbbConfig = table.options.meta.tableState.configState(
-    (state) => state.ddbbConfig
+  const configInfo = table.options.meta.tableState.configState(
+    (state) => state.info
   );
 
   const [editorValue, setEditorValue] = useState(cellValue);
@@ -48,8 +48,8 @@ const EditorCell = (props: EditorCellComponentProps) => {
       row.index,
       column.columnDef as TableColumn,
       changedValue.trim(),
-      columns,
-      ddbbConfig
+      columnsInfo.getAllColumns(),
+      configInfo.getLocalSettings()
     );
   };
 

src/components/cellTypes/NumberCell.tsx

@@ -7,14 +7,14 @@ const NumberCell = (props: CellComponentProps) => {
   const { cell, row, column, table } = defaultCell;
 
   /** Columns information */
-  const columns = table.options.meta.tableState.columns(
-    (state) => state.columns
+  const columnsInfo = table.options.meta.tableState.columns(
+    (state) => state.info
   );
   const dataActions = table.options.meta.tableState.data(
     (state) => state.actions
   );
-  const ddbbConfig = table.options.meta.tableState.configState(
-    (state) => state.ddbbConfig
+  const configInfo = table.options.meta.tableState.configState(
+    (state) => state.info
   );
 
   const [cellValue, setCellValue] = useState(cell.getValue());
@@ -49,8 +49,8 @@ const NumberCell = (props: CellComponentProps) => {
       row.index,
       column.columnDef as TableColumn,
       changedValue,
-      columns,
-      ddbbConfig
+      columnsInfo.getAllColumns(),
+      configInfo.getLocalSettings()
     );
   }
 

src/components/portals/CalendarPortal.tsx

@@ -9,22 +9,19 @@ import { TableColumn } from "cdm/FolderModel";
 const CalendarPortal = (calendarProps: CellComponentProps) => {
   const { defaultCell } = calendarProps;
   const { row, column, table } = defaultCell;
+  const { tableState } = table.options.meta;
   const tableColumn = column.columnDef as TableColumn;
-  const [rows, dataActions] = table.options.meta.tableState.data((state) => [
-    state.rows,
-    state.actions,
-  ]);
-  const columns = table.options.meta.tableState.columns(
-    (state) => state.columns
-  );
-  const ddbbConfig = table.options.meta.tableState.configState(
-    (state) => state.ddbbConfig
-  );
+  const dataActions = tableState.data((state) => state.actions);
+
+  const calendarPortalRow = tableState.data((state) => state.rows[row.index]);
+
+  const columns = tableState.columns((state) => state.columns);
+  const ddbbConfig = tableState.configState((state) => state.ddbbConfig);
 
   /** state of cell value */
   const [showDatePicker, setShowDatePicker] = useState(false);
   const [calendarValue, setCalendarValue] = useState(
-    rows[row.index][tableColumn.key]
+    calendarPortalRow[tableColumn.key]
   );
 
   function handleSpanOnClick(event: any) {

src/stateManagement/columns/handlers/InfoColumnFunctions.ts

@@ -17,6 +17,10 @@ export default class InfoColumnFunctions extends AbstractTableAction<ColumnsStat
             return visibilityRecord;
         };
 
+        implementation.info.getAllColumns = () => {
+            return get().columns;
+        }
+
         response.implementation = implementation;
         return this.goNext(response);
     }

src/stateManagement/useColumnsStore.tsx

@@ -40,6 +40,7 @@ function mockColumnsState(): ColumnsState {
     info: {
       getValueOfAllColumnsAsociatedWith: null,
       getVisibilityRecord: null,
+      getAllColumns: null,
     },
   };
 }

src/stateManagement/useConfigStore.ts

@@ -7,7 +7,7 @@ const useConfigStore = (view: DatabaseView) => {
     const { global_settings } = view.plugin.settings;
     const { config, filters } = view.diskConfig.yaml;
     return create<ConfigState>()(
-        (set) => ({
+        (set, get) => ({
             ddbbConfig: config,
             filters: filters,
             global: global_settings,
@@ -22,7 +22,10 @@ const useConfigStore = (view: DatabaseView) => {
                         view.diskConfig.updateConfig(alteredConfig);
                         return ({ ddbbConfig: { ...state.ddbbConfig, ...alteredConfig } });
                     }),
-            }
+            },
+            info: {
+                getLocalSettings: () => get().ddbbConfig,
+            },
         })
     );
 }