@noatgnu/cupcake-vanilla 1.3.5 → 1.3.7

package/fesm2022/noatgnu-cupcake-vanilla.mjs

@@ -4545,14 +4545,13 @@ class ColumnEditModal {
     }
     populateForm() {
         if (this.column) {
-            const ontologyTypeIndex = this.column.ontologyType
-                ? this.ontologyTypes.findIndex(o => o.value === this.column.ontologyType)
-                : 0;
+            const customFilters = this.column.customOntologyFilters || undefined;
+            const ontologyTypeIndex = this.getOntologyTypeIndex(this.column.ontologyType, customFilters);
             this.editForm.patchValue({
                 name: this.column.name,
                 type: this.getCorrectedColumnType(this.column.name, this.column.type),
                 value: this.column.value || '',
-                ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
+                ontologyType: ontologyTypeIndex.toString(),
                 enableTypeahead: this.column.enableTypeahead || false,
                 mandatory: this.column.mandatory || false,
                 hidden: this.column.hidden || false,
@@ -4563,6 +4562,49 @@ class ColumnEditModal {
             });
         }
     }
+    getOntologyTypeIndex(ontologyType, customFilters) {
+        if (!ontologyType)
+            return 0;
+        if (!customFilters || Object.keys(customFilters).length === 0) {
+            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;
+            // 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 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() {
         // For new columns, require either template or official column selection
         if (!this.isEdit && !this.selectedTemplate && !this.selectedOfficialColumn) {
@@ -4715,28 +4757,22 @@ class ColumnEditModal {
             const template = this.templates.find(t => t.id === Number(this.selectedTemplateId));
             if (template) {
                 this.selectedTemplate = template;
-                // Enable controls to update values, then disable again
                 this.editForm.get('name')?.enable();
                 this.editForm.get('type')?.enable();
-                // Auto-fill form with template data
-                const ontologyTypeIndex = template.ontologyType
-                    ? this.ontologyTypes.findIndex(o => o.value === template.ontologyType)
-                    : 0;
+                const ontologyTypeIndex = this.getOntologyTypeIndex(template.ontologyType, template.customOntologyFilters);
                 this.editForm.patchValue({
                     name: template.columnName,
                     type: template.columnType,
                     value: template.defaultValue || '',
-                    ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
+                    ontologyType: ontologyTypeIndex.toString(),
                     enableTypeahead: template.enableTypeahead || false,
                     mandatory: false,
                     hidden: false,
                     readonly: false,
                     notApplicable: false
                 });
-                // Disable controls again
                 this.editForm.get('name')?.disable();
                 this.editForm.get('type')?.disable();
-                // Mark form as touched to trigger validation display
                 Object.keys(this.editForm.controls).forEach(key => {
                     this.editForm.get(key)?.markAsTouched();
                 });
@@ -4926,29 +4962,23 @@ class ColumnEditModal {
     swapToTemplate(template) {
         this.selectedTemplate = template;
         this.selectedTemplateId = template.id;
-        // Update form with template data, preserving current value
         const currentValue = this.editForm.get('value')?.value || '';
-        // Enable controls to update values, then disable again
         this.editForm.get('name')?.enable();
         this.editForm.get('type')?.enable();
-        const ontologyTypeIndex = template.ontologyType
-            ? this.ontologyTypes.findIndex(o => o.value === template.ontologyType)
-            : 0;
+        const ontologyTypeIndex = this.getOntologyTypeIndex(template.ontologyType, template.customOntologyFilters);
         this.editForm.patchValue({
             name: template.columnName,
             type: template.columnType,
             value: currentValue,
-            ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
+            ontologyType: ontologyTypeIndex.toString(),
             enableTypeahead: template.enableTypeahead || false,
             mandatory: this.editForm.get('mandatory')?.value || false,
             hidden: this.editForm.get('hidden')?.value || false,
             readonly: this.editForm.get('readonly')?.value || false,
             notApplicable: this.editForm.get('notApplicable')?.value || false
         });
-        // Disable controls again
         this.editForm.get('name')?.disable();
         this.editForm.get('type')?.disable();
-        // Mark form as touched
         Object.keys(this.editForm.controls).forEach(key => {
             this.editForm.get(key)?.markAsTouched();
         });