Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/imodel-browser-react",
"comment": "Use server sorting for Stratakit table components",
"type": "patch"
}
],
"packageName": "@itwin/imodel-browser-react"
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,37 @@ export const IModelGridMUI = (props: IModelGridMUIProps) => (
export default {
title: "imodel-browser/IModelGridMUI",
component: IModelGridMUI,
argTypes: accessTokenArgTypes,
argTypes: {
...accessTokenArgTypes,
sortOptions: {
control: "radio",
options: [
"name asc",
"name desc",
"createdDateTime asc",
"createdDateTime desc",
],
mapping: {
"name asc": { sortType: "name", descending: false },
"name desc": { sortType: "name", descending: true },
"createdDateTime asc": {
sortType: "createdDateTime",
descending: false,
},
"createdDateTime desc": {
sortType: "createdDateTime",
descending: true,
},
},
},
searchText: {
description: "Search text",
control: "text",
},
},
args: {
sortOptions: "name asc",
},
excludeStories: ["IModelGridMUI"],
} as Meta;

Expand All @@ -48,7 +78,6 @@ const Template: Story<IModelGridMUIProps> = withITwinIdOverride(

const baseArgs: IModelGridMUIProps = {
apiOverrides: { serverEnvironmentPrefix: "qa" },
sortOptions: { sortType: "name", descending: false },
actions: [
{
key: "open",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,26 @@ export default {
component: ITwinGrid,
argTypes: {
accessToken,
orderbyOptions: {
control: "radio",
options: [
"displayName asc",
"displayName desc",
"number asc",
"number desc",
"createdDateTime asc",
"createdDateTime desc",
"lastModifiedDateTime asc",
"lastModifiedDateTime desc",
],
},
filterOptions: {
description: "Search text",
control: "text",
},
},
args: {
orderbyOptions: "displayName asc",
},
excludeStories: ["ITwinGrid"],
} as Meta;
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ export const ITwinTableMUI = ({
}
disableRowSelectionOnClick
disableMultipleRowSelection
disableColumnSorting
disableColumnSelector
disableColumnFilter
initialState={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
type IModelTileMUIProps,
IModelTileMUI,
} from "../iModelTiles/IModelTileMUI";
import { clientSideIModelSort } from "./clientSideIModelSort";
import { type IModelTableMUIStrings, IModelTableMUI } from "./IModelTableMUI";

/**
Expand Down Expand Up @@ -153,18 +152,11 @@ const IModelGridInternal = ({
const [sort, setSort] = React.useState<IModelSortOptions>(sortOptions);

React.useEffect(() => {
setSort(
viewMode === "cells"
? {
sortType: "name",
descending: false,
}
: {
sortType: sortOptions.sortType,
descending: sortOptions.descending,
}
);
}, [sortOptions.descending, sortOptions.sortType, viewMode]);
setSort({
sortType: sortOptions.sortType,
descending: sortOptions.descending,
});
}, [sortOptions.descending, sortOptions.sortType]);

const strings = React.useMemo(
() =>
Expand Down Expand Up @@ -251,19 +243,11 @@ const IModelGridInternal = ({
});

const iModels = React.useMemo(() => {
const processed =
return (
postProcessCallback?.([...fetchediModels], fetchStatus, searchText) ??
fetchediModels;
return clientSideIModelSort(processed, { viewMode, requestType, sort });
}, [
postProcessCallback,
fetchediModels,
fetchStatus,
searchText,
viewMode,
requestType,
sort,
]);
fetchediModels
);
}, [postProcessCallback, fetchediModels, fetchStatus, searchText]);

React.useEffect(() => {
if (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ export const IModelTableMUI = ({
}
disableRowSelectionOnClick
disableMultipleRowSelection
disableColumnSorting
disableColumnSelector
disableColumnFilter
initialState={{
Expand Down

This file was deleted.

Loading