Merge branch '28-fr-option-to-delete-a-column-without-delete-the-field-into-all-the-rows'

Author: RafaelGB

README.md

@@ -1,5 +1,6 @@
 ## Database folder plugin
 This plugin is a Notion like database based on folders.
+**[Roadmap](https://github.com/RafaelGB/obsidian-db-folder/projects/1)**
 ### How can I add a database?
 This plugin is based on folders. You can add a folder database y by right clicking on the folder where you want to store your table
 
@@ -15,7 +16,6 @@ The information you add or edit will be saved into the target obsidian note.
 ## Index
 - [Whats inside database view](docs/docs/Whats%20inside%20database%20view.md)
 - [Obsidian dbfolder Features](docs/docs/Obsidian%20dbfolder%20Features.md)
-- [Roadmap](https://github.com/RafaelGB/obsidian-db-folder/projects/1)
 - [changelog](docs/changelog.md)
 
 ## Sources

src/__mocks__/obsidian.ts __mocks__/obsidian.tssrc/__mocks__/obsidian.ts renamed to __mocks__/obsidian.ts

@@ -17,6 +17,7 @@ interface GlobalSettings {
 export interface LocalSettings {
   enable_show_state: boolean;
   group_folder_column: string;
+  remove_field_when_delete_column: boolean;
 }
 export interface DatabaseSettings {
   global_settings: GlobalSettings;
@@ -30,6 +31,7 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
   },
   local_settings: {
     enable_show_state: false,
+    remove_field_when_delete_column: false,
     group_folder_column: ''
   }
 };

src/Settings.ts

@@ -26,7 +26,7 @@ export interface DatabaseYaml {
     /** database local configuration */
     config: LocalSettings;
     /** dataview filters */
-    filters?: FilterCondition[];
+    filters: FilterCondition[];
 }
 
 export type RowDatabaseFields = {

src/__mocks__/StateManager.ts

@@ -49,7 +49,7 @@ export default function Header(headerProps: DatabaseHeaderProps) {
   /** Properties of header */
   const { setSortBy, rows, initialState } = headerProps;
   /** Column values */
-  const { id, dataType, options } = headerProps.column;
+  const { id, dataType, options, position } = headerProps.column;
   /** reducer asociated to database */
   // TODO typying improve
   const dataDispatch = (headerProps as any).dataDispatch;
@@ -83,7 +83,7 @@ export default function Header(headerProps: DatabaseHeaderProps) {
       break;
   }
 
-  function adjustWidthOfTheColumn() {
+  function adjustWidthOfTheColumn(position: number) {
     const columnNumber =
       initialState.columns.length + 1 - initialState.shadowColumns.length;
     const columnName = `newColumn${columnNumber}`;
@@ -93,15 +93,15 @@ export default function Header(headerProps: DatabaseHeaderProps) {
       (columnLabel.length + WidthVariables.ICON_SPACING) *
       WidthVariables.MAGIC_SPACING;
     setColumnWidthState(columnWidthState);
-    return { name: columnName, position: columnNumber, label: columnLabel };
+    return { name: columnName, position: position, label: columnLabel };
   }
 
   function handlerAddColumnToLeft(e: any) {
     dataDispatch({
       type: ActionTypes.ADD_COLUMN_TO_LEFT,
       columnId: MetadataColumns.ADD_COLUMN,
       focus: true,
-      columnInfo: adjustWidthOfTheColumn(),
+      columnInfo: adjustWidthOfTheColumn(position - 1),
     });
   }
 

src/cdm/DatabaseModel.ts

@@ -173,7 +173,6 @@ export function Table(initialState: TableDataType) {
     setGlobalFilter,
     allColumns,
     setColumnOrder,
-    totalColumnsWidth,
   } = useTable(
     // Table properties
     propsUseTable,
@@ -191,6 +190,7 @@ export function Table(initialState: TableDataType) {
   const [columnsWidthState, setColumnsWidthState] = React.useState(
     getColumnsWidthStyle(rows, columns)
   );
+  const totalWidth = getTotalWidth(columnsWidthState);
   // Manage DnD
   const currentColOrder = React.useRef(null);
   // Manage input of new row
@@ -230,7 +230,7 @@ export function Table(initialState: TableDataType) {
         {...getTableProps({
           style: {
             ...getTableProps().style,
-            minWidth: totalColumnsWidth,
+            width: totalWidth,
           },
         })}
         className={`${c("table noselect")}`}
@@ -296,7 +296,7 @@ export function Table(initialState: TableDataType) {
                       style: {
                         ...getDndListStyle(snapshot.isDraggingOver),
                         width:
-                          getTotalWidth(columnsWidthState) -
+                          totalWidth -
                           columnsWidthState.widthRecord[
                             MetadataColumns.ADD_COLUMN
                           ],
@@ -365,7 +365,7 @@ export function Table(initialState: TableDataType) {
               <div
                 {...row.getRowProps({
                   style: {
-                    minWidth: `${totalColumnsWidth}px`,
+                    width: `${totalWidth}px`,
                   },
                 })}
                 className={`${c("tr")}`}

src/components/Header.tsx

@@ -323,17 +323,19 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
       );
       // Update configuration on disk
       state.view.diskConfig.removeColumn(action.columnId);
-      Promise.all(
-        state.data.map(async (row: RowDataType) => {
-          updateRowFile(
-            row.note.getFile(),
-            action.key,
-            undefined, // delete does not need this field
-            state,
-            UpdateRowOptions.REMOVE_COLUMN
-          );
-        })
-      );
+      if (state.view.diskConfig.yaml.config.remove_field_when_delete_column) {
+        Promise.all(
+          state.data.map(async (row: RowDataType) => {
+            updateRowFile(
+              row.note.getFile(),
+              action.key,
+              undefined, // delete does not need this field
+              state,
+              UpdateRowOptions.REMOVE_COLUMN
+            );
+          })
+        );
+      }
       // Update state
       return update(state, {
         skipReset: { $set: true },

src/components/Table.tsx

@@ -24,6 +24,7 @@ const DatabaseYamlToStringParser = (databaseConfig: DatabaseYaml): string[] => {
   databaseConfigString.push(`config:`);
   databaseConfigString.push(`${yamlIndent.repeat(1)}enable_show_state: ${databaseConfig.config.enable_show_state}`);
   databaseConfigString.push(`${yamlIndent.repeat(1)}group_folder_column: ${databaseConfig.config.group_folder_column}`);
+  databaseConfigString.push(`${yamlIndent.repeat(1)}remove_field_when_delete_column: ${databaseConfig.config.remove_field_when_delete_column}`);
 
   // Database filters
   if (databaseConfig.filters) {

src/components/reducers/DatabaseDispatch.tsx

@@ -18,6 +18,12 @@ export class ConfigHandler extends AbstractYamlHandler {
                 this.addError(`There was not group_folder_column key in yaml. Default will be loaded`);
                 this.localYaml.config.group_folder_column = '';
             }
+            // if remove_field_when_delete_column is not defined, load default
+            if (handlerResponse.yaml.config.remove_field_when_delete_column === undefined) {
+                this.addError(`There was not remove_field_when_delete_column key in yaml. Default will be loaded`);
+                this.localYaml.config.remove_field_when_delete_column = false;
+            }
+
         }
         return this.goNext(handlerResponse);
     }