@bexis2/bexis2-core-ui 0.4.3 → 0.4.5

package/README.md

@@ -1,4 +1,15 @@
 # bexis-core-ui
+## 0.4.5
+- table
+  - adds searching for missing values in the filters #744
+  - missing values for every data type
+  - display patterns for date/time/datetime types
+
+## 0.4.4
+- update libs
+  - remove eslint-plugin-svelte3
+  - update svelte, sveltekit, typescript, tailwind ...
+  
 ## 0.4.3
 - table
   - Enable searching on server-side

package/dist/components/Table/Table.svelte

@@ -1,8 +1,16 @@
 <script>import Table from "./TableContent.svelte";
 export let config;
+let fetched = false;
 const data = config.data;
+$:
+  if ($data.length > 0)
+    fetched = true;
 </script>
 
-{#key $data.length && true}
-	<Table {config} on:action />
+{#key fetched}
+	<Table
+		{config}
+		on:fetch={(columns) => (config = { ...config, columns: columns.detail })}
+		on:action
+	/>
 {/key}

package/dist/components/Table/TableContent.svelte

@@ -66,7 +66,7 @@ let {
   entityId = 0,
   // Entity ID to send with the request
   versionId = 0
-  // Version ID to send with the request
+  // Version ID to send with the request,
 } = config;
 let searchValue = "";
 let isFetching = false;
@@ -162,7 +162,8 @@ const tableColumns = [
                 updateTable,
                 pageIndex,
                 toFilterableValueFn,
-                filters
+                filters,
+                toStringFn
               }) : createRender(colFilterComponent ?? TableFilter, {
                 filterValue: filterValue2,
                 id,
@@ -270,9 +271,23 @@ const updateTable = async () => {
   }
   const response = await fetchData.json();
   if (response.columns !== void 0) {
-    columns = convertServerColumns(response.columns);
+    console.log(response);
+    columns = convertServerColumns(response.columns, columns);
+    const clientCols = response.columns.reduce((acc, col) => {
+      acc[col.key] = col.column;
+      return acc;
+    }, {});
+    const tmpArr = [];
+    response.data.forEach((row, index) => {
+      const tmp = {};
+      Object.keys(row).forEach((key) => {
+        tmp[clientCols[key]] = row[key];
+      });
+      tmpArr.push(tmp);
+    });
+    dispatch("fetch", columns);
+    $data = tmpArr;
   }
-  $data = response.data;
   $serverItems = response.count;
   return response;
 };
@@ -294,87 +309,90 @@ $:
 </script>
 
 <div class="grid gap-2 overflow-auto" class:w-fit={!fitToScreen} class:w-full={fitToScreen}>
-	<div class="table-container">
-		<!-- Enable the search filter if table is not empty -->
-		{#if $data.length > 0}
-			<form
-				class="flex gap-2"
-				on:submit|preventDefault={() => {
-					sendModel.q = searchValue;
-					$filterValue = searchValue;
-				}}
-			>
-				<div class="relative w-full flex items-center">
-					<input
-						class="input p-2 border border-primary-500"
-						type="text"
-						bind:value={searchValue}
-						placeholder="Search rows..."
-						id="{tableId}-search"
-					/><button
-						type="reset"
-						class="absolute right-3 items-center"
-						on:click|preventDefault={() => {
-							searchValue = '';
-							sendModel.q = '';
-							$filterValue = '';
-						}}><Fa icon={faXmark} /></button
-					>
-				</div>
-				<button
-					type="submit"
-					class="btn variant-filled-primary"
-					on:click|preventDefault={() => {
-						$filterValue = searchValue;
+	{#if $data.length > 0 || (columns && Object.keys(columns).length > 0)}
+		<div class="table-container">
+			<!-- Enable the search filter if table is not empty -->
+			{#if !serverSide}
+				<form
+					class="flex gap-2"
+					on:submit|preventDefault={() => {
 						sendModel.q = searchValue;
-					}}>Search</button
+						$filterValue = searchValue;
+					}}
 				>
-			</form>
-		{/if}
-		<div class="flex justify-between items-center py-2 w-full">
-			<div>
-				<!-- Enable the fitToScreen toggle if toggle === true -->
-				{#if toggle}
-					<SlideToggle
-						name="slider-label"
-						active="bg-primary-500"
-						size="sm"
-						checked={fitToScreen}
-						id="{tableId}-toggle"
-						on:change={() => (fitToScreen = !fitToScreen)}>Fit to screen</SlideToggle
-					>
-				{/if}
-			</div>
-			<div class="flex gap-2">
-				<!-- Enable the resetResize button if resizable !== 'none' -->
-				{#if resizable !== 'none'}
+					<div class="relative w-full flex items-center">
+						<input
+							class="input p-2 border border-primary-500"
+							type="text"
+							bind:value={searchValue}
+							placeholder="Search rows..."
+							id="{tableId}-search"
+						/><button
+							type="reset"
+							class="absolute right-3 items-center"
+							on:click|preventDefault={() => {
+								searchValue = '';
+								sendModel.q = '';
+								$filterValue = '';
+							}}><Fa icon={faXmark} /></button
+						>
+					</div>
 					<button
-						type="button"
-						class="btn btn-sm variant-filled-primary rounded-full order-last"
-						on:click|preventDefault={() =>
-							resetResize($headerRows, $pageRows, tableId, columns, resizable)}>Reset sizing</button
-					>
-				{/if}
-				{#if exportable}
-					<button
-						type="button"
-						class="btn btn-sm variant-filled-primary rounded-full order-last"
-						on:click|preventDefault={() => exportAsCsv(tableId, $exportedData)}
-						>Export as CSV</button
+						type="submit"
+						class="btn variant-filled-primary"
+						on:click|preventDefault={() => {
+							$filterValue = searchValue;
+							sendModel.q = searchValue;
+						}}>Search</button
 					>
-				{/if}
+				</form>
+			{/if}
+
+			<div class="flex justify-between items-center py-2 w-full">
+				<div>
+					<!-- Enable the fitToScreen toggle if toggle === true -->
+					{#if toggle}
+						<SlideToggle
+							name="slider-label"
+							active="bg-primary-500"
+							size="sm"
+							checked={fitToScreen}
+							id="{tableId}-toggle"
+							on:change={() => (fitToScreen = !fitToScreen)}>Fit to screen</SlideToggle
+						>
+					{/if}
+				</div>
+				<div class="flex gap-2">
+					<!-- Enable the resetResize button if resizable !== 'none' -->
+					{#if resizable !== 'none'}
+						<button
+							type="button"
+							class="btn btn-sm variant-filled-primary rounded-full order-last"
+							on:click|preventDefault={() =>
+								resetResize($headerRows, $pageRows, tableId, columns, resizable)}
+							>Reset sizing</button
+						>
+					{/if}
+					{#if exportable}
+						<button
+							type="button"
+							class="btn btn-sm variant-filled-primary rounded-full order-last"
+							on:click|preventDefault={() => exportAsCsv(tableId, $exportedData)}
+							>Export as CSV</button
+						>
+					{/if}
+				</div>
 			</div>
-		</div>
 
-		<div class="overflow-auto" style="height: {height}px">
-			<table
-				{...$tableAttrs}
-				class="table table-auto table-compact bg-tertiary-500/30 dark:bg-tertiary-900/10 overflow-clip"
-				id="{tableId}-table"
-			>
-				<!-- If table height is provided, making the top row sticky -->
-				<thead class=" {height != null ? `sticky top-0` : ''}">
-					{#if $data.length > 0}
+			<div class="overflow-auto" style="height: {height}px">
+				<table
+					{...$tableAttrs}
+					class="table table-auto table-compact bg-tertiary-500/30 dark:bg-tertiary-900/10 overflow-clip"
+					id="{tableId}-table"
+				>
+					<!-- If table height is provided, making the top row sticky -->
+					<thead class={height != null && $pageRows.length > 0 ? `sticky top-0` : ''}>
+						<!-- {#if $data.length > 0} -->
 						{#each $headerRows as headerRow (headerRow.id)}
 							<Subscribe
 								rowAttrs={headerRow.attrs()}
@@ -382,7 +400,7 @@ $:
 								rowProps={headerRow.props()}
 								let:rowProps
 							>
-								<tr {...rowAttrs} class="bg-primary-300 dark:bg-primary-500">
+								<tr {...rowAttrs} class="bg-primary-300 dark:bg-primary-800">
 									{#each headerRow.cells as cell (cell.id)}
 										<Subscribe attrs={cell.attrs()} props={cell.props()} let:props let:attrs>
 											<th scope="col" class="!p-2" {...attrs} style={cellStyle(cell.id, columns)}>
@@ -428,16 +446,9 @@ $:
 								</tr>
 							</Subscribe>
 						{/each}
-					{:else if isFetching}
-						<div class="p-10"><Spinner /></div>
-					{:else}
-						<!-- Table is empty -->
-						<p class="items-center justify-center flex w-full p-10 italic">Nothing to show here.</p>
-					{/if}
-				</thead>
+					</thead>
 
-				<tbody class="overflow-auto" {...$tableBodyAttrs}>
-					{#if $data.length > 0}
+					<tbody class="overflow-auto" {...$tableBodyAttrs}>
 						{#each $pageRows as row (row.id)}
 							<Subscribe rowAttrs={row.attrs()} let:rowAttrs>
 								<tr {...rowAttrs} id="{tableId}-row-{row.id}" class="">
@@ -465,13 +476,22 @@ $:
 								</tr>
 							</Subscribe>
 						{/each}
-					{/if}
-				</tbody>
-			</table>
+					</tbody>
+				</table>
+			</div>
 		</div>
-	</div>
-	{#if $data.length > 0}
-		<!-- Adding pagination, if table is not empty -->
+	{:else}
+		<div class="p-10 w-full h-full flex justify-center items-center bg-neutral-200 rounded">
+			<p>No data available</p>
+		</div>
+	{/if}
+
+	{#if isFetching}
+		<div class="p-10 w-full h-full flex justify-center items-center"><Spinner /></div>
+	{/if}
+
+	<!-- Adding pagination, if table is not empty -->
+	{#if $data.length > 0 || (columns && Object.keys(columns).length > 0)}
 		{#if serverSide}
 			<TablePaginationServer
 				{pageIndex}

package/dist/components/Table/TableContent.svelte.d.ts

@@ -6,6 +6,7 @@ declare const __propDef: {
     };
     events: {
         action: CustomEvent<any>;
+        fetch: CustomEvent<any>;
     } & {
         [evt: string]: CustomEvent<any>;
     };

package/dist/components/Table/TableFilter.svelte.d.ts

@@ -4,8 +4,8 @@ declare const __propDef: {
         values: any;
         id: any;
         tableId: any;
-        toFilterableValueFn?: ((value: any) => any) | undefined;
-        toStringFn?: ((value: any) => string) | undefined;
+        toFilterableValueFn?: undefined | ((value: any) => any);
+        toStringFn?: undefined | ((value: any) => string);
         filterValue: any;
         filters: any;
         pageIndex: any;

package/dist/components/Table/TableFilterServer.svelte

@@ -9,7 +9,21 @@ export let toFilterableValueFn = void 0;
 export let filters;
 export let updateTable;
 export let pageIndex;
+export let toStringFn = void 0;
 let active = false;
+let type = "string";
+let isDate = false;
+let dropdowns = [];
+$values.forEach((item) => {
+  if (item) {
+    type = typeof (toFilterableValueFn ? toFilterableValueFn(item) : item);
+    if (type === "object") {
+      if ((toFilterableValueFn ? toFilterableValueFn(item) : item) instanceof Date) {
+        isDate = true;
+      }
+    }
+  }
+});
 const options = {
   number: [
     {
@@ -83,35 +97,34 @@ const options = {
     {
       value: FilterOptionsEnum.b,
       label: "Is before"
-    },
-    {
-      value: FilterOptionsEnum.no,
-      label: "Is not on"
     }
+    // TODO: 'Not on' filter should be fixed on the server side
+    // {
+    // 	value: FilterOptionsEnum.no,
+    // 	label: 'Is not on'
+    // }
   ]
 };
-let dropdowns = [];
 const popupId = `${tableId}-${id}`;
 const popupFeatured = {
   event: "click",
   target: popupId,
   placement: "bottom-start"
 };
-let type = "string";
-let isDate = false;
-$values.forEach((item) => {
-  if (item) {
-    type = typeof (toFilterableValueFn ? toFilterableValueFn(item) : item);
-    if (type === "object") {
-      if (item instanceof Date) {
-        isDate = true;
-      }
-    }
-  }
-});
+const stringValues = $values.map((item) => toStringFn ? toStringFn(item) : item);
+const missingValues = stringValues.reduce((acc, item, index) => {
+  acc[typeof item === "string" ? item.toLowerCase() : item] = $values[index];
+  return acc;
+}, {});
+const getMissingValue = (value) => {
+  return Object.keys(missingValues).includes(value.toLowerCase()) ? missingValues[value.toLowerCase()] : value;
+};
 const optionChangeHandler = (e, index) => {
   delete $filters[id][dropdowns[index].option];
-  $filters[id] = { ...$filters[id], [e.target.value]: dropdowns[index].value };
+  $filters[id] = {
+    ...$filters[id],
+    [e.target.value]: getMissingValue(dropdowns[index].value)
+  };
   $filters = $filters;
   dropdowns[index] = {
     ...dropdowns[index],
@@ -121,11 +134,14 @@ const optionChangeHandler = (e, index) => {
 const valueChangeHandler = (e, index) => {
   dropdowns[index] = {
     ...dropdowns[index],
-    value: type === "number" ? +e.target.value : type === "date" ? new Date(e.target.value) : e.target.value
+    value: type === "date" ? new Date(e.target.value) : e.target.value
   };
   $filters = {
     ...$filters,
-    [id]: { ...$filters[id], [dropdowns[index].option]: dropdowns[index].value }
+    [id]: {
+      ...$filters[id],
+      [dropdowns[index].option]: type === "number" ? parseFloat(getMissingValue(e.target.value)) || void 0 : getMissingValue(e.target.value)
+    }
   };
 };
 const addFilter = (option, value) => {
@@ -165,6 +181,8 @@ $:
   );
 $:
   addFilter(options[type][0].value, void 0);
+$:
+  console.log($filters);
 </script>
 
 <form class="">
@@ -222,14 +240,14 @@ $:
 							{/if}
 						</div>
 
-						{#if type === 'number'}
+						<!-- {#if type === 'number'}
 							<input
 								type="number"
 								class="input p-1 border border-primary-500"
 								on:input={(e) => valueChangeHandler(e, index)}
 								bind:value={dropdown.value}
-							/>
-						{:else if type === 'string'}
+							/> -->
+						{#if type === 'number' || type === 'string'}
 							<input
 								type="text"
 								class="input p-1 border border-primary-500"

package/dist/components/Table/TableFilterServer.svelte.d.ts

@@ -4,10 +4,11 @@ declare const __propDef: {
         values: any;
         id: any;
         tableId: any;
-        toFilterableValueFn?: ((value: any) => any) | undefined;
+        toFilterableValueFn?: undefined | ((value: any) => any);
         filters: any;
         updateTable: any;
         pageIndex: any;
+        toStringFn?: undefined | ((value: any) => string);
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/Table/shared.d.ts

@@ -25,8 +25,7 @@ export declare const normalizeFilters: (filters: {
 }) => Filter[];
 export declare const exportAsCsv: (tableId: string, exportedData: string) => void;
 export declare const resetResize: (headerRows: any, pageRows: any, tableId: string, columns: Columns | undefined, resizable: 'none' | 'rows' | 'columns' | 'both') => void;
-export declare const missingValuesFn: (key: number, missingValues: {
-    [key: string]: string;
-    [key: number]: string;
-}) => string;
-export declare const convertServerColumns: (columns: ServerColumn[]) => Columns;
+export declare const missingValuesFn: (key: number | string, missingValues: {
+    [key: string | number]: string;
+}) => string | number;
+export declare const convertServerColumns: (serverColumns: ServerColumn[], columns: Columns | undefined) => Columns;

package/dist/components/Table/shared.js

@@ -89,29 +89,66 @@ export const resetResize = (headerRows, pageRows, tableId, columns, resizable) =
     }
 };
 export const missingValuesFn = (key, missingValues) => {
-    return key in missingValues ? missingValues[key] : key.toString();
+    const foundKey = typeof key === 'number' && key.toString().includes('e')
+        ? Object.keys(missingValues).find((item) => {
+            return item.toLowerCase() === key.toString().toLowerCase();
+        })
+        : typeof key === 'string' && parseInt(key).toString().length !== key.length && new Date(key)
+            ? Object.keys(missingValues).find((item) => new Date(item).getTime() === new Date(key).getTime())
+            : key in missingValues
+                ? key
+                : undefined;
+    return foundKey ? missingValues[foundKey] : key;
 };
-export const convertServerColumns = (columns) => {
+export const convertServerColumns = (serverColumns, columns) => {
     const columnsConfig = {};
-    columns.forEach((col) => {
+    serverColumns.forEach((col) => {
         let instructions = {};
         if (col.instructions?.displayPattern) {
+            let dp = col.instructions.displayPattern;
+            // Swap 'm' and 'M' to match the backend date format
+            for (let i = 0; i < col.instructions.displayPattern.length; i++) {
+                if (col.instructions.displayPattern[i] === 'm') {
+                    dp = `${dp.slice(0, i)}M${dp.slice(i + 1)}`;
+                }
+                else if (col.instructions.displayPattern[i] === 'M') {
+                    dp = `${dp.slice(0, i)}m${dp.slice(i + 1)}`;
+                }
+            }
             instructions = {
-                toStringFn: (date) => dateFormat(date, col.instructions?.displayPattern || ''),
-                toSortableValueFn: (date) => date.getTime(),
-                toFilterableValueFn: (date) => date
+                toStringFn: (date) => {
+                    if (col.instructions?.missingValues) {
+                        const missingValue = missingValuesFn(date, col.instructions?.missingValues || {});
+                        if (missingValue === date) {
+                            return dateFormat(new Date(date), dp);
+                        }
+                        return missingValue;
+                    }
+                    else {
+                        return dateFormat(new Date(date), dp);
+                    }
+                },
+                toSortableValueFn: (date) => new Date(date).getTime(),
+                toFilterableValueFn: (date) => new Date(date)
             };
         }
-        if (col.instructions?.missingValues) {
+        else if (col.instructions?.missingValues) {
             instructions = {
                 ...instructions,
                 toStringFn: (key) => missingValuesFn(key, col.instructions?.missingValues || {})
             };
         }
-        columnsConfig[col.column] = {
-            exclude: col.exclude,
-            instructions
-        };
+        if (columns && col.column in columns) {
+            columnsConfig[col.column] = {
+                ...columns[col.column],
+                instructions
+            };
+        }
+        else {
+            columnsConfig[col.column] = {
+                instructions
+            };
+        }
     });
     return columnsConfig;
 };

package/dist/models/Models.d.ts

@@ -131,6 +131,7 @@ export interface notificationStoreType {
 }
 export type ServerColumn = {
     column: string;
+    key: string;
     exclude?: boolean;
     instructions?: {
         missingValues?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bexis2/bexis2-core-ui",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "private": false,
   "scripts": {
     "dev": "vite dev",
@@ -20,33 +20,31 @@
     "3.npm - publish": "npm publish --access public"
   },
   "devDependencies": {
-    "@playwright/test": "^1.42.1",
+    "@playwright/test": "^1.43.0",
     "@skeletonlabs/skeleton": "^2.9.0",
     "@skeletonlabs/tw-plugin": "^0.3.1",
-    "@sveltejs/adapter-auto": "^3.1.1",
+    "@sveltejs/adapter-auto": "^3.2.0",
     "@sveltejs/adapter-static": "^3.0.1",
-    "@sveltejs/kit": "^2.5.3",
-    "@sveltejs/package": "^2.3.0",
     "@tailwindcss/forms": "^0.5.7",
-    "@tailwindcss/typography": "^0.5.10",
-    "@types/node": "^20.11.26",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "autoprefixer": "^10.4.18",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-svelte3": "^4.0.0",
-    "postcss": "^8.4.35",
+    "@tailwindcss/typography": "^0.5.12",
+    "@types/node": "^20.12.5",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
+    "autoprefixer": "^10.4.19",
+    "eslint": "^8.0.0",
+    "eslint-config-prettier": "^8.0.0",
+    "postcss": "^8.4.38",
     "prettier": "^3.2.5",
     "prettier-plugin-svelte": "^3.2.2",
     "raw-loader": "^4.0.2",
     "svelte": "^4.2.12",
-    "svelte-check": "^3.6.7",
-    "tailwindcss": "^3.4.1",
+    "svelte-check": "^3.6.9",
+    "@sveltejs/package": "^2.3.1",
+    "tailwindcss": "^3.4.3",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.2",
-    "vite": "^5.1.6",
-    "vitest": "^1.3.1"
+    "typescript": "^5.4.4",
+    "vite": "^5.2.8",
+    "vitest": "^1.4.0"
   },
   "type": "module",
   "module": "./src/lib/index.ts",
@@ -67,11 +65,11 @@
     "@codemirror/lint": "^6.5.0",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@floating-ui/dom": "^1.6.3",
-    "@fortawesome/fontawesome-free": "^6.5.1",
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-regular-svg-icons": "^6.5.1",
-    "@fortawesome/free-solid-svg-icons": "^6.5.1",
-    "axios": "^1.6.7",
+    "@fortawesome/fontawesome-free": "^6.5.2",
+    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/free-regular-svg-icons": "^6.5.2",
+    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "axios": "^1.6.8",
     "codemirror": "^6.0.1",
     "dateformat": "^5.0.3",
     "delay": "^6.0.0",
@@ -82,10 +80,11 @@
     "svelte": "^4.2.12",
     "svelte-codemirror-editor": "^1.3.0",
     "svelte-fa": "^4.0.2",
-    "svelte-file-dropzone": "^2.0.4",
+    "svelte-file-dropzone": "^2.0.7",
     "svelte-headless-table": "^0.18.2",
     "svelte-select": "5.8.3",
-    "vest": "^5.2.10"
+    "@sveltejs/kit": "^2.5.5",
+    "vest": "^5.2.12"
   },
   "author": "David Schöne",
   "license": "ISC",

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

@@ -3,9 +3,17 @@
 	import type { TableConfig } from '$models/Models';
 
 	export let config: TableConfig<any>;
+
+	let fetched = false;
 	const data = config.data;
+
+	$: if ($data.length > 0) fetched = true;
 </script>
 
-{#key $data.length && true}
-	<Table {config} on:action />
+{#key fetched}
+	<Table
+		{config}
+		on:fetch={(columns) => (config = { ...config, columns: columns.detail })}
+		on:action
+	/>
 {/key}

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

@@ -33,8 +33,8 @@
 		resetResize,
 		convertServerColumns
 	} from './shared';
-	import { Receive, Send } from '$lib/models/Models';
-	import type { TableConfig } from '$lib/models/Models';
+	import { Receive, Send } from '$models/Models';
+	import type { TableConfig } from '$models/Models';
 	import type { FilterOptionsEnum } from '$models/Enums';
 
 	export let config: TableConfig<any>;
@@ -58,7 +58,7 @@
 		token = '', // Bearer token to authenticate the request
 		sendModel = new Send(), // Model to send requests
 		entityId = 0, // Entity ID to send with the request
-		versionId = 0 // Version ID to send with the request
+		versionId = 0 // Version ID to send with the request,
 	} = config;
 
 	let searchValue = '';
@@ -188,7 +188,8 @@
 														updateTable,
 														pageIndex,
 														toFilterableValueFn,
-														filters
+														filters,
+														toStringFn
 												  })
 												: createRender(colFilterComponent ?? TableFilter, {
 														filterValue,
@@ -318,11 +319,28 @@
 
 		// Format server columns to the client columns
 		if (response.columns !== undefined) {
-			columns = convertServerColumns(response.columns);
+			console.log(response);
+
+			columns = convertServerColumns(response.columns, columns);
+
+			const clientCols = response.columns.reduce((acc, col) => {
+				acc[col.key] = col.column;
+				return acc;
+			}, {});
+
+			const tmpArr: any[] = [];
+
+			response.data.forEach((row, index) => {
+				const tmp: { [key: string]: any } = {};
+				Object.keys(row).forEach((key) => {
+					tmp[clientCols[key]] = row[key];
+				});
+				tmpArr.push(tmp);
+			});
+			dispatch('fetch', columns);
+			$data = tmpArr;
 		}
 
-		// Update data store
-		$data = response.data;
 		$serverItems = response.count;
 
 		return response;
@@ -348,87 +366,90 @@
 </script>
 
 <div class="grid gap-2 overflow-auto" class:w-fit={!fitToScreen} class:w-full={fitToScreen}>
-	<div class="table-container">
-		<!-- Enable the search filter if table is not empty -->
-		{#if $data.length > 0}
-			<form
-				class="flex gap-2"
-				on:submit|preventDefault={() => {
-					sendModel.q = searchValue;
-					$filterValue = searchValue;
-				}}
-			>
-				<div class="relative w-full flex items-center">
-					<input
-						class="input p-2 border border-primary-500"
-						type="text"
-						bind:value={searchValue}
-						placeholder="Search rows..."
-						id="{tableId}-search"
-					/><button
-						type="reset"
-						class="absolute right-3 items-center"
-						on:click|preventDefault={() => {
-							searchValue = '';
-							sendModel.q = '';
-							$filterValue = '';
-						}}><Fa icon={faXmark} /></button
-					>
-				</div>
-				<button
-					type="submit"
-					class="btn variant-filled-primary"
-					on:click|preventDefault={() => {
-						$filterValue = searchValue;
+	{#if $data.length > 0 || (columns && Object.keys(columns).length > 0)}
+		<div class="table-container">
+			<!-- Enable the search filter if table is not empty -->
+			{#if !serverSide}
+				<form
+					class="flex gap-2"
+					on:submit|preventDefault={() => {
 						sendModel.q = searchValue;
-					}}>Search</button
+						$filterValue = searchValue;
+					}}
 				>
-			</form>
-		{/if}
-		<div class="flex justify-between items-center py-2 w-full">
-			<div>
-				<!-- Enable the fitToScreen toggle if toggle === true -->
-				{#if toggle}
-					<SlideToggle
-						name="slider-label"
-						active="bg-primary-500"
-						size="sm"
-						checked={fitToScreen}
-						id="{tableId}-toggle"
-						on:change={() => (fitToScreen = !fitToScreen)}>Fit to screen</SlideToggle
-					>
-				{/if}
-			</div>
-			<div class="flex gap-2">
-				<!-- Enable the resetResize button if resizable !== 'none' -->
-				{#if resizable !== 'none'}
-					<button
-						type="button"
-						class="btn btn-sm variant-filled-primary rounded-full order-last"
-						on:click|preventDefault={() =>
-							resetResize($headerRows, $pageRows, tableId, columns, resizable)}>Reset sizing</button
-					>
-				{/if}
-				{#if exportable}
+					<div class="relative w-full flex items-center">
+						<input
+							class="input p-2 border border-primary-500"
+							type="text"
+							bind:value={searchValue}
+							placeholder="Search rows..."
+							id="{tableId}-search"
+						/><button
+							type="reset"
+							class="absolute right-3 items-center"
+							on:click|preventDefault={() => {
+								searchValue = '';
+								sendModel.q = '';
+								$filterValue = '';
+							}}><Fa icon={faXmark} /></button
+						>
+					</div>
 					<button
-						type="button"
-						class="btn btn-sm variant-filled-primary rounded-full order-last"
-						on:click|preventDefault={() => exportAsCsv(tableId, $exportedData)}
-						>Export as CSV</button
+						type="submit"
+						class="btn variant-filled-primary"
+						on:click|preventDefault={() => {
+							$filterValue = searchValue;
+							sendModel.q = searchValue;
+						}}>Search</button
 					>
-				{/if}
+				</form>
+			{/if}
+
+			<div class="flex justify-between items-center py-2 w-full">
+				<div>
+					<!-- Enable the fitToScreen toggle if toggle === true -->
+					{#if toggle}
+						<SlideToggle
+							name="slider-label"
+							active="bg-primary-500"
+							size="sm"
+							checked={fitToScreen}
+							id="{tableId}-toggle"
+							on:change={() => (fitToScreen = !fitToScreen)}>Fit to screen</SlideToggle
+						>
+					{/if}
+				</div>
+				<div class="flex gap-2">
+					<!-- Enable the resetResize button if resizable !== 'none' -->
+					{#if resizable !== 'none'}
+						<button
+							type="button"
+							class="btn btn-sm variant-filled-primary rounded-full order-last"
+							on:click|preventDefault={() =>
+								resetResize($headerRows, $pageRows, tableId, columns, resizable)}
+							>Reset sizing</button
+						>
+					{/if}
+					{#if exportable}
+						<button
+							type="button"
+							class="btn btn-sm variant-filled-primary rounded-full order-last"
+							on:click|preventDefault={() => exportAsCsv(tableId, $exportedData)}
+							>Export as CSV</button
+						>
+					{/if}
+				</div>
 			</div>
-		</div>
 
-		<div class="overflow-auto" style="height: {height}px">
-			<table
-				{...$tableAttrs}
-				class="table table-auto table-compact bg-tertiary-500/30 dark:bg-tertiary-900/10 overflow-clip"
-				id="{tableId}-table"
-			>
-				<!-- If table height is provided, making the top row sticky -->
-				<thead class=" {height != null ? `sticky top-0` : ''}">
-					{#if $data.length > 0}
+			<div class="overflow-auto" style="height: {height}px">
+				<table
+					{...$tableAttrs}
+					class="table table-auto table-compact bg-tertiary-500/30 dark:bg-tertiary-900/10 overflow-clip"
+					id="{tableId}-table"
+				>
+					<!-- If table height is provided, making the top row sticky -->
+					<thead class={height != null && $pageRows.length > 0 ? `sticky top-0` : ''}>
+						<!-- {#if $data.length > 0} -->
 						{#each $headerRows as headerRow (headerRow.id)}
 							<Subscribe
 								rowAttrs={headerRow.attrs()}
@@ -436,7 +457,7 @@
 								rowProps={headerRow.props()}
 								let:rowProps
 							>
-								<tr {...rowAttrs} class="bg-primary-300 dark:bg-primary-500">
+								<tr {...rowAttrs} class="bg-primary-300 dark:bg-primary-800">
 									{#each headerRow.cells as cell (cell.id)}
 										<Subscribe attrs={cell.attrs()} props={cell.props()} let:props let:attrs>
 											<th scope="col" class="!p-2" {...attrs} style={cellStyle(cell.id, columns)}>
@@ -482,16 +503,9 @@
 								</tr>
 							</Subscribe>
 						{/each}
-					{:else if isFetching}
-						<div class="p-10"><Spinner /></div>
-					{:else}
-						<!-- Table is empty -->
-						<p class="items-center justify-center flex w-full p-10 italic">Nothing to show here.</p>
-					{/if}
-				</thead>
+					</thead>
 
-				<tbody class="overflow-auto" {...$tableBodyAttrs}>
-					{#if $data.length > 0}
+					<tbody class="overflow-auto" {...$tableBodyAttrs}>
 						{#each $pageRows as row (row.id)}
 							<Subscribe rowAttrs={row.attrs()} let:rowAttrs>
 								<tr {...rowAttrs} id="{tableId}-row-{row.id}" class="">
@@ -519,13 +533,22 @@
 								</tr>
 							</Subscribe>
 						{/each}
-					{/if}
-				</tbody>
-			</table>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	{:else}
+		<div class="p-10 w-full h-full flex justify-center items-center bg-neutral-200 rounded">
+			<p>No data available</p>
 		</div>
-	</div>
-	{#if $data.length > 0}
-		<!-- Adding pagination, if table is not empty -->
+	{/if}
+
+	{#if isFetching}
+		<div class="p-10 w-full h-full flex justify-center items-center"><Spinner /></div>
+	{/if}
+
+	<!-- Adding pagination, if table is not empty -->
+	{#if $data.length > 0 || (columns && Object.keys(columns).length > 0)}
 		{#if serverSide}
 			<TablePaginationServer
 				{pageIndex}

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

@@ -13,9 +13,29 @@
 	export let filters;
 	export let updateTable;
 	export let pageIndex;
+	export let toStringFn: undefined | ((value: any) => string) = undefined;
 
 	// If the filter is applied and the displayed values are filtered
 	let active = false;
+	let type: string = 'string';
+	let isDate = false;
+	let dropdowns: {
+		option: FilterOptionsEnum;
+		value: string | number | Date | undefined;
+	}[] = [];
+
+	// Check the type of the column
+	$values.forEach((item) => {
+		if (item) {
+			type = typeof (toFilterableValueFn ? toFilterableValueFn(item) : item);
+
+			if (type === 'object') {
+				if ((toFilterableValueFn ? toFilterableValueFn(item) : item) instanceof Date) {
+					isDate = true;
+				}
+			}
+		}
+	});
 
 	// Options for different types of values
 	const options = {
@@ -92,18 +112,14 @@
 				value: FilterOptionsEnum.b,
 				label: 'Is before'
 			},
-			{
-				value: FilterOptionsEnum.no,
-				label: 'Is not on'
-			}
+			// TODO: 'Not on' filter should be fixed on the server side
+			// {
+			// 	value: FilterOptionsEnum.no,
+			// 	label: 'Is not on'
+			// }
 		]
 	};
 
-	let dropdowns: {
-		option: FilterOptionsEnum;
-		value: string | number | Date | undefined;
-	}[] = [];
-
 	// Unique ID for the column filter popup
 	const popupId = `${tableId}-${id}`;
 	// Popup config
@@ -113,24 +129,25 @@
 		placement: 'bottom-start'
 	};
 
-	let type: string = 'string';
-	let isDate = false;
-	// Check the type of the column
-	$values.forEach((item) => {
-		if (item) {
-			type = typeof (toFilterableValueFn ? toFilterableValueFn(item) : item);
+	const stringValues = $values.map((item) => (toStringFn ? toStringFn(item) : item));
 
-			if (type === 'object') {
-				if (item instanceof Date) {
-					isDate = true;
-				}
-			}
-		}
-	});
+	const missingValues = stringValues.reduce((acc, item, index) => {
+		acc[typeof item === 'string' ? item.toLowerCase() : item] = $values[index];
+		return acc;
+	}, {});
+
+	const getMissingValue = (value: string) => {
+		return Object.keys(missingValues).includes(value.toLowerCase())
+			? missingValues[value.toLowerCase()]
+			: value;
+	};
 
 	const optionChangeHandler = (e, index) => {
 		delete $filters[id][dropdowns[index].option];
-		$filters[id] = { ...$filters[id], [e.target.value]: dropdowns[index].value };
+		$filters[id] = {
+			...$filters[id],
+			[e.target.value]: getMissingValue(dropdowns[index].value as string)
+		};
 		$filters = $filters;
 
 		dropdowns[index] = {
@@ -142,17 +159,18 @@
 	const valueChangeHandler = (e, index) => {
 		dropdowns[index] = {
 			...dropdowns[index],
-			value:
-				type === 'number'
-					? +e.target.value
-					: type === 'date'
-					? new Date(e.target.value)
-					: e.target.value
+			value: type === 'date' ? new Date(e.target.value) : e.target.value
 		};
 
 		$filters = {
 			...$filters,
-			[id]: { ...$filters[id], [dropdowns[index].option]: dropdowns[index].value }
+			[id]: {
+				...$filters[id],
+				[dropdowns[index].option]:
+					type === 'number'
+						? parseFloat(getMissingValue(e.target.value)) || undefined
+						: getMissingValue(e.target.value)
+			}
 		};
 	};
 
@@ -201,6 +219,8 @@
 
 	// Start by adding the default filter
 	$: addFilter(options[type][0].value, undefined);
+
+	$: console.log($filters);
 </script>
 
 <form class="">
@@ -258,14 +278,14 @@
 							{/if}
 						</div>
 
-						{#if type === 'number'}
+						<!-- {#if type === 'number'}
 							<input
 								type="number"
 								class="input p-1 border border-primary-500"
 								on:input={(e) => valueChangeHandler(e, index)}
 								bind:value={dropdown.value}
-							/>
-						{:else if type === 'string'}
+							/> -->
+						{#if type === 'number' || type === 'string'}
 							<input
 								type="text"
 								class="input p-1 border border-primary-500"

package/src/lib/components/Table/shared.ts

@@ -107,35 +107,79 @@ export const resetResize = (
 	}
 };
 
-export const missingValuesFn = (key: number, missingValues: { [key: string | number]: string }) => {
-	return key in missingValues ? missingValues[key] : key.toString();
+export const missingValuesFn = (
+	key: number | string,
+	missingValues: { [key: string | number]: string }
+) => {
+	const foundKey =
+		typeof key === 'number' && key.toString().includes('e')
+			? Object.keys(missingValues).find((item) => {
+					return (item as string).toLowerCase() === key.toString().toLowerCase();
+			  })
+			: typeof key === 'string' && parseInt(key).toString().length !== key.length && new Date(key)
+			? Object.keys(missingValues).find(
+					(item) => new Date(item).getTime() === new Date(key).getTime()
+			  )
+			: key in missingValues
+			? key
+			: undefined;
+
+	return foundKey ? missingValues[foundKey] : key;
 };
 
-export const convertServerColumns = (columns: ServerColumn[]) => {
+export const convertServerColumns = (
+	serverColumns: ServerColumn[],
+	columns: Columns | undefined
+) => {
 	const columnsConfig: Columns = {};
 
-	columns.forEach((col) => {
+	serverColumns.forEach((col) => {
 		let instructions = {};
 
 		if (col.instructions?.displayPattern) {
+			let dp = col.instructions.displayPattern;
+
+			// Swap 'm' and 'M' to match the backend date format
+			for (let i = 0; i < col.instructions.displayPattern.length; i++) {
+				if (col.instructions.displayPattern[i] === 'm') {
+					dp = `${dp.slice(0, i)}M${dp.slice(i + 1)}`;
+				} else if (col.instructions.displayPattern[i] === 'M') {
+					dp = `${dp.slice(0, i)}m${dp.slice(i + 1)}`;
+				}
+			}
+
 			instructions = {
-				toStringFn: (date: Date) => dateFormat(date, col.instructions?.displayPattern || ''),
-				toSortableValueFn: (date: Date) => date.getTime(),
-				toFilterableValueFn: (date: Date) => date
+				toStringFn: (date: string) => {
+					if (col.instructions?.missingValues) {
+						const missingValue = missingValuesFn(date, col.instructions?.missingValues || {});
+						if (missingValue === date) {
+							return dateFormat(new Date(date), dp);
+						}
+						return missingValue;
+					} else {
+						return dateFormat(new Date(date), dp);
+					}
+				},
+				toSortableValueFn: (date: string) => new Date(date).getTime(),
+				toFilterableValueFn: (date: string) => new Date(date)
 			};
-		}
-
-		if (col.instructions?.missingValues) {
+		} else if (col.instructions?.missingValues) {
 			instructions = {
 				...instructions,
 				toStringFn: (key) => missingValuesFn(key, col.instructions?.missingValues || {})
 			};
 		}
 
-		columnsConfig[col.column] = {
-			exclude: col.exclude,
-			instructions
-		};
+		if (columns && col.column in columns) {
+			columnsConfig[col.column] = {
+				...columns[col.column],
+				instructions
+			};
+		} else {
+			columnsConfig[col.column] = {
+				instructions
+			};
+		}
 	});
 
 	return columnsConfig;

package/src/lib/models/Models.ts

@@ -167,7 +167,8 @@ export interface notificationStoreType {
 
 // Table column type for server-side table
 export type ServerColumn = {
-	column: string;
+	column: string; // column name on client side
+	key: string; // column name received from the server
 	exclude?: boolean; // false by default
 	instructions?: {
 		missingValues?: { [key: string | number]: string };