@bexis2/bexis2-core-ui 0.1.4 → 0.1.6

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

@@ -28,7 +28,7 @@
 		pageSizes = [5, 10, 15, 20]
 	} = config;
 
-	type AccessorType = keyof (typeof $data)[0];
+	type AccessorType = keyof (typeof $data)[number];
 
 	const dispatch = createEventDispatcher();
 	const actionDispatcher = (obj) => dispatch('action', obj);
@@ -67,13 +67,18 @@
 						disableSorting = false
 					} = columns[key];
 
-					const { toSortableValueFn, toFilterableValueFn, toStringFn } = instructions ?? {};
+					const { toSortableValueFn, toFilterableValueFn, toStringFn, renderComponent } =
+						instructions ?? {};
 
 					return table.column({
 						header: header ?? key,
 						accessor: accessor,
-						cell: ({ value }) => {
-							return toStringFn ? toStringFn(value) : value;
+						cell: ({ value, row }) => {
+							return renderComponent
+								? createRender(renderComponent, { value, row })
+								: toStringFn
+								? toStringFn(value)
+								: value;
 						},
 						plugins: {
 							sort: {
@@ -158,12 +163,14 @@
 
 <div class="grid gap-2">
 	<div class="table-container">
-		<input
-			class="input p-2 mb-2 border border-primary-500"
-			type="text"
-			bind:value={$filterValue}
-			placeholder="Search rows..."
-		/>
+		{#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)}
@@ -209,6 +216,8 @@
 							{/each}
 						</tr>
 					</Subscribe>
+				{:else}
+					<p class="items-center justify-center flex w-full p-10 italic">Nothing to show here.</p>
 				{/each}
 			</thead>
 
@@ -231,6 +240,7 @@
 			</tbody>
 		</table>
 	</div>
-
-	<TablePagination pageConfig={pluginStates.page} {pageSizes} />
+	{#if $data.length > 0}
+		<TablePagination pageConfig={pluginStates.page} {pageSizes} />
+	{/if}
 </div>

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

@@ -215,7 +215,7 @@
 				on:click|preventDefault={() => {
 					active = firstValue?.toString().length > 0 || secondValue?.toString().length > 0;
 					$filterValue = [firstOption, firstValue, secondOption, secondValue];
-				}}>Submit</button
+				}}>Apply</button
 			>
 		</div>
 	</div>

package/src/lib/components/file/FileUploader.svelte

@@ -1,184 +1,184 @@
-<script lang="ts">
-	import type { FileUploaderModel, FileInfo, Files } from '../../models/Models.js';
-
-	import DropZone from 'svelte-file-dropzone/Dropzone.svelte';
-	import Fa from 'svelte-fa/src/fa.svelte';
-
-	import Spinner from '../page/Spinner.svelte';
-	import { createEventDispatcher } from 'svelte';
-	import { faTrash } from '@fortawesome/free-solid-svg-icons';
-	import { faSave } from '@fortawesome/free-regular-svg-icons';
-	import { faFileUpload } from '@fortawesome/free-solid-svg-icons';
-
-	import { Api } from '../../services/Api.js';
-
-	export let id = 0;
-	export let version = 1;
-
-	import { onMount } from 'svelte';
-
-	// export let description="";
-	// export let status=0;
-
-	//action to load fileupload model
-	export let start = '';
-	//action to save selected file
-	export let submit = '';
-
-	export let context = '';
-
-	export let data: FileUploaderModel | undefined;
-
-	$: model = data;
-	$: submitBt = 'submit';
-
-	let maxSize = 0;
-
-	const dispatch = createEventDispatcher();
-
-	let fx: FileInfo[];
-
-	let files: Files = { accepted: [], rejected: [] };
-	$: files;
-
-	onMount(async () => {
-		console.log('fileupload - OnMount', data);
-
-		if (!data) {
-			load();
-		} else {
-			model = data;
-		}
-
-		if (model) {
-			submitBt += context;
-			maxSize = model.maxSize * 1024 * 1024;
-		}
-	});
-
-	// load modal from server
-	async function load() {
-		let url = start + '?id=' + id + '&version=' + version;
-
-		// load menu froms server
-		const res = await Api.get(url);
-		model = await res.data();
-
-		console.log('fileupload', model);
-	}
-
-	function handleFilesSelect(e: any) {
-		console.log('handleFilesSelect', e);
-		console.log('files', files);
-
-		const { acceptedFiles, fileRejections } = e.detail;
-
-		files.accepted = [...files.accepted, ...acceptedFiles];
-		files.rejected = [...files.rejected, ...fileRejections];
-
-		console.log('acceptedFiles', acceptedFiles);
-		console.log('files.accepted', files.accepted);
-
-		if (fileRejections.length > 0) {
-			//alert("the dropped file is not supported");
-			console.log('the dropped file is not supported.');
-			console.log(files.rejected);
-
-			let messages = [''];
-
-			for (let index = 0; index < fileRejections.length; index++) {
-				const element = fileRejections[index];
-				messages.push(getErrorMessage(element));
-			}
-
-			console.log(messages);
-
-			dispatch('error', { messages });
-			//list up the errors somewhere
-			files.rejected = [];
-		}
-
-		if (acceptedFiles.length > 0) {
-			document.getElementById(submitBt)?.click();
-		}
-	}
-
-	function getErrorMessage(rejected) {
-		let message = '';
-		message = rejected.file.path + ' : ';
-		let errors = rejected.errors;
-		for (let index = 0; index < errors.length; index++) {
-			const error = errors[index];
-			message += error.message;
-		}
-
-		return message;
-	}
-
-	async function handleSubmit() {
-		console.log('SUBMIT');
-
-		dispatch('submit');
-
-		let url = submit + '?id=' + id;
-
-		// console.log(model);
-		// console.log(url);
-		console.log('SUBMIT');
-
-		if (files.accepted.length > 0) {
-			console.log(files);
-
-			const formData = new FormData();
-			formData.append('files', '123');
-			// Looping over all files and add it to FormData object
-			for (var i = 0; i < files.accepted.length; i++) {
-				formData.append(files.accepted[i].name, files.accepted[i]);
-			}
-
-			const response = await Api.post(url, formData);
-
-			if (response.status == 200) {
-				dispatch('submited');
-
-				let message = files.accepted.length + ' is/are uploaded';
-				dispatch('success', { text: message });
-
-				files.accepted = [];
-			}
-		}
-	}
-</script>
-
-<form on:submit|preventDefault={handleSubmit}>
-	{#if model}
-		<!--if model exist  -->
-		<div>
-			<DropZone
-				on:drop={handleFilesSelect}
-				accept={model.accept}
-				multiple={model.multiple}
-				{maxSize}
-			>
-				<b style="font-size:xx-large"><Fa icon={faFileUpload} /></b>
-				<span
-					><b>Drag 'n' drop some files here, or click to select files</b>
-					<b>max file : {model.maxSize} mb</b></span
-				>
-				<p>
-					{#if model.accept}
-						{#each model.accept as ext}
-							{ext} ,
-						{/each}
-					{/if}
-				</p>
-			</DropZone>
-		</div>
-
-		<button id={submitBt} color="primary" style="display:none"><Fa icon={faSave} /></button>
-	{:else}
-		<!-- while data is not loaded show a loading information -->
-
-		<Spinner />
-	{/if}
-</form>
+<script lang="ts">
+	import type { FileUploaderModel, FileInfo, Files } from '../../models/Models.js';
+
+	import DropZone from 'svelte-file-dropzone/Dropzone.svelte';
+	import Fa from 'svelte-fa/src/fa.svelte';
+
+	import Spinner from '../page/Spinner.svelte';
+	import { createEventDispatcher } from 'svelte';
+	import { faTrash } from '@fortawesome/free-solid-svg-icons';
+	import { faSave } from '@fortawesome/free-regular-svg-icons';
+	import { faFileUpload } from '@fortawesome/free-solid-svg-icons';
+
+	import { Api } from '../../services/Api.js';
+
+	export let id = 0;
+	export let version = 1;
+
+	import { onMount } from 'svelte';
+
+	// export let description="";
+	// export let status=0;
+
+	//action to load fileupload model
+	export let start = '';
+	//action to save selected file
+	export let submit = '';
+
+	export let context = '';
+
+	export let data: FileUploaderModel | undefined;
+
+	$: model = data;
+	$: submitBt = 'submit';
+
+	let maxSize = 0;
+
+	const dispatch = createEventDispatcher();
+
+	let fx: FileInfo[];
+
+	let files: Files = { accepted: [], rejected: [] };
+	$: files;
+
+	onMount(async () => {
+		//console.log('fileupload - OnMount', data);
+
+		if (!data) {
+			load();
+		} else {
+			model = data;
+		}
+
+		if (model) {
+			submitBt += context;
+			maxSize = model.maxSize * 1024 * 1024;
+		}
+	});
+
+	// load modal from server
+	async function load() {
+		let url = start + '?id=' + id + '&version=' + version;
+
+		// load menu froms server
+		const res = await Api.get(url);
+		model = await res.data();
+
+		 console.log('fileupload', model);
+	}
+
+	function handleFilesSelect(e: any) {
+		//console.log('handleFilesSelect', e);
+		console.log('files', files);
+
+		const { acceptedFiles, fileRejections } = e.detail;
+
+		files.accepted = [...files.accepted, ...acceptedFiles];
+		files.rejected = [...files.rejected, ...fileRejections];
+
+		//console.log('acceptedFiles', acceptedFiles);
+		console.log('files.accepted', files.accepted);
+
+		if (fileRejections.length > 0) {
+			//alert("the dropped file is not supported");
+			//console.log('the dropped file is not supported.');
+			console.log(files.rejected);
+
+			let messages = [''];
+
+			for (let index = 0; index < fileRejections.length; index++) {
+				const element = fileRejections[index];
+				messages.push(getErrorMessage(element));
+			}
+
+			//console.log(messages);
+
+			dispatch('error', { messages });
+			//list up the errors somewhere
+			files.rejected = [];
+		}
+
+		if (acceptedFiles.length > 0) {
+			document.getElementById(submitBt)?.click();
+		}
+	}
+
+	function getErrorMessage(rejected) {
+		let message = '';
+		message = rejected.file.path + ' : ';
+		let errors = rejected.errors;
+		for (let index = 0; index < errors.length; index++) {
+			const error = errors[index];
+			message += error.message;
+		}
+
+		return message;
+	}
+
+	async function handleSubmit() {
+		//console.log('SUBMIT');
+
+		dispatch('submit');
+
+		let url = submit + '?id=' + id;
+
+		// //console.log(model);
+		// //console.log(url);
+		//console.log('SUBMIT');
+
+		if (files.accepted.length > 0) {
+			//console.log(files);
+
+			const formData = new FormData();
+			formData.append('files', '123');
+			// Looping over all files and add it to FormData object
+			for (var i = 0; i < files.accepted.length; i++) {
+				formData.append(files.accepted[i].name, files.accepted[i]);
+			}
+
+			const response = await Api.post(url, formData);
+
+			if (response.status == 200) {
+				dispatch('submited');
+
+				let message = files.accepted.length + ' is/are uploaded';
+				dispatch('success', { text: message });
+
+				files.accepted = [];
+			}
+		}
+	}
+</script>
+
+<form on:submit|preventDefault={handleSubmit}>
+	{#if model}
+		<!--if model exist  -->
+		<div>
+			<DropZone
+				on:drop={handleFilesSelect}
+				accept={model.accept}
+				multiple={model.multiple}
+				{maxSize}
+			>
+				<b style="font-size:xx-large"><Fa icon={faFileUpload} /></b>
+				<span
+					><b>Drag 'n' drop some files here, or click to select files</b>
+					<b>max file : {model.maxSize} mb</b></span
+				>
+				<p>
+					{#if model.accept}
+						{#each model.accept as ext}
+							{ext} ,
+						{/each}
+					{/if}
+				</p>
+			</DropZone>
+		</div>
+
+		<button id={submitBt} color="primary" style="display:none"><Fa icon={faSave} /></button>
+	{:else}
+		<!-- while data is not loaded show a loading information -->
+
+		<Spinner />
+	{/if}
+</form>

package/src/lib/components/form/DropdownKvP.svelte

@@ -9,7 +9,7 @@
 	export let invalid = false;
 	export let feedback = [''];
 	export let required = false;
-	export let targetIsComplex = false;
+	export let complexTarget = false;
 
 	$: selected = null;
 
@@ -18,7 +18,7 @@
 
 	function updatedSelectedValue(selection) {
 		if (selection != null) {
-			if(targetIsComplex)
+			if(complexTarget)
 			{
 				selected = selection.id;
 			}
@@ -30,7 +30,7 @@
 	}
 
 	function updatedTarget(id) {
-		if(targetIsComplex)
+		if(complexTarget)
 		{
 			target = source.find((opt) => opt.id === id);
 		}

package/src/lib/components/form/MultiSelect.svelte

@@ -8,10 +8,10 @@
 	export let target;
 	export let title;
 	export let itemId = 'value';
-	export let label = 'label';
+	export let itemLabel = 'label';
 	export let isMulti = true;
-	export let isComplex = false;
-	export let isTargetComplex = false;
+	export let complexSource = false;
+	export let complexTarget = false;
 	export let required = false;
 	export let feedback = [];
 
@@ -22,14 +22,14 @@
 
 	function updateTarget(selection) {
 		//diffrent cases
-		console.log('------');
-		console.log('isComplex',isComplex);
-		console.log('isTargetComplex',isTargetComplex);
-		console.log('selection',selection);
+		//console.log('------');
+		//console.log('isComplex',complexSource);
+		//console.log('complexTarget',complexTarget);
+		//console.log('selection',selection);
 
 		//a) source is complex model is simple
-		if (isComplex && !isTargetComplex && isLoaded) {
-			console.log('a) source is complex model is simple');
+		if (complexSource && !complexTarget && isLoaded) {
+			//console.log('a) source is complex model is simple');
 
 			target = [];
 			for (let i in selection) {
@@ -38,30 +38,30 @@
 			}
 		}
 
-		if (!isComplex && !isTargetComplex && isLoaded) {
+		if (!complexSource && !complexTarget && isLoaded) {
 			target = [];
 			for (let i in selection) {
 				target.push(selection[i].value);
 			}
 		}
 
-		if (isComplex && isTargetComplex && isLoaded)
+		if (complexSource && complexTarget && isLoaded)
 		{
-			 console.log("both complex",selection);
+			 //console.log("both complex",selection);
 			 target = selection;
 			
 		}
 
-		// console.log('selection ' + title, selection);
-		// console.log('target ' + title, target);
+		// //console.log('selection ' + title, selection);
+		// //console.log('target ' + title, target);
 	}
 
 	onMount(async () => {
-		//console.log("on mount multiselect");
-		//console.log(source);
+		////console.log("on mount multiselect");
+		////console.log(source);
 
 		//a) source is complex model is simple
-		if (isComplex && !isTargetComplex) {
+		if (complexSource && !complexTarget) {
 			let items = [];
 			// event.detail will be null unless isMulti is true and user has removed a single item
 			for (let i in target) {
@@ -73,19 +73,19 @@
 			if (items.length > 0) {
 				value = items;
 			}
-			//console.log(value);
+			////console.log(value);
 		}
 
-		if (isComplex && isTargetComplex)
+		if (complexSource && complexTarget)
 		{
 				value = target
 				isLoaded = true;
 		}
 
 		//b) simple liust and simple model
-		if (!isComplex && !isTargetComplex) {
-			//console.log("source", source);
-			//console.log("target",target);
+		if (!complexSource && !complexTarget) {
+			////console.log("source", source);
+			////console.log("target",target);
 			isLoaded = true;
 			//set target only if its nit empty
 			if (target != null && target !== undefined && target != '') {
@@ -100,7 +100,7 @@
 		class="select variant-form-material"
 		items={source}
 		{itemId}
-		{label}
+		label = {itemLabel}
 		multiple={isMulti}
 		bind:value
 		placeholder="-- Please select --"

package/src/lib/models/Models.ts

@@ -3,13 +3,11 @@ import type { ColumnFilterFn } from 'svelte-headless-table/lib/plugins';
 import type { Writable } from 'svelte/store';
 
 // page
-export interface Link
-{
-	label:string,
-	url:string
+export interface Link {
+	label: string;
+	url: string;
 }
 
-
 // Form
 export interface Input {
 	id: string;
@@ -18,7 +16,7 @@ export interface Input {
 	invalid: boolean;
 	valid: boolean;
 	required: boolean;
-	placeholder:string;
+	placeholder: string;
 }
 
 export interface FileInfo {
@@ -61,6 +59,7 @@ export interface ColumnInstructions {
 	toStringFn?: (value: any) => string;
 	toSortableValueFn?: (value: any) => string | number;
 	toFilterableValueFn?: (value: any) => string | number | Date;
+	renderComponent?: typeof SvelteComponent;
 }
 
 // Table column type
@@ -88,15 +87,14 @@ export interface TableConfig<T> {
 	optionsComponent?: typeof SvelteComponent;
 }
 
-
 // lists
 export interface KvP {
- id: number;
- text: string;
+	id: number;
+	text: string;
 }
 
 export interface ListItem {
- id: number;
- text: string;
- group: string;
-}
+	id: number;
+	text: string;
+	group: string;
+}