Merge pull request #610 from callumalpass/callumalpass/issue607

fix: add field mapping support for Bases views

Author: callumalpass

src/bases/base-view-factory.ts

@@ -118,7 +118,7 @@ export function buildTasknotesBaseViewFactory(plugin: TaskNotesPlugin, config: V
         }
 
 
-        const taskNotes = await identifyTaskNotesFromBasesData(dataItems);
+        const taskNotes = await identifyTaskNotesFromBasesData(dataItems, plugin);
 
 
         // Render body

src/bases/helpers.ts

@@ -15,32 +15,21 @@ export interface BasesDataItem {
 /**
  * Create TaskInfo object from a single Bases data item
  */
-export function createTaskInfoFromBasesData(basesItem: BasesDataItem): TaskInfo | null {
-  if (!basesItem?.path) return null;
-
-  const props = basesItem.properties || basesItem.frontmatter || {};
-
-  // Separate known TaskNotes properties from custom properties
+function createTaskInfoFromProperties(props: Record<string, any>, basesItem: BasesDataItem): TaskInfo {
   const knownProperties = new Set([
-    'title', 'status', 'priority', 'archived', 'due', 'scheduled', 'contexts', 
-    'projects', 'tags', 'timeEstimate', 'completedDate', 'recurrence', 
+    'title', 'status', 'priority', 'archived', 'due', 'scheduled', 'contexts',
+    'projects', 'tags', 'timeEstimate', 'completedDate', 'recurrence',
     'dateCreated', 'dateModified', 'timeEntries', 'reminders', 'icsEventId'
   ]);
 
-  // Extract custom properties from frontmatter
   const customProperties: Record<string, any> = {};
   Object.keys(props).forEach(key => {
     if (!knownProperties.has(key)) {
       customProperties[key] = props[key];
     }
   });
 
-  // Note: Bases formula properties are handled dynamically in the TaskCard rendering layer
-  // since they require access to the Bases property computation system
-  
-
-
-  const taskInfo: TaskInfo = {
+  return {
     title: props.title || basesItem.name || basesItem.path!.split('/').pop()?.replace('.md', '') || 'Untitled',
     status: props.status || 'open',
     priority: props.priority || 'normal',
@@ -60,24 +49,40 @@ export function createTaskInfoFromBasesData(basesItem: BasesDataItem): TaskInfo
     reminders: props.reminders,
     icsEventId: props.icsEventId,
     customProperties: Object.keys(customProperties).length > 0 ? customProperties : undefined,
-    basesData: basesItem.basesData // Pass raw Bases data for formula computation
+    basesData: basesItem.basesData
   };
+}
 
-  return taskInfo;
+export function createTaskInfoFromBasesData(basesItem: BasesDataItem, plugin?: TaskNotesPlugin): TaskInfo | null {
+  if (!basesItem?.path) return null;
+
+  const props = basesItem.properties || basesItem.frontmatter || {};
+
+  if (plugin?.fieldMapper) {
+    const mappedTaskInfo = plugin.fieldMapper.mapFromFrontmatter(props, basesItem.path, plugin.settings.storeTitleInFilename);
+    return {
+      ...createTaskInfoFromProperties(mappedTaskInfo, basesItem),
+      customProperties: mappedTaskInfo.customProperties
+    };
+  } else {
+    return createTaskInfoFromProperties(props, basesItem);
+  }
 }
 
 /**
  * Identify TaskNotes from Bases data by converting all items to TaskInfo
  */
 export async function identifyTaskNotesFromBasesData(
   dataItems: BasesDataItem[],
-  toTaskInfo: (item: BasesDataItem) => TaskInfo | null = createTaskInfoFromBasesData
+  plugin?: TaskNotesPlugin,
+  toTaskInfo?: (item: BasesDataItem, plugin?: TaskNotesPlugin) => TaskInfo | null
 ): Promise<TaskInfo[]> {
+  const taskInfoConverter = toTaskInfo || createTaskInfoFromBasesData;
   const taskNotes: TaskInfo[] = [];
   for (const item of dataItems) {
     if (!item?.path) continue;
     try {
-      const taskInfo = toTaskInfo(item);
+      const taskInfo = taskInfoConverter(item, plugin);
       if (taskInfo) taskNotes.push(taskInfo);
     } catch (error) {
       console.warn('[TaskNotes][BasesPOC] Error converting Bases item to TaskInfo:', error);
@@ -185,15 +190,29 @@ export async function renderTaskNotesInBasesView(
       // Map common property names to TaskNotes property names
       visibleProperties = visibleProperties.map(propId => {
         let mappedId = propId;
+        
+        // First, try reverse field mapping for user's custom property names
+        const internalFieldName = plugin.fieldMapper?.fromUserField(propId);
+        if (internalFieldName) {
+          // User has a custom field mapping for this property
+          // Map it to the internal TaskNotes property name for proper rendering
+          mappedId = internalFieldName;
+        }
         // Handle dotted properties like task.due -> due
-        if (propId.startsWith('task.')) {
+        else if (propId.startsWith('task.')) {
           mappedId = propId.substring(5);
         }
         // Handle note properties like note.projects -> projects
         else if (propId.startsWith('note.')) {
           const stripped = propId.substring(5);
+          
+          // Try reverse field mapping on the stripped property name
+          const strippedInternalFieldName = plugin.fieldMapper?.fromUserField(stripped);
+          if (strippedInternalFieldName) {
+            mappedId = strippedInternalFieldName;
+          }
           // Map specific note properties to TaskNotes property names
-          if (stripped === 'dateCreated') mappedId = 'dateCreated';
+          else if (stripped === 'dateCreated') mappedId = 'dateCreated';
           else if (stripped === 'dateModified') mappedId = 'dateModified';
           else if (stripped === 'completedDate') mappedId = 'completedDate';
           else mappedId = stripped; // projects, contexts, tags, and any other arbitrary properties

src/bases/kanban-view.ts

@@ -92,7 +92,7 @@ export function buildTasknotesKanbanViewFactory(plugin: TaskNotesPlugin) {
 
       try {
         const dataItems = extractDataItems();
-        const taskNotes = await identifyTaskNotesFromBasesData(dataItems);
+        const taskNotes = await identifyTaskNotesFromBasesData(dataItems, plugin);
 
         // Clear board
         board.innerHTML = '';

src/services/FieldMapper.ts

@@ -272,6 +272,19 @@ export class FieldMapper {
         return { ...this.mapping };
     }
 
+    /**
+     * Convert user's property name back to internal field name
+     * This is the reverse of toUserField()
+     */
+    fromUserField(userPropertyName: string): keyof FieldMapping | null {
+        for (const [internalName, userName] of Object.entries(this.mapping)) {
+            if (userName === userPropertyName) {
+                return internalName as keyof FieldMapping;
+            }
+        }
+        return null;
+    }
+
     /**
      * Validate that a mapping has no empty field names
      */