Merge branch '230-fradd-columns-from-the-template-on-the-right-side'

Author: RafaelGB

package.json

@@ -26,18 +26,18 @@
 		"@rollup/plugin-typescript": "9.0.2",
 		"@testing-library/jest-dom": "5.16.5",
 		"@testing-library/react": "13.4.0",
-		"@types/jest": "29.2.0",
-		"@types/luxon": "3.0.2",
-		"@types/node": "18.11.8",
-		"@types/react": "18.0.24",
+		"@types/jest": "29.2.2",
+		"@types/luxon": "3.1.0",
+		"@types/node": "18.11.9",
+		"@types/react": "18.0.25",
 		"@types/react-csv": "1.1.3",
 		"@types/react-datepicker": "4.8.0",
 		"@types/react-dom": "18.0.8",
 		"@types/react-window": "1.8.5",
-		"@typescript-eslint/eslint-plugin": "5.42.0",
-		"@typescript-eslint/parser": "5.42.0",
-		"eslint": "8.26.0",
-		"jest": "29.2.2",
+		"@typescript-eslint/eslint-plugin": "5.42.1",
+		"@typescript-eslint/parser": "5.42.1",
+		"eslint": "8.27.0",
+		"jest": "29.3.1",
 		"jest-mock-extended": "3.0.1",
 		"obsidian": "0.16.3",
 		"rollup": "2.79.1",

src/settings/handlers/columns/TemplateColumnsHandler.ts

@@ -39,10 +39,22 @@ export class TemplateColumnsHandler extends AbstractSettingsHandler {
                         .setTooltip("Save columns from file")
                         .onClick(async (): Promise<void> => {
                             const tfile = resolve_tfile(selected_file);
-                            const columns = await obtainColumnsFromFile(tfile);
-                            view.diskConfig.yaml.columns = columns;
+                            const templateYamlColumns = await obtainColumnsFromFile(tfile);
+                            // Merge columns with existing ones at the end
+                            const new_columns = { ...view.diskConfig.yaml.columns };
+                            let currentSize = columns.length;
+                            let colsAdded = 0;
+                            Object.entries(templateYamlColumns).forEach(([key, value]) => {
+                                if (!new_columns[key]) {
+                                    value.position = currentSize;
+                                    new_columns[key] = value;
+                                    currentSize++;
+                                    colsAdded++;
+                                }
+                            });
+                            view.diskConfig.yaml.columns = new_columns;
                             view.diskConfig.saveOnDisk();
-                            new Notice(`${Object.keys(columns).length} Columns were loaded from file "${tfile.basename}"! Close this dialog to show the database changes`);
+                            new Notice(`${colsAdded} Columns were loaded from file "${tfile.basename}". Total: ${currentSize}\nClose settings modal to show the database changes`);
                         });
                 });