Skip to content

Commit 7899e87

Browse files
committed
Fix server side order by does not work BEXIS2/Core#1893
1 parent bc6bdfa commit 7899e87

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/lib/components/Table/TableContent.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@
303303
const { hiddenColumnIds } = pluginStates.hideColumns;
304304
305305
const sortServer = (order: 'asc' | 'desc' | undefined, id: string) => {
306+
console.log('sortServer', order, id);
306307
if (!sendModel) throw new Error('Server-side configuration is missing');
307308
// Set parameter for sorting
308309
if (order === undefined) {
@@ -328,7 +329,8 @@
328329
data,
329330
serverItems,
330331
columns,
331-
dispatch
332+
dispatch,
333+
sendModel.order
332334
);
333335
isFetching = false;
334336

src/lib/components/Table/utils.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Writable } from 'svelte/store';
44

55
import { Send, Receive } from '$models/Models';
66
import type { FilterOptionsEnum } from '$models/Enums';
7-
import type { Columns, Filter, ServerColumn, ServerConfig } from '$models/Models';
7+
import type { Columns, Filter, OrderBy, ServerColumn, ServerConfig } from '$models/Models';
88

99
// Function to determine minWidth for a column to simplify the logic in the HTML
1010
export const minWidth = (id: string, columns: Columns | undefined) => {
@@ -185,7 +185,8 @@ export const updateTable = async (
185185
data: Writable<any[]>,
186186
serverItems: Writable<number> | undefined,
187187
columns: Columns | undefined,
188-
dispatch: any
188+
dispatch: any,
189+
order: OrderBy[] = [],
189190
) => {
190191
const { baseUrl, entityId, versionId, sendModel = new Send() } = server ?? {};
191192

@@ -196,6 +197,7 @@ export const updateTable = async (
196197
sendModel.version = versionId || -1;
197198
sendModel.id = entityId || -1;
198199
sendModel.filter = normalizeFilters(filters);
200+
sendModel.order = order;
199201

200202
let fetchData;
201203

@@ -240,7 +242,8 @@ export const updateTable = async (
240242
}
241243

242244
serverItems?.set(response.count);
243-
245+
console.log('Server data updated');
246+
console.log(response);
244247
return response;
245248
};
246249
// Function to convert server data to client data

0 commit comments

Comments
 (0)