Merge branch '269-db-folder-does-not-respect-case-in-yaml'

Author: RafaelGB

src/components/Columns.tsx

@@ -17,6 +17,7 @@ import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { DatabaseView } from "DatabaseView";
 import { obtainAllPossibleRows } from "helpers/VaultManagement";
 import rowContextMenuColumn from "components/RowContextMenu";
+import { containsUpper } from "helpers/WindowElement";
 
 /**
  * Add mandatory and configured metadata columns of the table
@@ -144,12 +145,30 @@ export async function obtainColumnsFromRows(
   );
   // Obtain unique keys from source
   const keys = rows.reduce((acc, row) => {
-    const keys = Object.keys(row).map((key) => key.toLowerCase());
+    const keys = Object.keys(row).map((key) => key);
     // Remove duplicates
     return [...new Set([...acc, ...keys])];
   }, [] as string[]);
+
+  const uppercaseFields: string[] = [];
+  let lowercaseFields: string[] = [];
+  keys.forEach((key) => {
+    if (containsUpper(key)) {
+      uppercaseFields.push(key);
+    } else {
+      lowercaseFields.push(key);
+    }
+  });
+  const uppercaseFieldsToFilter = uppercaseFields.map((ucf) =>
+    ucf.toLowerCase()
+  );
+  lowercaseFields = lowercaseFields.filter(
+    (field) => !uppercaseFieldsToFilter.contains(field)
+  );
+
+  const uniqueKeys = [...new Set([...uppercaseFields, ...lowercaseFields])];
   // Add keys to columns
-  keys
+  uniqueKeys
     // Check metadata columns to not be added
     .filter((key) => validateColumnKey(key))
     .forEach((key, index) => {

src/components/modals/newColumn/handlers/AddExistingColumnHandler.ts

@@ -18,7 +18,7 @@ export class AddExistingColumnHandler extends AbstractHandlerClass<AddColumnModa
 
         promiseOfObtainColumnsFromRows.then((columnsRaw: Record<string, DatabaseColumn>) => {
             // Filter out the columns that are already in the table
-            const currentColumns = (info.getValueOfAllColumnsAsociatedWith('id') as string[]).map(id => id.toLowerCase());
+            const currentColumns = (info.getValueOfAllColumnsAsociatedWith('id') as string[]).map(id => id);
             const filteredColumns: Record<string, string> = {};
             Object.keys(columnsRaw).filter((columnName: string) => {
                 return !currentColumns.includes(columnName.toLowerCase())

src/components/portals/DataviewFiltersPortal.tsx

@@ -9,7 +9,6 @@ import Select, { SelectChangeEvent } from "@mui/material/Select";
 import { DataviewFiltersProps } from "cdm/ComponentsModel";
 import { DatabaseColumn } from "cdm/DatabaseModel";
 import { obtainColumnsFromRows } from "components/Columns";
-import CrossIcon from "components/img/CrossIcon";
 import MenuDownIcon from "components/img/MenuDownIcon";
 import AddIcon from "@mui/icons-material/Add";
 import DeleteIcon from "@mui/icons-material/Delete";

src/helpers/WindowElement.ts

@@ -4,4 +4,8 @@ export function getParentWindow(el: Element) {
 
 export function getParentBodyElement(el: Element) {
     return el.doc.body;
+}
+
+export function containsUpper(str: string) {
+    return /[A-Z]/.test(str);
 }

src/settings/handlers/columns/TemplateColumnsHandler.ts

@@ -51,7 +51,7 @@ export class TemplateColumnsHandler extends AbstractSettingsHandler {
              *********************************/
             new Setting(template_section)
                 .setName('Use all fields')
-                .setDesc('Add all possible columns of your actual source of the database')
+                .setDesc('WARNING! This will override any previous columns')
                 .addButton((button) => {
                     button.setIcon("create-new")
                         .setTooltip("Load columns from file")