@lavalogic/scoria 0.5.2 → 0.5.4

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

@@ -125,7 +125,12 @@
 					//  as unknown as string | number | undefined;
 
 					if (gotValue != undefined) {
-						const key = customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey;
+						const key =
+							customFilter?.id ??
+							customFilter?.label ??
+							customFilter?.objectName ??
+							customFilter?.queryKey ??
+							def.id;
 						const x = key == null ? null : tableContext.dataRepo.__queryValues.get(key);
 						value = (x ?? null) as SelectOption<unknown> | null;
 					}
@@ -286,7 +291,11 @@
 				{#if hasQuery}
 					{#if typeof value == 'object'}
 						{@const label =
-							customFilter!.label ?? customFilter?.objectName ?? customFilter!.queryKey!}
+							customFilter?.id ??
+							customFilter?.label ??
+							customFilter?.objectName ??
+							customFilter?.queryKey ??
+							def.id}
 						<!-- TODO: multiselect -->
 
 						<QuerySelect

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

@@ -163,7 +163,11 @@
 					if (filteringStateValue != undefined) {
 						console.log(`query values:`, tableContext.dataRepo.__queryValues);
 						const x = tableContext.dataRepo.__queryValues.get(
-							customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey ?? _uuid
+							customFilter?.id ?? customFilter?.label ??
+								customFilter?.objectName ??
+								customFilter?.queryKey ??
+								def.id ??
+								_uuid
 						);
 
 						if (def.debug) {
@@ -351,7 +355,10 @@
 			<div class="maxwidth">
 				{#await optionsPromise then options}
 					<MultiSelect
-						label={customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey}
+						label={customFilter?.id ?? customFilter?.label ??
+							customFilter?.objectName ??
+							customFilter?.queryKey ??
+							def.id}
 						labelProp="label"
 						valueProp="value"
 						name={customFilter?.objectName ?? 'Item'}
@@ -376,8 +383,8 @@
 				{#await options then options}
 					{#if hasQuery}
 						{#if typeof value == 'object'}
-							{@const label =
-								customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey}
+							{@const label = customFilter?.id ??
+								customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey ?? def.id}
 							<!-- TODO: multiselect -->
 
 							<QuerySelect
@@ -402,7 +409,10 @@
 						{/if}
 					{:else}
 						<MultiSelect
-							label={customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey}
+							label={customFilter?.id ?? customFilter?.label ??
+								customFilter?.objectName ??
+								customFilter?.queryKey ??
+								def.id}
 							labelProp="label"
 							valueProp="value"
 							name={customFilter?.objectName ?? 'Item'}

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

@@ -3,6 +3,7 @@ import type { CustomFilterType } from './CustomFilterType.js';
 export interface CustomFilter {
     queryKey: string;
     type: CustomFilterType;
+    id: string;
     valueAsObject?: boolean;
     options?: Array<SelectOption<string | number>> | Promise<Array<SelectOption<string | number>>>;
     multiSelect?: boolean;

package/package.json

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