@noatgnu/cupcake-vanilla 1.3.7 → 1.3.9

package/fesm2022/noatgnu-cupcake-vanilla.mjs

@@ -4571,28 +4571,34 @@ class ColumnEditModal {
         }
         console.log('[Column] Looking for ontology match:', {
             ontologyType,
-            customFilters
+            customFilters,
+            keys: Object.keys(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;
+        // 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;
-            // Get the filter value from config (should be wrapped like {"ms_unique_vocabularies": {"term_type": "..."}})
+            // Get the filter value from config (wrapped with snake_case key)
             const optFilterValue = opt.customFilters[ontologyType];
             if (!optFilterValue)
                 return false;
-            const optFiltersJson = JSON.stringify(optFilterValue);
-            const templateFiltersJson = JSON.stringify(actualFilters);
-            const matches = optFiltersJson === templateFiltersJson;
+            // 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,
-                optFilters: optFilterValue,
-                templateFilters: actualFilters,
+                optTermType,
+                actualTermType,
                 matches
             });
             return matches;
@@ -4615,12 +4621,16 @@ class ColumnEditModal {
             this.isLoading.set(true);
             const formValue = this.editForm.getRawValue();
             const ontologyTypeIndex = parseInt(formValue.ontologyType);
-            const ontologyTypeValue = ontologyTypeIndex > 0 ? this.ontologyTypes[ontologyTypeIndex]?.value : undefined;
+            const selectedOntology = ontologyTypeIndex > 0 ? this.ontologyTypes[ontologyTypeIndex] : null;
+            const ontologyTypeValue = selectedOntology?.value;
+            // Extract custom filters from the selected ontology config
+            const customOntologyFilters = selectedOntology?.customFilters || {};
             const columnData = {
                 name: formValue.name,
                 type: formValue.type,
                 value: formValue.value || '',
                 ontologyType: ontologyTypeValue,
+                customOntologyFilters: customOntologyFilters,
                 enableTypeahead: formValue.enableTypeahead || false,
                 mandatory: formValue.mandatory || false,
                 hidden: formValue.hidden || false,