Fixed attribute filter selection from workflow dataset

Author: zonia3000

src/lib/components/v2/projects/datasets/FiltersCreationForm.svelte

@@ -48,19 +48,28 @@
 
 	/**
 	 * @param {string} key
-	 * @param {string} value
-	 * @param {string} type
+	 * @param {string|number|boolean} value
 	 */
-	export function importAttribute(key, value, type) {
-		attributeFields = [...attributeFields, { key, value, type, error: '' }];
+	export function importAttribute(key, value) {
+		const newAttribute = { key, value: value.toString(), type: typeof value, error: '' };
+		if (attributeFields.filter((a) => a.key === key).length > 0) {
+			attributeFields = attributeFields.map((a) => (a.key === key ? newAttribute : a));
+		} else {
+			attributeFields = [...attributeFields, newAttribute];
+		}
 	}
 
 	/**
 	 * @param {string} key
 	 * @param {boolean} value
 	 */
 	export function importType(key, value) {
-		typeFields = [...typeFields, { key, value, error: '' }];
+		const newType = { key, value, error: '' };
+		if (typeFields.filter((t) => t.key === key).length > 0) {
+			typeFields = typeFields.map((t) => (t.key === key ? newType : t));
+		} else {
+			typeFields = [...typeFields, newType];
+		}
 	}
 
 	/**

src/lib/components/v2/workflow/InputFiltersTab.svelte

@@ -25,6 +25,7 @@
 	/** @type {string[]} */
 	let datasetTypes = [];
 	let selectedDatasetAttributeKey = '';
+	/** @type {string|number|boolean} */
 	let selectedDatasetAttributeValue = '';
 	let selectedDatasetTypeKey = '';
 	let selectedDatasetTypeValue = true;
@@ -126,8 +127,7 @@
 	}
 
 	function addDatasetAttribute() {
-		const attributeType = typeof datasetAttributes[selectedDatasetAttributeKey];
-		form.importAttribute(selectedDatasetAttributeKey, selectedDatasetAttributeValue, attributeType);
+		form.importAttribute(selectedDatasetAttributeKey, selectedDatasetAttributeValue);
 	}
 
 	function onOpenAddDatasetTypeModal() {
@@ -144,7 +144,7 @@
 	<FiltersCreationForm bind:this={form} />
 
 	{#if loadingDatasetFilters}
-		<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true" />
+		<span class="spinner-border spinner-border-sm mb-3" role="status" aria-hidden="true" />
 	{:else}
 		{#if Object.keys(datasetAttributes).length > 0}
 			<button
@@ -213,7 +213,9 @@
 				>
 					<option value="">Select...</option>
 					{#each datasetAttributes[selectedDatasetAttributeKey] as value}
-						<option>{value}</option>
+						<option {value}>
+							{typeof value === 'boolean' ? (value ? 'True' : 'False') : value}
+						</option>
 					{/each}
 				</select>
 			{/if}