Skip to content

Fix manual sorting condition #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lovewave02 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix manual sorting condition #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/datagrid/core/processors/apply-sorting-fast-sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { findColumnById, flattenColumnStructureAndClearGroups } from "../utils.s
export function applySorting<TOriginalRow>(datagrid: DatagridCore<TOriginalRow>, data: TOriginalRow[]): TOriginalRow[] {
data = datagrid.lifecycleHooks.executePreSort(data);

const isManualSortingEnabled = datagrid.features.globalSearch.isManual;
const isManualSortingEnabled = datagrid.features.sorting.isManual;
const noSorting = datagrid.features.sorting.sortConfigs.length === 0;
if (isManualSortingEnabled || noSorting) return data;

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/datagrid/core/processors/apply-sorting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { findColumnById, flattenColumnStructureAndClearGroups } from "../utils.s
export function applySorting<TOriginalRow>(datagrid: DatagridCore<TOriginalRow>, data: TOriginalRow[]): TOriginalRow[] {
data = datagrid.lifecycleHooks.executePreSort(data);

const isManualSortingEnabled = datagrid.features.globalSearch.isManual || datagrid.features.sorting.isManual;
const isManualSortingEnabled = datagrid.features.sorting.isManual;
const noSorting = datagrid.features.sorting.sortConfigs.length === 0;
if (isManualSortingEnabled || noSorting) return data;

Expand Down
63 changes: 63 additions & 0 deletions packages/cli/tests/apply-sorting.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { describe, expect, it } from "vitest";

import { applySorting } from "../datagrid/core/processors/apply-sorting";
import type { DatagridCore } from "../datagrid/core/index.svelte";

type Row = {
value: number;
};

function createDatagrid({
globalSearchIsManual = false,
sortingIsManual = false,
}: {
globalSearchIsManual?: boolean;
sortingIsManual?: boolean;
} = {}): DatagridCore<Row> {
const column = {
type: "accessor",
columnId: "value",
isSortable: () => true,
getValueFn: (row: Row) => row.value,
};

return {
_columns: [column],
features: {
globalSearch: { isManual: globalSearchIsManual },
sorting: {
isManual: sortingIsManual,
sortConfigs: [{ columnId: "value", direction: "ascending" }],
},
},
lifecycleHooks: {
executePreSort: (rows: Row[]) => rows,
executePostSort: (rows: Row[]) => rows,
},
processors: {
data: {
metrics: {
measure: (_name: string, callback: () => void) => callback(),
},
},
},
} as unknown as DatagridCore<Row>;
}

describe("applySorting", () => {
it("sorts locally when only global search is manual", () => {
const rows = [{ value: 2 }, { value: 1 }];

expect(
applySorting(createDatagrid({ globalSearchIsManual: true }), rows),
).toEqual([{ value: 1 }, { value: 2 }]);
});

it("leaves rows unchanged when sorting itself is manual", () => {
const rows = [{ value: 2 }, { value: 1 }];

expect(
applySorting(createDatagrid({ sortingIsManual: true }), rows),
).toEqual(rows);
});
});
2 changes: 1 addition & 1 deletion sites/beta/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ export default defineConfig({
})
],
test: {
include: ['src/**/*.{test,spec}.{js,ts}']
include: ['src/**/*.{test,spec}.{js,ts}', '../../packages/cli/tests/**/*.{test,spec}.{js,ts}']
}
});
2 changes: 1 addition & 1 deletion sites/official/src/lib/datagrid/core/processors/apply-sorting-fast-sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { findColumnById, flattenColumnStructureAndClearGroups } from "../utils.s
export function applySorting<TOriginalRow>(datagrid: DatagridCore<TOriginalRow>, data: TOriginalRow[]): TOriginalRow[] {
data = datagrid.lifecycleHooks.executePreSort(data);

const isManualSortingEnabled = datagrid.features.globalSearch.isManual;
const isManualSortingEnabled = datagrid.features.sorting.isManual;
const noSorting = datagrid.features.sorting.sortConfigs.length === 0;
if (isManualSortingEnabled || noSorting) return data;

Expand Down
2 changes: 1 addition & 1 deletion sites/official/src/lib/datagrid/core/processors/apply-sorting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { findColumnById, flattenColumnStructureAndClearGroups } from "../utils.s
export function applySorting<TOriginalRow>(datagrid: DatagridCore<TOriginalRow>, data: TOriginalRow[]): TOriginalRow[] {
data = datagrid.lifecycleHooks.executePreSort(data);

const isManualSortingEnabled = datagrid.features.globalSearch.isManual || datagrid.features.sorting.isManual;
const isManualSortingEnabled = datagrid.features.sorting.isManual;
const noSorting = datagrid.features.sorting.sortConfigs.length === 0;
if (isManualSortingEnabled || noSorting) return data;

Expand Down