Skip to content

Commit 53b8d24

Browse files
committed
fix: wrong sort direction
Signed-off-by: Amit Amrutiya <amitamrutiya2210@gmail.com>
1 parent 4cf7f84 commit 53b8d24

7 files changed

Lines changed: 25 additions & 15 deletions

File tree

src/custom/CatalogDesignTable/CatalogDesignTable.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ interface CatalogDesignsTableProps {
2525
setPage: (page: number) => void;
2626
columnVisibility: Record<string, boolean>;
2727
colViews: ColView[];
28+
rowsPerPageOptions?: number[];
2829
handleBulkDeleteModal: (patterns: Pattern[], modalRef: React.RefObject<PromptRef>) => void;
2930
setSearch?: (search: string) => void;
3031
handleBulkpatternsDataUnpublishModal: (
@@ -49,6 +50,7 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
4950
colViews = [],
5051
handleBulkDeleteModal,
5152
setSearch,
53+
rowsPerPageOptions = [10, 25, 50, 100],
5254
handleBulkpatternsDataUnpublishModal
5355
}) => {
5456
const theme = useTheme();
@@ -195,7 +197,7 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
195197
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
196198
//@ts-ignore
197199
data={patterns || []}
198-
rowsPerPageOptions={[15, 30, 45, 60, 75]}
200+
rowsPerPageOptions={rowsPerPageOptions}
199201
options={options}
200202
colViews={colViews}
201203
tableCols={processedColumns}

src/custom/CatalogDesignTable/DesignTableColumnConfig.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const createDesignsColumnsConfig = ({
7272
},
7373
{
7474
name: 'name',
75-
label: 'Pattern Name',
75+
label: 'Name',
7676
options: {
7777
filter: false,
7878
sort: true,

src/custom/TeamTable/TeamTableConfiguration.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ export default function TeamTableConfiguration({
111111
['name', 'xs'],
112112
['description', 'm'],
113113
['owner', 'l'],
114-
['created_at', 'xl'],
114+
['created_at', 'na'],
115+
['updated_at', 'xl'],
115116
['deleted_at', 'na'],
116117
['actions', 'xs']
117118
];
@@ -165,6 +166,16 @@ export default function TeamTableConfiguration({
165166
sortDescFirst: true
166167
}
167168
},
169+
{
170+
name: 'updated_at',
171+
label: 'Updated At',
172+
options: {
173+
filter: false,
174+
sort: true,
175+
searchable: false,
176+
sortDescFirst: true
177+
}
178+
},
168179
{
169180
name: 'deleted_at',
170181
label: 'Deleted At',
@@ -290,10 +301,7 @@ export default function TeamTableConfiguration({
290301
backgroundColor: '#f3f1f1'
291302
}
292303
},
293-
sortOrder: {
294-
name: 'created_at',
295-
direction: 'desc'
296-
},
304+
297305
viewColumns: false,
298306
search: false,
299307
rowsExpanded: [ExpandedRowIdx],

src/custom/UsersTable/UsersTable.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const UsersTable: React.FC<UsersTableProps> = ({
7070
}) => {
7171
const [page, setPage] = useState<number>(0);
7272
const [pageSize, setPageSize] = useState<number>(10);
73-
const [sortOrder, setSortOrder] = useState<string>('');
73+
const [sortOrder, setSortOrder] = useState<string>('last_login_time desc');
7474
const [search, setSearch] = useState<string>('');
7575
const availableRoles: string[] = [];
7676
const { handleError, handleSuccess, handleInfo } = useNotificationHandlers();
@@ -176,8 +176,8 @@ const UsersTable: React.FC<UsersTableProps> = ({
176176
elevation: 0,
177177
serverSide: true,
178178
sortOrder: {
179-
name: 'last_login_time',
180-
direction: 'desc'
179+
name: sortOrder.split(' ')[0],
180+
direction: sortOrder.split(' ')[1]
181181
},
182182
onTableChange: (action: string, tableState: any) => {
183183
const sortInfo = tableState.announceText ? tableState.announceText.split(' : ') : [];

src/custom/Workspaces/DesignTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const DesignTable: React.FC<DesignTableProps> = ({
104104
const modalRef = useRef(null);
105105
const [page, setPage] = useState<number>(0);
106106
const [pageSize, setPageSize] = useState<number>(10);
107-
const [sortOrder, setSortOrder] = useState<string>('');
107+
const [sortOrder, setSortOrder] = useState<string>('updated_at desc');
108108
const [isSearchExpanded, setIsSearchExpanded] = useState(false);
109109

110110
const handlePublishModal = (pattern: Pattern): void => {

src/custom/Workspaces/EnvironmentTable.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
7070
const [isSearchExpanded, setIsSearchExpanded] = useState(false);
7171
const [page, setPage] = useState<number>(0);
7272
const [pageSize, setPageSize] = useState<number>(10);
73-
const [sortOrder, setSortOrder] = useState<string>('');
73+
const [sortOrder, setSortOrder] = useState<string>('updated_at desc');
7474
const { data: environmentsOfWorkspace } = useGetEnvironmentsOfWorkspaceQuery({
7575
workspaceId,
7676
page: page,
@@ -197,8 +197,8 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
197197
page,
198198
elevation: 0,
199199
sortOrder: {
200-
name: 'updated_at',
201-
direction: 'desc'
200+
name: sortOrder.split(' ')[0],
201+
direction: sortOrder.split(' ')[1]
202202
},
203203
serverSide: true,
204204
onTableChange: (action: string, tableState: any) => {

src/custom/Workspaces/WorkspaceTeamsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const TeamsTable: React.FC<TeamsTableProps> = ({
4949
}) => {
5050
const [page, setPage] = useState<number>(0);
5151
const [pageSize, setPageSize] = useState<number>(10);
52-
const [sortOrder, setSortOrder] = useState<string>('');
52+
const [sortOrder, setSortOrder] = useState<string>('updated_at desc');
5353
const [bulkSelect, setBulkSelect] = useState<boolean>(false);
5454
const [expanded, setExpanded] = useState<boolean>(true);
5555
const handleAccordionChange = () => {

0 commit comments

Comments
 (0)