@lavalogic/scoria 0.5.1 → 0.5.4

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

@@ -125,8 +125,13 @@
 					//  as unknown as string | number | undefined;
 
 					if (gotValue != undefined) {
-						const key = customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey;
-						const x = key == null ? null : tableContext.__queryValues.get(key);
+						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;
 					}
 				} catch (e) {
@@ -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
@@ -300,8 +309,8 @@
 							bind:options={lastQueryOptions}
 							onchange={(newValue) => {
 								tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
-								tableContext.__queryValues.set(label, newValue);
-								value = newValue as SelectOption<unknown> | null;
+								tableContext.dataRepo.__queryValues.set(label, newValue);
+								value = newValue as SelectOption<T> | null;
 							}}
 						/>
 					{:else}

package/dist/Components/Table/Body/Rows/Columns/FocusableImmutableCell.svelte

@@ -85,6 +85,8 @@ class:bottom={focusDetails.bottomEdge} -->
 						: value) ??
 					value ??
 					''}
+			{:catch e}
+				{e?.toString()}
 			{/await}
 		{/if}
 	{:else if children}

package/dist/Components/Table/Body/Rows/Columns/TableSelect.svelte

@@ -28,10 +28,10 @@
 
 	let tdref = $state<HTMLTableCellElement | undefined>();
 
-	const selectValue = $derived(cell.getValue());
+	const selectValue = $derived(cell.getValue() as T |null|undefined);
 
 	const visibleValue = $derived(
-		cell.column.columnDef.getDisplayValue(cell.row.original, cell.row.originalIndex)
+		cell.column.columnDef.getDisplayValue!(cell.row.original, cell.row.originalIndex)
 	);
 
 	const optional = $derived((cell.column.columnDef as SelectDef<T>).optional ?? false);
@@ -86,10 +86,10 @@
 	});
 
 	const optionsPromise = $derived(
-		cell.column.columnDef.getSpecificOptions?.(
+		(cell.column.columnDef.getSpecificOptions?.(
 			cell.row.original,
 			focusDetails.coordinates.column
-		) ?? cell.column.columnDef.getOptions()
+		) ?? cell.column.columnDef.getOptions()) as SelectOption<T>[] | Promise<SelectOption<T>[]>
 	);
 
 	let previousValidity: Validity = $state(Validity.Valid);
@@ -205,13 +205,13 @@
 				name="Item"
 				valueProp="value"
 				labelProp="label"
-				value={selectValue}
+				value={selectValue ?? null}
 				{options}
 				width="100%"
 				clearable={cell.column.columnDef.clearable}
 				onfocus={addKeydownEvent}
 				valueAsObject={false}
-				onchange={(newValue: SelectOption<unknown> | null) => {
+				onchange={(newValue: SelectOption<T> | null) => {
 					if (newValue?.value !== value) {
 						if (optional || newValue?.value != null) {
 							tableContext.onEditCell(

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

@@ -161,8 +161,13 @@
 					//  as unknown as string | number | undefined;
 
 					if (filteringStateValue != undefined) {
-						const x = tableContext.__queryValues.get(
-							customFilter?.label ?? customFilter?.objectName ?? customFilter?.queryKey ?? _uuid
+						console.log(`query values:`, tableContext.dataRepo.__queryValues);
+						const x = tableContext.dataRepo.__queryValues.get(
+							customFilter?.id ?? customFilter?.label ??
+								customFilter?.objectName ??
+								customFilter?.queryKey ??
+								def.id ??
+								_uuid
 						);
 
 						if (def.debug) {
@@ -350,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'}
@@ -375,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
@@ -391,9 +399,9 @@
 								bind:options={lastQueryOptions}
 								onchange={(newValue) => {
 									tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
-									tableContext.__queryValues.set(label ?? _uuid, newValue);
+									tableContext.dataRepo.__queryValues.set(label ?? _uuid, newValue);
 									// FIXME <T> is lost when autoformatting. why?
-									value = newValue as SelectOption | null;
+									value = newValue as SelectOption<T> | null;
 								}}
 							/>
 						{:else}
@@ -401,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/Columns/Definitions/Accessors/SelectDef.svelte.d.ts

@@ -18,7 +18,6 @@ export declare class SelectDef<T extends object> extends AccessorDef<T, SelectFi
     get filterFn(): FilterFn<T, SelectFilterValueType<T>> | CustomFilterFn | undefined;
     set filterFn(v: FilterFn<T, SelectFilterValueType<T>> | CustomFilterFn | undefined);
     readonly sortingFn?: (a: T, b: T) => 1 | -1 | 0;
-    readonly getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
     readonly optional: boolean;
     readonly clearable: boolean;
     readonly getSpecificOptions?: (item: T, index: number) => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;

package/dist/Components/Table/Types/Columns/Definitions/Accessors/SelectDef.svelte.js

@@ -20,7 +20,6 @@ export class SelectDef extends AccessorDef {
         this._filterFn = v;
     }
     sortingFn;
-    getDisplayValue;
     optional;
     clearable;
     getSpecificOptions;

package/dist/Components/Table/Types/Context/TableContext.svelte.d.ts

@@ -37,7 +37,6 @@ export declare class TableContext<T extends object> {
     protected constructor(INTERNAL_ONLY: symbol, defaultColumnDefs: DefsWrapper<T>, tableName: string, dataRepo: IDataRepository<T>, allowCopy: boolean, enableResize: boolean, allowColumnReordering: boolean, allowQuickFiltering: boolean, showQuickFilterByDefault: boolean, allowAdvancedFiltering: boolean, toolbarPosition: ToolbarPosition, displayFooter: boolean, selectionExtractor: TableInitOptions<T>['selectionExtractor'], getUserId: () => string | undefined, _onEditCell?: TableInitOptions<T>['onEditCell']);
     private readonly userId;
     private isSelectable;
-    __queryValues: SvelteMap<string, unknown>;
     private _paginationRepo;
     get paginationRepo(): IDataRepository<T> | undefined;
     set paginationRepo(v: IDataRepository<T> | undefined);
@@ -45,7 +44,7 @@ export declare class TableContext<T extends object> {
     get showQuickFiltering(): boolean;
     set showQuickFiltering(v: boolean);
     private _dataRepo;
-    get dataRepo(): IDataRepository<T> | undefined;
+    get dataRepo(): IDataRepository<T>;
     private set dataRepo(value);
     private _remoteFilters;
     get remoteFilters(): CustomRemoteFilters | undefined;

package/dist/Components/Table/Types/Context/TableContext.svelte.js

@@ -64,7 +64,7 @@ export class TableContext {
         if (INTERNAL_ONLY != InternalSymbol) {
             throw new Error('This class may only be instantiated through the static init() method');
         }
-        this.dataRepo = dataRepo;
+        this._dataRepo = $state(dataRepo);
         // this.dataRepo.forceRefresh = this.forceVisibilityUpdate;
         if (defaultColumnDefs.remoteFilters) {
             this.remoteFilters = defaultColumnDefs.remoteFilters;
@@ -147,7 +147,6 @@ export class TableContext {
     // #region stores
     userId;
     isSelectable = $state(false);
-    __queryValues = new SvelteMap();
     _paginationRepo = $state();
     get paginationRepo() {
         return this._paginationRepo;
@@ -162,7 +161,7 @@ export class TableContext {
     set showQuickFiltering(v) {
         this._showQuickFiltering = this.allowQuickFiltering && v;
     }
-    _dataRepo = $state();
+    _dataRepo;
     get dataRepo() {
         return this._dataRepo;
     }

package/dist/Components/Table/Types/DataRepository/IDataRepository.d.ts

@@ -31,6 +31,7 @@ export interface IDataRepository<T extends object> {
     pageStartIndex: number;
     pageEndIndexExclusive: number;
     previouslyViewedPage: number;
+    __queryValues: SvelteMap<string, unknown>;
     readonly paginationType: PaginationType;
     filterType: FilterType;
     data: T[];

package/dist/Components/Table/Types/DataRepository/TableDataRepository.svelte.d.ts

@@ -29,6 +29,7 @@ export declare abstract class TableDataRepository<T extends object> implements I
     abstract pageStartIndex: number;
     abstract pageEndIndexExclusive: number;
     constructor(tableName: string, getUserId: () => string | undefined);
+    __queryValues: SvelteMap<string, unknown>;
     private _paginationState;
     get paginationState(): ReadonlyPaginationState;
     set paginationState(v: ReadonlyPaginationState);

package/dist/Components/Table/Types/DataRepository/TableDataRepository.svelte.js

@@ -7,6 +7,7 @@ export class TableDataRepository {
         this.tableName = tableName;
         this.getUserId = getUserId;
     }
+    __queryValues = new SvelteMap();
     _paginationState = $state({
         pageIndex: 0,
         pageSize: 20

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.1",
+  "version": "0.5.4",
   "publishConfig": {
     "access": "restricted"
   },