@noatgnu/cupcake-vanilla 1.3.6 → 1.3.8

package/fesm2022/noatgnu-cupcake-vanilla.mjs

@@ -4545,7 +4545,7 @@ class ColumnEditModal {
     }
     populateForm() {
         if (this.column) {
-            const customFilters = this.column.ontologyOptions || undefined;
+            const customFilters = this.column.customOntologyFilters || undefined;
             const ontologyTypeIndex = this.getOntologyTypeIndex(this.column.ontologyType, customFilters);
             this.editForm.patchValue({
                 name: this.column.name,
@@ -4566,24 +4566,49 @@ class ColumnEditModal {
         if (!ontologyType)
             return 0;
         if (!customFilters || Object.keys(customFilters).length === 0) {
-            const index = this.ontologyTypes.findIndex(o => o.value === ontologyType);
+            const index = this.ontologyTypes.findIndex(o => o.value === ontologyType && (!o.customFilters || Object.keys(o.customFilters).length === 0));
             return index >= 0 ? index : 0;
         }
+        console.log('[Column] Looking for ontology match:', {
+            ontologyType,
+            customFilters,
+            keys: Object.keys(customFilters)
+        });
+        // Handle both wrapped and unwrapped formats
+        // Also handle camelCase from API vs snake_case in config
+        // API returns: {"msUniqueVocabularies": {"termType": "cell line"}}
+        // Config has: {"ms_unique_vocabularies": {"term_type": "cell line"}}
+        // Convert ontologyType to camelCase to match API format
+        const camelOntologyType = ontologyType.replace(/_([a-z])/g, (g) => g[1].toUpperCase());
+        let actualFilters = customFilters[ontologyType] || customFilters[camelOntologyType] || customFilters;
+        console.log('[Column] Actual filters after unwrapping:', actualFilters);
         const matchingIndex = this.ontologyTypes.findIndex(opt => {
             if (opt.value !== ontologyType)
                 return false;
             if (!opt.customFilters)
                 return false;
-            const optFilterKey = Object.keys(opt.customFilters)[0];
-            const templateFilterKey = Object.keys(customFilters)[0];
-            if (optFilterKey !== templateFilterKey)
+            // Get the filter value from config (wrapped with snake_case key)
+            const optFilterValue = opt.customFilters[ontologyType];
+            if (!optFilterValue)
                 return false;
-            const optFilterValue = opt.customFilters[optFilterKey];
-            const templateFilterValue = customFilters[templateFilterKey];
-            const optTermType = optFilterValue?.['term_type'];
-            const templateTermType = templateFilterValue?.['term_type'];
-            return optTermType === templateTermType;
+            // Compare term_type values (handle both snake_case and camelCase)
+            const optTermType = optFilterValue['term_type'];
+            const actualTermType = actualFilters['term_type'] || actualFilters['termType'];
+            const matches = optTermType === actualTermType;
+            console.log('[Column] Comparing:', {
+                label: opt.label,
+                optTermType,
+                actualTermType,
+                matches
+            });
+            return matches;
         });
+        if (matchingIndex >= 0) {
+            console.log('[Column] Found match at index:', matchingIndex, this.ontologyTypes[matchingIndex].label);
+        }
+        else {
+            console.warn('[Column] No match found for:', { ontologyType, customFilters });
+        }
         return matchingIndex >= 0 ? matchingIndex : 0;
     }
     onSubmit() {