From 09888d565783de9cfcb10153ad041b97e0300203 Mon Sep 17 00:00:00 2001
From: Elio Struyf <elio@struyfconsulting.be>
Date: Thu, 16 Jun 2022 11:41:54 +0200
Subject: [PATCH] #291 - Hierarchy field support

---
 .../components/Contents/Item.tsx              |  7 ++
 .../TaxonomyView/TaxonomyLookup.tsx           |  2 +-
 src/helpers/ContentType.ts                    | 30 ++++++++-
 src/helpers/TaxonomyHelper.ts                 | 64 +++++++++++++------
 4 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/src/dashboardWebView/components/Contents/Item.tsx b/src/dashboardWebView/components/Contents/Item.tsx
index f6b24415..6fa68cd0 100644
--- a/src/dashboardWebView/components/Contents/Item.tsx
+++ b/src/dashboardWebView/components/Contents/Item.tsx
@@ -30,6 +30,13 @@ export const Item: React.FunctionComponent<IItemProps> = ({ fmFilePath, date, ti
     }
 
     const tagField = settings.dashboardState.contents.tags;
+
+    if (tagField === "tags") {
+      return pageData.fmTags;
+    } else if (tagField === "categories") {
+      return pageData.fmCategories;
+    }
+
     const tagsValue = pageData[tagField] || [];
 
     if (Array.isArray(tagsValue)) {
diff --git a/src/dashboardWebView/components/TaxonomyView/TaxonomyLookup.tsx b/src/dashboardWebView/components/TaxonomyView/TaxonomyLookup.tsx
index ea917c48..c37b304d 100644
--- a/src/dashboardWebView/components/TaxonomyView/TaxonomyLookup.tsx
+++ b/src/dashboardWebView/components/TaxonomyView/TaxonomyLookup.tsx
@@ -51,7 +51,7 @@ export const TaxonomyLookup: React.FunctionComponent<ITaxonomyLookupProps> = ({
   if (taxonomy === "tags" || taxonomy === "categories") {
     return (
       <button 
-        className={total ? `text-teal-900 hover:text-teal-600` : ``}
+        className={total ? `text-teal-900 hover:text-teal-600 font-bold` : ``}
         title={total ? `Show contents with ${value} in ${taxonomy}` : ``}
         onClick={onNavigate}>
         {total || `-`}
diff --git a/src/helpers/ContentType.ts b/src/helpers/ContentType.ts
index 2bf1ef59..84a5ed7a 100644
--- a/src/helpers/ContentType.ts
+++ b/src/helpers/ContentType.ts
@@ -298,6 +298,32 @@ export class ContentType {
 
     return fieldValue;
   }
+  
+  /**
+   * Set the field value
+   * @param data 
+   * @param parents 
+   * @returns 
+   */
+  public static setFieldValue(data: any, parents: string[], value: any) {
+    let crntPageData = data;
+
+    for (let i = 0; i < parents.length; i++) {
+      const crntField = parents[i];
+
+      if (i === parents.length - 1) {
+        crntPageData[crntField] = value;
+      } else {
+        if (!crntPageData[crntField]) {
+          continue;
+        }
+
+        crntPageData = crntPageData[crntField];
+      }
+    }
+
+    return data;
+  }
 
   /**
    * Find the field by its type
@@ -306,13 +332,13 @@ export class ContentType {
    * @param parents 
    * @returns 
    */
-  public static findFieldByType(fields: Field[], type: FieldType, parents: string[] = []) {
+  public static findFieldByType(fields: Field[], type: FieldType, parents: string[] = []): string[] {
     for (const field of fields) {
       if (field.type === type) {
         parents = [...parents, field.name];
         return parents;
       } else if (field.type === "fields" && field.fields) {
-        const subFields = this.findPreviewField(field.fields);
+        const subFields = this.findFieldByType(field.fields, type, parents);
         if (subFields.length > 0) {
           return [...parents, field.name, ...subFields];
         }
diff --git a/src/helpers/TaxonomyHelper.ts b/src/helpers/TaxonomyHelper.ts
index a6d07496..4f55db81 100644
--- a/src/helpers/TaxonomyHelper.ts
+++ b/src/helpers/TaxonomyHelper.ts
@@ -1,6 +1,6 @@
 import { getTaxonomyField } from './getTaxonomyField';
 import { EXTENSION_NAME, SETTING_TAXONOMY_CUSTOM } from "../constants";
-import { CustomTaxonomy, TaxonomyType } from "../models";
+import { CustomTaxonomy, TaxonomyType, ContentType as IContentType } from "../models";
 import { FilesHelper } from "./FilesHelper";
 import { ProgressLocation, window } from "vscode";
 import { parseWinPath } from "./parseWinPath";
@@ -10,6 +10,7 @@ import { DumpOptions } from "js-yaml";
 import { Settings } from "./SettingsHelper";
 import { Notifications } from "./Notifications";
 import { ArticleHelper } from './ArticleHelper';
+import { ContentType } from './ContentType';
 
 
 export class TaxonomyHelper {
@@ -191,19 +192,12 @@ export class TaxonomyHelper {
           try {
             const article = FrontMatterParser.fromFile(mdFile);
             const contentType = ArticleHelper.getContentType(article.data);
-            let fieldName: string | undefined;
 
-            if (taxonomyName === "tags") {
-              fieldName = contentType.fields.find(f => f.type === "tags")?.name || "tags";
-            } else if (taxonomyName === "categories") {
-              fieldName = contentType.fields.find(f => f.type === "categories")?.name || "categories";
-            } else {
-              fieldName = contentType.fields.find(f => f.type === "taxonomy" && f.taxonomyId === taxonomyName)?.name;
-            }
+            let fieldNames: string[] = this.getFieldsHierarchy(taxonomyType, contentType);
 
-            if (fieldName && article && article.data) {
+            if (fieldNames.length > 0 && article && article.data) {
               const { data } = article;
-              let taxonomies: string[] = data[fieldName];
+              let taxonomies: string[] = ContentType.getFieldValue(data, fieldNames);
 
               if (taxonomies && taxonomies.length > 0) {
                 const idx = taxonomies.findIndex(o => o === oldValue);
@@ -215,7 +209,8 @@ export class TaxonomyHelper {
                     taxonomies = taxonomies.filter(o => o !== oldValue);
                   }
 
-                  data[fieldName] = [...new Set(taxonomies)].sort();
+                  const newTaxValue = [...new Set(taxonomies)].sort();
+                  ContentType.setFieldValue(data, fieldNames, newTaxValue);
 
                   const spaces = window.activeTextEditor?.options?.tabSize;
                   // Update the file
@@ -300,13 +295,13 @@ export class TaxonomyHelper {
             const article = FrontMatterParser.fromFile(mdFile);
             const contentType = ArticleHelper.getContentType(article.data);
 
-            let oldFieldName: string | undefined = getTaxonomyField(type, contentType);
-            let newFieldName: string | undefined = getTaxonomyField(answer, contentType);
+            let oldFieldNames: string[] = this.getFieldsHierarchy(oldType, contentType);
+            let newFieldNames: string[] = this.getFieldsHierarchy(newType, contentType, true);
 
-            if (oldFieldName && newFieldName && article && article.data) {
+            if (oldFieldNames.length > 0 && newFieldNames.length > 0 && article && article.data) {
               const { data } = article;
-              let oldTaxonomies: string[] = data[oldFieldName];
-              let newTaxonomies: string[] = data[newFieldName] || [];
+              let oldTaxonomies: string[] = ContentType.getFieldValue(data, oldFieldNames) || [];
+              let newTaxonomies: string[] = ContentType.getFieldValue(data, newFieldNames) || [];
 
               if (oldTaxonomies && oldTaxonomies.length > 0) {
                 const idx = oldTaxonomies.findIndex(o => o === value);
@@ -314,7 +309,8 @@ export class TaxonomyHelper {
                 if (idx !== -1) {
                   newTaxonomies.push(value);
 
-                  data[newFieldName] = [...new Set(newTaxonomies)].sort();
+                  const newTaxonomiesValues = [...new Set(newTaxonomies)].sort();
+                  ContentType.setFieldValue(data, newFieldNames, newTaxonomiesValues);
 
                   const spaces = window.activeTextEditor?.options?.tabSize;
                   // Update the file
@@ -338,6 +334,38 @@ export class TaxonomyHelper {
     });
   }
 
+
+  /**
+   * Retrieve the fields for the taxonomy field
+   * @returns 
+   */
+  private static getFieldsHierarchy(taxonomyType: TaxonomyType | string, contentType: IContentType, fallback: boolean = false): string[] {
+    let fieldNames: string[] = [];
+    if (taxonomyType === TaxonomyType.Tag) {
+      fieldNames = ContentType.findFieldByType(contentType.fields, "tags");
+    } else if (taxonomyType === TaxonomyType.Category) {
+      fieldNames = ContentType.findFieldByType(contentType.fields, "categories");
+    } else {
+      const taxFieldName = getTaxonomyField(taxonomyType, contentType);
+      fieldNames = taxFieldName ? [taxFieldName] : [];
+    }
+
+    if (fallback && fieldNames.length === 0) {
+      let taxFieldName;
+      if (taxonomyType === TaxonomyType.Tag) {
+        taxFieldName = getTaxonomyField("tags", contentType);
+      } else if (taxonomyType === TaxonomyType.Category) {
+        taxFieldName = getTaxonomyField("categories", contentType);
+      }
+
+      if (taxFieldName) {
+        fieldNames = [taxFieldName];
+      }
+    }
+
+    return fieldNames;
+  }
+
   /**
    * Add the taxonomy value to the settings
    * @param taxonomyType