@noatgnu/cupcake-vanilla 1.3.6 → 1.3.7

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,43 @@ 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
+        });
+        // Handle both wrapped and unwrapped formats
+        // Wrapped: {"ms_unique_vocabularies": {"term_type": "cell line"}}
+        // Unwrapped: {"term_type": "cell line"}
+        const actualFilters = customFilters[ontologyType] || customFilters;
         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 (should be wrapped like {"ms_unique_vocabularies": {"term_type": "..."}})
+            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;
+            const optFiltersJson = JSON.stringify(optFilterValue);
+            const templateFiltersJson = JSON.stringify(actualFilters);
+            const matches = optFiltersJson === templateFiltersJson;
+            console.log('[Column] Comparing:', {
+                label: opt.label,
+                optFilters: optFilterValue,
+                templateFilters: actualFilters,
+                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() {