@bexis2/bexis2-core-ui 0.2.11 → 0.2.13

package/dist/stores/pageStores.js

@@ -1,4 +1,4 @@
-import { BreadcrumbModel } from "../models/Page";
+import { BreadcrumbModel } from '../models/Page';
 import { writable } from 'svelte/store';
 function createHelpStore() {
     // set Store Type
@@ -15,23 +15,23 @@ function createHelpStore() {
         setHelpItemList: (helpItems) => {
             helpStore.set({ itemId: undefined, helpItems: helpItems });
         },
-        //set the ID of the help item and display it 
+        //set the ID of the help item and display it
         setItemId: (itemId) => {
-            helpStore.subscribe(value => {
-                value = (value === undefined) ? { itemId: undefined, helpItems: h } : value;
-                value.helpItems = (value.helpItems === undefined) ? h : value.helpItems;
+            helpStore.subscribe((value) => {
+                value = value === undefined ? { itemId: undefined, helpItems: h } : value;
+                value.helpItems = value.helpItems === undefined ? h : value.helpItems;
                 v = { itemId: itemId, helpItems: value.helpItems };
             });
-            update(u => u = v);
+            update((u) => (u = v));
         },
-        //reset the ID of the help item and hide it 
+        //reset the ID of the help item and hide it
         resetItemId: () => {
-            helpStore.subscribe(value => {
-                value = (value === undefined) ? { itemId: undefined, helpItems: h } : value;
-                value.helpItems = (value.helpItems === undefined) ? h : value.helpItems;
+            helpStore.subscribe((value) => {
+                value = value === undefined ? { itemId: undefined, helpItems: h } : value;
+                value.helpItems = value.helpItems === undefined ? h : value.helpItems;
                 v = { itemId: undefined, helpItems: value.helpItems };
             });
-            update(u => u = v);
+            update((u) => (u = v));
         },
         //set the ID of the help item and display it
         show: (itemId) => {
@@ -39,21 +39,21 @@ function createHelpStore() {
         },
         //set a help item and display it
         showHelpItem: (helpItem) => {
-            helpItem.id = (helpItem.id === undefined) ? "default" : helpItem.id;
+            helpItem.id = helpItem.id === undefined ? 'default' : helpItem.id;
             helpStore.set({ itemId: helpItem.id, helpItems: [helpItem] });
         },
-        //reset the ID of the help item and hide it 
+        //reset the ID of the help item and hide it
         hide: () => {
             helpStore.resetItemId();
         },
-        //reset the ID of the help item and hide it 
+        //reset the ID of the help item and hide it
         toggle: (itemId) => {
-            helpStore.subscribe(value => {
-                value = (value === undefined) ? { itemId: undefined, helpItems: h } : value;
-                value.helpItems = (value.helpItems === undefined) ? h : value.helpItems;
+            helpStore.subscribe((value) => {
+                value = value === undefined ? { itemId: undefined, helpItems: h } : value;
+                value.helpItems = value.helpItems === undefined ? h : value.helpItems;
                 v = { itemId: itemId, helpItems: value.helpItems };
             });
-            update(u => u = v);
+            update((u) => (u = v));
         },
         reset: () => {
             helpStore.set({ itemId: undefined, helpItems: h });
@@ -63,7 +63,7 @@ function createHelpStore() {
         }
     };
 }
-//crate and export the instance of the store 
+//crate and export the instance of the store
 export const helpStore = createHelpStore();
 // store for menu
 export const menuStore = writable();
@@ -76,27 +76,27 @@ function createBreadcrumbStore() {
         subscribe,
         set,
         update,
-        //set the ID of the help item and display it 
+        //set the ID of the help item and display it
         addItem: (item) => {
             let b;
-            breadcrumbStore.subscribe(value => {
-                value = (value === undefined) ? new BreadcrumbModel() : value;
+            breadcrumbStore.subscribe((value) => {
+                value = value === undefined ? new BreadcrumbModel() : value;
                 // value.items = (value.items === undefined) ? b:value.items
-                if (!value.items.find(i => i.label === item.label)) {
+                if (!value.items.find((i) => i.label === item.label)) {
                     value.items = [...value.items, item];
                 }
                 b = value;
             });
-            update(s => s = b);
+            update((s) => (s = b));
         },
         clean: () => {
             let b;
-            breadcrumbStore.subscribe(value => {
+            breadcrumbStore.subscribe((value) => {
                 value = new BreadcrumbModel();
                 b = value;
             });
-            update(s => s = b);
-        },
+            update((s) => (s = b));
+        }
     };
 }
 // store for breadcrumb navigation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bexis2/bexis2-core-ui",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "private": false,
   "scripts": {
     "dev": "vite dev",
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.28.1",
-    "@skeletonlabs/skeleton": "^1.6.2",
+    "@skeletonlabs/skeleton": "^1.9.0",
     "@sveltejs/adapter-auto": "^2.0.0",
     "@sveltejs/adapter-static": "^2.0.2",
     "@sveltejs/kit": "^1.5.0",

package/src/lib/components/Table/Table.svelte

@@ -1,246 +1,246 @@
-<script lang="ts">
-	import { createEventDispatcher } from 'svelte';
-	import { createTable, Subscribe, Render, createRender } from 'svelte-headless-table';
-	import {
-		addSortBy,
-		addPagination,
-		addExpandedRows,
-		addColumnFilters,
-		addTableFilter
-	} from 'svelte-headless-table/plugins';
-	import { computePosition, autoUpdate, offset, shift, flip, arrow } from '@floating-ui/dom';
-	import { storePopup } from '@skeletonlabs/skeleton';
-
-	storePopup.set({ computePosition, autoUpdate, offset, shift, flip, arrow });
-
-	import TableFilter from './TableFilter.svelte';
-	import TablePagination from './TablePagination.svelte';
-	import { columnFilter, searchFilter } from './filter';
-	import type { TableConfig } from '$lib/models/Models';
-
-	export let config: TableConfig<any>;
-	let {
-		id: tableId,
-		data,
-		columns,
-		optionsComponent,
-		defaultPageSize = 10,
-		pageSizes = [5, 10, 15, 20]
-	} = config;
-
-	type AccessorType = keyof (typeof $data)[number];
-
-	const dispatch = createEventDispatcher();
-	const actionDispatcher = (obj) => dispatch('action', obj);
-
-	const table = createTable(data, {
-		colFilter: addColumnFilters(),
-		tableFilter: addTableFilter({
-			fn: searchFilter
-		}),
-		sort: addSortBy({ disableMultiSort: true }),
-		page: addPagination({ initialPageSize: defaultPageSize }),
-		expand: addExpandedRows()
-	});
-
-	const accessors: AccessorType[] =
-		$data.length > 0 ? (Object.keys($data[0]) as AccessorType[]) : [];
-
-	const tableColumns = [
-		...accessors
-			.filter((accessor) => {
-				const key = accessor as string;
-				if (columns !== undefined && key in columns && columns[key].exclude === true) {
-					return false;
-				}
-				return true;
-			})
-			.map((accessor) => {
-				const key = accessor as string;
-				if (columns !== undefined && key in columns) {
-					const {
-						header,
-						colFilterFn,
-						colFilterComponent,
-						instructions,
-						disableFiltering = false,
-						disableSorting = false
-					} = columns[key];
-
-					const { toSortableValueFn, toFilterableValueFn, toStringFn, renderComponent } =
-						instructions ?? {};
-
-					return table.column({
-						header: header ?? key,
-						accessor: accessor,
-						cell: ({ value, row }) => {
-							return renderComponent
-								? createRender(renderComponent, { value, row })
-								: toStringFn
-								? toStringFn(value)
-								: value;
-						},
-						plugins: {
-							sort: {
-								disable: disableSorting,
-								invert: true,
-								getSortValue: (row) => {
-									return toSortableValueFn ? toSortableValueFn(row) : row;
-								}
-							},
-							colFilter: !disableFiltering
-								? {
-										fn: ({ filterValue, value }) => {
-											const val = toFilterableValueFn ? toFilterableValueFn(value) : value;
-
-											return colFilterFn
-												? colFilterFn({ filterValue, value: val })
-												: columnFilter({ filterValue, value: val });
-										},
-										render: ({ filterValue, values, id }) => {
-											return createRender(colFilterComponent ?? TableFilter, {
-												filterValue,
-												id,
-												tableId,
-												values,
-												toFilterableValueFn
-											});
-										}
-								  }
-								: undefined,
-							tableFilter: {
-								getFilterValue: (row) => {
-									return toStringFn ? toStringFn(row) : row;
-								}
-							}
-						}
-					});
-				} else {
-					return table.column({
-						header: key,
-						accessor: accessor,
-						plugins: {
-							sort: {
-								invert: true
-							},
-							colFilter: {
-								fn: columnFilter,
-								render: ({ filterValue, values, id }) =>
-									createRender(TableFilter, {
-										filterValue,
-										id,
-										tableId,
-										values
-									})
-							}
-						}
-					});
-				}
-			})
-	];
-
-	if (optionsComponent !== undefined) {
-		tableColumns.push(
-			table.display({
-				id: 'options',
-				header: '',
-				cell: ({ row }, _) => {
-					return createRender(optionsComponent!, {
-						row: row.isData() ? row.original : null,
-						dispatchFn: actionDispatcher
-					});
-				}
-			}) as any
-		);
-	}
-
-	const createdTableColumns = table.createColumns(tableColumns);
-
-	const { headerRows, pageRows, tableAttrs, tableBodyAttrs, pluginStates } =
-		table.createViewModel(createdTableColumns);
-	const { filterValue } = pluginStates.tableFilter;
-</script>
-
-<div class="grid gap-2">
-	<div class="table-container">
-		{#if $data.length > 0}
-			<input
-				class="input p-2 mb-2 border border-primary-500"
-				type="text"
-				bind:value={$filterValue}
-				placeholder="Search rows..."
-			/>
-		{/if}
-		<table {...$tableAttrs} class="table table-compact bg-tertiary-200">
-			<thead>
-				{#each $headerRows as headerRow (headerRow.id)}
-					<Subscribe
-						rowAttrs={headerRow.attrs()}
-						let:rowAttrs
-						rowProps={headerRow.props()}
-						let:rowProps
-					>
-						<tr {...rowAttrs} class="bg-primary-300">
-							{#each headerRow.cells as cell (cell.id)}
-								<Subscribe attrs={cell.attrs()} props={cell.props()} let:props let:attrs>
-									<th scope="col" class="!p-2 w-min" {...attrs}>
-										<div class="flex w-full justify-between items-center">
-											<div class="flex gap-1">
-												<span
-													class:underline={props.sort.order}
-													class:normal-case={cell.id !== cell.label}
-													class:cursor-pointer={!props.sort.disabled}
-													on:click={props.sort.toggle}
-													on:keydown={props.sort.toggle}
-												>
-													{cell.render()}
-												</span>
-												<div class="w-2">
-													{#if props.sort.order === 'asc'}
-														▾
-													{:else if props.sort.order === 'desc'}
-														▴
-													{/if}
-												</div>
-											</div>
-											{#if cell.isData()}
-												{#if props.colFilter?.render}
-													<div>
-														<Render of={props.colFilter.render} />
-													</div>
-												{/if}
-											{/if}
-										</div>
-									</th>
-								</Subscribe>
-							{/each}
-						</tr>
-					</Subscribe>
-				{:else}
-					<p class="items-center justify-center flex w-full p-10 italic">Nothing to show here.</p>
-				{/each}
-			</thead>
-
-			<tbody class="" {...$tableBodyAttrs}>
-				{#each $pageRows as row (row.id)}
-					<Subscribe rowAttrs={row.attrs()} let:rowAttrs>
-						<tr {...rowAttrs}>
-							{#each row.cells as cell (cell?.id)}
-								<Subscribe attrs={cell.attrs()} let:attrs>
-									<td {...attrs} class="!p-2 w-min">
-										<div class="flex items-center w-full h-full table-cell-fit">
-											<Render of={cell.render()} />
-										</div>
-									</td>
-								</Subscribe>
-							{/each}
-						</tr>
-					</Subscribe>
-				{/each}
-			</tbody>
-		</table>
-	</div>
-	{#if $data.length > 0}
-		<TablePagination pageConfig={pluginStates.page} {pageSizes} />
-	{/if}
-</div>
+<script lang="ts">
+	import { createEventDispatcher } from 'svelte';
+	import { createTable, Subscribe, Render, createRender } from 'svelte-headless-table';
+	import {
+		addSortBy,
+		addPagination,
+		addExpandedRows,
+		addColumnFilters,
+		addTableFilter
+	} from 'svelte-headless-table/plugins';
+	import { computePosition, autoUpdate, offset, shift, flip, arrow } from '@floating-ui/dom';
+	import { storePopup } from '@skeletonlabs/skeleton';
+
+	storePopup.set({ computePosition, autoUpdate, offset, shift, flip, arrow });
+
+	import TableFilter from './TableFilter.svelte';
+	import TablePagination from './TablePagination.svelte';
+	import { columnFilter, searchFilter } from './filter';
+	import type { TableConfig } from '$lib/models/Models';
+
+	export let config: TableConfig<any>;
+	let {
+		id: tableId,
+		data,
+		columns,
+		optionsComponent,
+		defaultPageSize = 10,
+		pageSizes = [5, 10, 15, 20]
+	} = config;
+
+	type AccessorType = keyof (typeof $data)[number];
+
+	const dispatch = createEventDispatcher();
+	const actionDispatcher = (obj) => dispatch('action', obj);
+
+	const table = createTable(data, {
+		colFilter: addColumnFilters(),
+		tableFilter: addTableFilter({
+			fn: searchFilter
+		}),
+		sort: addSortBy({ disableMultiSort: true }),
+		page: addPagination({ initialPageSize: defaultPageSize }),
+		expand: addExpandedRows()
+	});
+
+	const accessors: AccessorType[] =
+		$data.length > 0 ? (Object.keys($data[0]) as AccessorType[]) : [];
+
+	const tableColumns = [
+		...accessors
+			.filter((accessor) => {
+				const key = accessor as string;
+				if (columns !== undefined && key in columns && columns[key].exclude === true) {
+					return false;
+				}
+				return true;
+			})
+			.map((accessor) => {
+				const key = accessor as string;
+				if (columns !== undefined && key in columns) {
+					const {
+						header,
+						colFilterFn,
+						colFilterComponent,
+						instructions,
+						disableFiltering = false,
+						disableSorting = false
+					} = columns[key];
+
+					const { toSortableValueFn, toFilterableValueFn, toStringFn, renderComponent } =
+						instructions ?? {};
+
+					return table.column({
+						header: header ?? key,
+						accessor: accessor,
+						cell: ({ value, row }) => {
+							return renderComponent
+								? createRender(renderComponent, { value, row })
+								: toStringFn
+								? toStringFn(value)
+								: value;
+						},
+						plugins: {
+							sort: {
+								disable: disableSorting,
+								invert: true,
+								getSortValue: (row) => {
+									return toSortableValueFn ? toSortableValueFn(row) : row;
+								}
+							},
+							colFilter: !disableFiltering
+								? {
+										fn: ({ filterValue, value }) => {
+											const val = toFilterableValueFn ? toFilterableValueFn(value) : value;
+
+											return colFilterFn
+												? colFilterFn({ filterValue, value: val })
+												: columnFilter({ filterValue, value: val });
+										},
+										render: ({ filterValue, values, id }) => {
+											return createRender(colFilterComponent ?? TableFilter, {
+												filterValue,
+												id,
+												tableId,
+												values,
+												toFilterableValueFn
+											});
+										}
+								  }
+								: undefined,
+							tableFilter: {
+								getFilterValue: (row) => {
+									return toStringFn ? toStringFn(row) : row;
+								}
+							}
+						}
+					});
+				} else {
+					return table.column({
+						header: key,
+						accessor: accessor,
+						plugins: {
+							sort: {
+								invert: true
+							},
+							colFilter: {
+								fn: columnFilter,
+								render: ({ filterValue, values, id }) =>
+									createRender(TableFilter, {
+										filterValue,
+										id,
+										tableId,
+										values
+									})
+							}
+						}
+					});
+				}
+			})
+	];
+
+	if (optionsComponent !== undefined) {
+		tableColumns.push(
+			table.display({
+				id: 'options',
+				header: '',
+				cell: ({ row }, _) => {
+					return createRender(optionsComponent!, {
+						row: row.isData() ? row.original : null,
+						dispatchFn: actionDispatcher
+					});
+				}
+			}) as any
+		);
+	}
+
+	const createdTableColumns = table.createColumns(tableColumns);
+
+	const { headerRows, pageRows, tableAttrs, tableBodyAttrs, pluginStates } =
+		table.createViewModel(createdTableColumns);
+	const { filterValue } = pluginStates.tableFilter;
+</script>
+
+<div class="grid gap-2">
+	<div class="table-container">
+		{#if $data.length > 0}
+			<input
+				class="input p-2 mb-2 border border-primary-500"
+				type="text"
+				bind:value={$filterValue}
+				placeholder="Search rows..."
+			/>
+		{/if}
+		<table {...$tableAttrs} class="table table-compact bg-tertiary-200">
+			<thead>
+				{#each $headerRows as headerRow (headerRow.id)}
+					<Subscribe
+						rowAttrs={headerRow.attrs()}
+						let:rowAttrs
+						rowProps={headerRow.props()}
+						let:rowProps
+					>
+						<tr {...rowAttrs} class="bg-primary-300">
+							{#each headerRow.cells as cell (cell.id)}
+								<Subscribe attrs={cell.attrs()} props={cell.props()} let:props let:attrs>
+									<th scope="col" class="!p-2 w-min" {...attrs}>
+										<div class="flex w-full justify-between items-center">
+											<div class="flex gap-1">
+												<span
+													class:underline={props.sort.order}
+													class:normal-case={cell.id !== cell.label}
+													class:cursor-pointer={!props.sort.disabled}
+													on:click={props.sort.toggle}
+													on:keydown={props.sort.toggle}
+												>
+													{cell.render()}
+												</span>
+												<div class="w-2">
+													{#if props.sort.order === 'asc'}
+														▾
+													{:else if props.sort.order === 'desc'}
+														▴
+													{/if}
+												</div>
+											</div>
+											{#if cell.isData()}
+												{#if props.colFilter?.render}
+													<div>
+														<Render of={props.colFilter.render} />
+													</div>
+												{/if}
+											{/if}
+										</div>
+									</th>
+								</Subscribe>
+							{/each}
+						</tr>
+					</Subscribe>
+				{:else}
+					<p class="items-center justify-center flex w-full p-10 italic">Nothing to show here.</p>
+				{/each}
+			</thead>
+
+			<tbody class="" {...$tableBodyAttrs}>
+				{#each $pageRows as row (row.id)}
+					<Subscribe rowAttrs={row.attrs()} let:rowAttrs>
+						<tr {...rowAttrs}>
+							{#each row.cells as cell (cell?.id)}
+								<Subscribe attrs={cell.attrs()} let:attrs>
+									<td {...attrs} class="!p-2 w-min">
+										<div class="flex items-center w-full h-full table-cell-fit">
+											<Render of={cell.render()} />
+										</div>
+									</td>
+								</Subscribe>
+							{/each}
+						</tr>
+					</Subscribe>
+				{/each}
+			</tbody>
+		</table>
+	</div>
+	{#if $data.length > 0}
+		<TablePagination pageConfig={pluginStates.page} {pageSizes} />
+	{/if}
+</div>

package/src/lib/components/Table/TableFilter.svelte

@@ -44,6 +44,14 @@
 			}
 		],
 		string: [
+			{
+				value: 'contains',
+				label: 'Contains'
+			},
+			{
+				value: 'notcontains',
+				label: 'Does not contain'
+			},
 			{
 				value: 'isequal',
 				label: 'Is equal to'
@@ -56,14 +64,6 @@
 				value: 'starts',
 				label: 'Starts with'
 			},
-			{
-				value: 'contains',
-				label: 'Contains'
-			},
-			{
-				value: 'notcontains',
-				label: 'Does not contain'
-			},
 			{
 				value: 'ends',
 				label: 'Ends with'