@lavalogic/scoria 0.8.1 → 0.8.2

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

@@ -14,11 +14,7 @@
 	import { getContext, untrack, onMount } from 'svelte';
 	import { cubicOut } from 'svelte/easing';
 	import { fade } from 'svelte/transition';
-	import {
-		searchableTypes,
-		numberDateFilterTypes,
-		stringFilterTypes
-	} from '../Misc/FilterInput.svelte';
+	import { numberDateFilterTypes, stringFilterTypes } from '../Misc/FilterInput.svelte';
 	import { quickFilterContextIdentifier } from '../Table.svelte';
 	import { TableContext } from '../Types/Context/TableContext.svelte.js';
 	import { CustomFilterType } from '../Types/Filtering/CustomFilterType.js';
@@ -28,10 +24,8 @@
 	import type { SelectOption } from '../../../Types/Internal/SelectOption.js';
 	import type { Column } from '../Types/Columns/Column.js';
 
-	import { AbstractDisplayDef } from '../Types/Columns/Definitions/Display/AbstractDisplayDef.svelte.js';
 	import { DateInputDef } from '../Types/Columns/Definitions/Accessors/DateInputDef.svelte.js';
 	import { SelectDef } from '../Types/Columns/Definitions/Accessors/SelectDef.svelte.js';
-	import { AccessorDef } from '../Types/Columns/Definitions/Accessors/AccessorDef.svelte.js';
 	import { NumberInputDef } from '../Types/Columns/Definitions/Accessors/NumberInputDef.svelte.js';
 	import { dev } from '$app/environment';
 	import { QuerySelect } from '../../../index.js';
@@ -56,14 +50,14 @@
 
 	const hasFilterFn = $derived(!!def.filterFn && typeof def.filterFn === 'function');
 
-	const hasAcceptableColumnType = $derived(
-		(def instanceof AccessorDef && searchableTypes.has(def.accessorType)) ||
-			(def instanceof AbstractDisplayDef && searchableTypes.has(def.displayType))
-	);
+	// const hasAcceptableColumnType = $derived(
+	// 	(def instanceof AccessorDef && searchableTypes.has(def.accessorType)) ||
+	// 		(def instanceof AbstractDisplayDef && searchableTypes.has(def.displayType))
+	// );
 
 	const isSearchable = $derived(
-		def.allowFiltering != false &&
-			((hasFilterFn && hasAcceptableColumnType) || customFilters?.has(def.id) == true)
+		def.allowFiltering != false && (hasFilterFn || customFilters?.has(def.id) == true)
+		// ((hasFilterFn && hasAcceptableColumnType) || customFilters?.has(def.id) == true) // removed hasAcceptableColumnType due to it being redundant
 	);
 
 	const isNumeric = $derived(

package/dist/Components/Table/ColumnDefinitions/ExampleItemColumnDef.svelte.js

@@ -35,6 +35,13 @@ export class ExampleItemColumnDef {
                 },
                 modal
             }),
+            new DisplayDef({
+                id: 'account_id',
+                header: 'Account',
+                accessorFn: (item) => `Unknown (id ${item.id})`,
+                filterValueType: 'Number',
+                debug: true
+            }),
             new DisplayDef({
                 header: 'ID',
                 id: 'id',

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

@@ -55,22 +55,22 @@
 		{ value: NumberDateFilterMode.null, label: 'Is null' }
 	];
 
-	export const searchableColumnTypes = new Set<ColumnType | undefined>([
-		ColumnType.Accessor,
-		// ColumnType.Display,
-		ColumnType.FilterOnly
-		//ColumnType.Custom,
-	]);
-	export const searchableTypes = new Set<AccessorType | DisplayType | undefined>([
-		AccessorType.Text,
-		AccessorType.Number,
-		AccessorType.Date,
-		// AccessorType.Checkbox,
-		DisplayType.Normal,
-		DisplayType.Bubbles,
-		DisplayType.Progress,
-		DisplayType.Icon
-	]);
+	// export const searchableColumnTypes = new Set<ColumnType | undefined>([
+	// 	ColumnType.Accessor,
+	// 	ColumnType.Display,
+	// 	ColumnType.FilterOnly
+	// 	//ColumnType.Custom,
+	// ]);
+	// export const searchableTypes = new Set<AccessorType | DisplayType | undefined>([
+	// 	AccessorType.Text,
+	// 	AccessorType.Number,
+	// 	AccessorType.Date,
+	// 	// AccessorType.Checkbox,
+	// 	DisplayType.Normal,
+	// 	DisplayType.Bubbles,
+	// 	DisplayType.Progress,
+	// 	DisplayType.Icon
+	// ]);
 
 	export interface FilterInputProps<T extends object> {
 		def: ColumnDef<T>;
@@ -100,14 +100,14 @@
 
 	const hasFilterFn = $derived(!!def.filterFn && typeof def.filterFn === 'function');
 
-	const hasAcceptableColumnType = $derived(
-		(def instanceof AccessorDef && searchableTypes.has(def.accessorType)) ||
-			(def instanceof AbstractDisplayDef && searchableTypes.has(def.displayType))
-	);
+	// const hasAcceptableColumnType = $derived(
+	// 	(def instanceof AccessorDef && searchableTypes.has(def.accessorType)) ||
+	// 		(def instanceof AbstractDisplayDef && searchableTypes.has(def.displayType))
+	// );
 
 	const isSearchable = $derived(
-		def.allowFiltering != false &&
-			((hasFilterFn && hasAcceptableColumnType) || customFilters?.has(def.id) == true)
+		def.allowFiltering != false && (hasFilterFn || customFilters?.has(def.id) == true)
+		// ((hasFilterFn && hasAcceptableColumnType) || customFilters?.has(def.id) == true) // removed hasAcceptableColumnType due to it being redundant
 	);
 
 	const hasQuery = $derived(isRemoteSelect && customFilter?.query);

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

@@ -1,6 +1,3 @@
-import { ColumnType } from '../Types/Columns/ColumnType.js';
-import { AccessorType } from '../Types/Columns/Definitions/Accessors/AccessorType.js';
-import { DisplayType } from '../Types/Columns/DisplayType.js';
 import type { CustomRemoteFilters } from '../Types/Filtering/CustomRemoteFilters.js';
 import { NumberDateFilterMode } from '../Types/Filtering/NumberDateFilterMode.js';
 import { StringFilterMode } from '../Types/Filtering/StringFilterMode.js';
@@ -13,8 +10,6 @@ export declare const numberDateFilterTypes: {
     value: NumberDateFilterMode;
     label: string;
 }[];
-export declare const searchableColumnTypes: Set<ColumnType | undefined>;
-export declare const searchableTypes: Set<AccessorType | DisplayType | undefined>;
 export interface FilterInputProps<T extends object> {
     def: ColumnDef<T>;
     customFilters?: CustomRemoteFilters | undefined;

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

@@ -1919,8 +1919,14 @@ export class TableContext {
         const adjustedDefsPromises = this.defaultColumnDefs.defs.map(async (def) => {
             if (def instanceof AccessorDef) {
                 if (def.allowFiltering == false) {
+                    if (def.debug) {
+                        console.log(`${def.id}: does not allow filtering`, def);
+                    }
                     return def;
                 }
+                if (def.debug) {
+                    console.log(`${def.id}: is an accessor def`, def);
+                }
                 if (!('minSize' in def) || !def.minSize) {
                     if (typeof def.header === 'string') {
                         const minWidth = this.measureHeaderWidth(def);
@@ -1934,56 +1940,104 @@ export class TableContext {
                 // code smell...
                 if (def instanceof TextInputDef) {
                     def.filterFn = this.stringFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: given a string filter`, def);
+                    }
                 }
                 else if (def instanceof NumberInputDef) {
                     def.filterFn = this.numberFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: given a number filter`, def);
+                    }
                 }
                 else if (def instanceof SelectDef) {
                     def.filterFn = this.selectFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: given a select filter`, def);
+                    }
                 }
                 else if (def instanceof CheckboxDef) {
                     def.filterFn = this.boolFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: given a bool filter`, def);
+                    }
                 }
                 else if (def instanceof DateInputDef) {
                     def.filterFn = this.dateFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: given a date filter`, def);
+                    }
+                }
+                else if (def.debug) {
+                    console.log(`${def.id}: was not a text,number,select,checkbox,or date accessor, and was not given a filter`, def);
                 }
             }
             else if (
             // this.paginationRepo?.paginationType == PaginationType.Local &&
             !def.filterFn &&
-                def.allowFiltering != false) {
+                def.allowFiltering !== false) {
                 if (def instanceof DisplayDef) {
+                    if (def.debug) {
+                        console.log(`${def.id}: is a display def`, def);
+                    }
                     switch (def.filterValueType) {
                         case undefined:
                         case 'String': {
                             def.filterFn = this.stringFilter;
+                            if (def.debug) {
+                                console.log(`${def.id}: given a string filter`, def);
+                            }
                             break;
                         }
                         case 'Bool': {
                             def.filterFn = this.boolFilter;
+                            if (def.debug) {
+                                console.log(`${def.id}: given a bool filter`, def);
+                            }
                             break;
                         }
                         case 'Date': {
                             def.filterFn = this.dateFilter;
+                            if (def.debug) {
+                                console.log(`${def.id}: given a date filter`, def);
+                            }
                             break;
                         }
                         case 'Number': {
                             def.filterFn = this.numberFilter;
+                            if (def.debug) {
+                                console.log(`${def.id}: given a number filter`, def);
+                            }
                             break;
                         }
                         case 'Select': {
                             def.filterFn = this.selectFilter;
+                            if (def.debug) {
+                                console.log(`${def.id}: given a select filter`, def);
+                            }
                             break;
                         }
                     }
                 }
                 else if (def instanceof BubbleDef) {
                     def.filterFn = this.stringFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: is a bubble def. given a string filter`, def);
+                    }
                 }
                 else if (def instanceof ProgressBarDef) {
                     def.filterFn = this.numberFilter;
+                    if (def.debug) {
+                        console.log(`${def.id}: is a progress def. given a number filter`, def);
+                    }
+                }
+                else if (def.debug) {
+                    console.log(`${def.id}: is not a display, bubble, or progressbar def, and was not given a filter`, def);
                 }
             }
+            else if (def.debug) {
+                console.log(`${def.id}: no filtering matched`, def);
+            }
             return def;
         });
         const adjustedDefs = (await Promise.all(adjustedDefsPromises))

package/package.json

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