@noatgnu/cupcake-vanilla 1.2.2 → 1.2.4

package/fesm2022/noatgnu-cupcake-vanilla.mjs

@@ -1812,10 +1812,8 @@ class ChunkedUploadService extends BaseApiService {
         }
         const hasher = new jsSHA('SHA-256', 'ARRAYBUFFER');
         const arrayBufferPromise = request.file.arrayBuffer();
-        arrayBufferPromise.then(arrayBuffer => {
+        return from(arrayBufferPromise).pipe(switchMap((arrayBuffer) => {
             hasher.update(arrayBuffer);
-        });
-        return from(arrayBufferPromise).pipe(switchMap(() => {
             const hash = hasher.getHash('HEX');
             formData.append('sha256', hash);
             if (request.uploadSessionId) {
@@ -4553,7 +4551,7 @@ class ColumnEditModal {
             name: ['', [Validators.required, Validators.minLength(1)]],
             type: [ColumnType.CHARACTERISTICS, Validators.required],
             value: [''],
-            ontologyType: ['0'], // Default to 'None' (index 0)
+            ontologyType: ['0'],
             enableTypeahead: [false],
             mandatory: [false],
             hidden: [false],
@@ -4574,11 +4572,14 @@ class ColumnEditModal {
     }
     populateForm() {
         if (this.column) {
+            const ontologyTypeIndex = this.column.ontologyType
+                ? this.ontologyTypes.findIndex(o => o.value === this.column.ontologyType)
+                : 0;
             this.editForm.patchValue({
                 name: this.column.name,
                 type: this.getCorrectedColumnType(this.column.name, this.column.type),
                 value: this.column.value || '',
-                ontologyType: this.column.ontologyType || '',
+                ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
                 enableTypeahead: this.column.enableTypeahead || false,
                 mandatory: this.column.mandatory || false,
                 hidden: this.column.hidden || false,
@@ -4595,12 +4596,14 @@ class ColumnEditModal {
         }
         if (this.editForm.valid) {
             this.isLoading.set(true);
-            const formValue = this.editForm.getRawValue(); // getRawValue() includes disabled controls
+            const formValue = this.editForm.getRawValue();
+            const ontologyTypeIndex = parseInt(formValue.ontologyType);
+            const ontologyTypeValue = ontologyTypeIndex > 0 ? this.ontologyTypes[ontologyTypeIndex]?.value : undefined;
             const columnData = {
                 name: formValue.name,
                 type: formValue.type,
                 value: formValue.value || '',
-                ontologyType: formValue.ontologyType || null,
+                ontologyType: ontologyTypeValue,
                 enableTypeahead: formValue.enableTypeahead || false,
                 mandatory: formValue.mandatory || false,
                 hidden: formValue.hidden || false,
@@ -4641,7 +4644,7 @@ class ColumnEditModal {
     }
     get hasOntologyType() {
         const ontologyTypeIndex = this.editForm.get('ontologyType')?.value;
-        return !!(ontologyTypeIndex && ontologyTypeIndex !== '0'); // '0' is the 'None' option
+        return !!(ontologyTypeIndex && ontologyTypeIndex !== '0');
     }
     get hasTypeaheadEnabled() {
         return this.hasOntologyType && this.editForm.get('enableTypeahead')?.value === true;
@@ -4726,11 +4729,14 @@ class ColumnEditModal {
                 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;
                 this.editForm.patchValue({
                     name: template.columnName,
                     type: template.columnType,
                     value: template.defaultValue || '',
-                    ontologyType: template.ontologyType || '',
+                    ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
                     enableTypeahead: template.enableTypeahead || false,
                     mandatory: false,
                     hidden: false,
@@ -4761,7 +4767,7 @@ class ColumnEditModal {
             name: '',
             type: ColumnType.CHARACTERISTICS,
             value: '',
-            ontologyType: '',
+            ontologyType: '0',
             enableTypeahead: false,
             mandatory: false,
             hidden: false,
@@ -4788,11 +4794,15 @@ class ColumnEditModal {
         // Enable controls to update values, then disable again
         this.editForm.get('name')?.enable();
         this.editForm.get('type')?.enable();
+        const ontologyTypeValue = this.getDefaultOntologyTypeForColumn(column.name);
+        const ontologyTypeIndex = ontologyTypeValue
+            ? this.ontologyTypes.findIndex(o => o.value === ontologyTypeValue)
+            : 0;
         this.editForm.patchValue({
             name: column.name,
             type: column.type,
             value: '',
-            ontologyType: this.getDefaultOntologyTypeForColumn(column.name),
+            ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
             enableTypeahead: this.shouldEnableTypeaheadForColumn(column.name),
             mandatory: this.isColumnMandatory(column.name),
             hidden: false,
@@ -4885,13 +4895,16 @@ class ColumnEditModal {
         // 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;
         this.editForm.patchValue({
             name: template.columnName,
             type: template.columnType,
-            value: currentValue, // Preserve current value
-            ontologyType: template.ontologyType || '',
+            value: currentValue,
+            ontologyType: ontologyTypeIndex >= 0 ? ontologyTypeIndex.toString() : '0',
             enableTypeahead: template.enableTypeahead || false,
-            mandatory: this.editForm.get('mandatory')?.value || false, // Preserve current settings
+            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
@@ -4926,7 +4939,7 @@ class ColumnEditModal {
         // Reset ontology type when disabling advanced mode
         if (!this.showAdvancedMode()) {
             this.editForm.patchValue({
-                ontologyType: '0', // Reset to 'None'
+                ontologyType: '0',
                 enableTypeahead: false
             });
             this.selectedOntologyConfig = null;