@lavalogic/scoria 0.9.1 → 0.9.2

package/dist/Components/Table/Body/QuickSearchCell.svelte

@@ -273,6 +273,14 @@
 	let showFromDateModal = $state(false);
 	let showToDateModal = $state(false);
 
+	function generateOnChangeObject(label: string) {
+		return (newValue: SelectOption<string | number> | null) => {
+			tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
+			tableContext.dataRepo.__queryValues.set(label, newValue);
+			value = newValue;
+		};
+	}
+
 	function generateOnChangePrimitive(label: string) {
 		return (newValue: SelectOption<string | number> | null) => {
 			tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
@@ -339,25 +347,49 @@
 				{/if}
 			{:else if isSelect}
 				{#if hasQuery}
-					{@const label =
-						customFilter?.id ??
-						customFilter?.label ??
-						customFilter?.objectName ??
-						customFilter?.queryKey ??
-						def.id}
-					<!-- TODO: multiselect -->
-
-					<QuerySelect
-						valueAsObject={false}
-						clearable
-						name={customFilter?.objectName ?? 'Item'}
-						valueProp="value"
-						labelProp="label"
-						value={value as string | number | null}
-						query={customFilter!.query!}
-						bind:options={lastQueryOptions}
-						onchange={generateOnChangePrimitive(label)}
-					/>
+					{#if customFilter!.valueAsObject == false}
+						{@const label =
+							customFilter?.id ??
+							customFilter?.label ??
+							customFilter?.objectName ??
+							customFilter?.queryKey ??
+							def.id}
+
+						<!-- TODO: multiselect -->
+
+						<QuerySelect
+							valueAsObject={false}
+							clearable
+							name={customFilter?.objectName ?? 'Item'}
+							valueProp="value"
+							labelProp="label"
+							value={value as string | number | null}
+							query={customFilter!.query!}
+							bind:options={lastQueryOptions}
+							onchange={generateOnChangePrimitive(label)}
+						/>
+					{:else}
+						{@const label =
+							customFilter?.id ??
+							customFilter?.label ??
+							customFilter?.objectName ??
+							customFilter?.queryKey ??
+							def.id}
+
+						<!-- TODO: multiselect -->
+
+						<QuerySelect
+							valueAsObject={true}
+							clearable
+							name={customFilter?.objectName ?? 'Item'}
+							valueProp="value"
+							labelProp="label"
+							value={value as null}
+							query={customFilter!.query!}
+							bind:options={lastQueryOptions}
+							onchange={generateOnChangeObject(label)}
+						/>
+					{/if}
 				{:else}
 					{#await options then options}
 						<MultiSelect

package/dist/Components/Table/Misc/FilterInput.svelte

@@ -297,11 +297,18 @@
 	let showFromDateModal = $state(false);
 	let showToDateModal = $state(false);
 
+	function generateOnChangeObject(label: string) {
+		return (newValue: SelectOption<string | number> | null) => {
+			tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
+			tableContext.dataRepo.__queryValues.set(label, newValue ?? null);
+			value = newValue ?? null;
+		};
+	}
+
 	function generateOnChangePrimitive(label: string) {
 		return (newValue: SelectOption<string | number> | null) => {
 			tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
 			tableContext.dataRepo.__queryValues.set(label, newValue?.value ?? null);
-			// FIXME <T> is lost when autoformatting. why?
 			value = newValue?.value ?? null;
 		};
 	}
@@ -393,26 +400,51 @@
 			<div class="contents">
 				{#await options then options}
 					{#if hasQuery}
-						{@const label =
-							customFilter?.id ??
-							customFilter?.label ??
-							customFilter?.objectName ??
-							customFilter?.queryKey ??
-							def.id}
-						<!-- TODO: multiselect -->
+						{#if customFilter!.valueAsObject == false}
+							{@const label =
+								customFilter?.id ??
+								customFilter?.label ??
+								customFilter?.objectName ??
+								customFilter?.queryKey ??
+								def.id}
 
-						<QuerySelect
-							valueAsObject={false}
-							{label}
-							clearable
-							name={customFilter?.objectName ?? 'Item'}
-							valueProp="value"
-							labelProp="label"
-							value={value as string | number | null}
-							query={customFilter!.query!}
-							bind:options={lastQueryOptions}
-							onchange={generateOnChangePrimitive(label)}
-						/>
+							<!-- TODO: multiselect -->
+
+							<QuerySelect
+								valueAsObject={false}
+								{label}
+								clearable
+								name={customFilter?.objectName ?? 'Item'}
+								valueProp="value"
+								labelProp="label"
+								value={value as string | number | null}
+								query={customFilter!.query!}
+								bind:options={lastQueryOptions}
+								onchange={generateOnChangePrimitive(label)}
+							/>
+						{:else}
+							{@const label =
+								customFilter?.id ??
+								customFilter?.label ??
+								customFilter?.objectName ??
+								customFilter?.queryKey ??
+								def.id}
+
+							<!-- TODO: multiselect -->
+
+							<QuerySelect
+								valueAsObject={true}
+								{label}
+								clearable
+								name={customFilter?.objectName ?? 'Item'}
+								valueProp="value"
+								labelProp="label"
+								value={value as null}
+								query={customFilter!.query!}
+								bind:options={lastQueryOptions}
+								onchange={generateOnChangeObject(label)}
+							/>
+						{/if}
 					{:else}
 						<MultiSelect
 							label={customFilter?.id ??

package/dist/Components/Table/Types/Filtering/CustomFilter.d.ts

@@ -8,5 +8,6 @@ export interface CustomFilter {
     multiSelect?: boolean;
     objectName?: string;
     label?: string;
+    valueAsObject: boolean;
     query?: (value: unknown) => Promise<Array<SelectOption<number>>>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lavalogic/scoria",
   "description": "Svelte components used for the FloWMS Web Frontend",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "publishConfig": {
     "access": "restricted"
   },