Skip to content

Commit 72b2a24

Browse files
fixed sorting for stack components if only one row.
1 parent 5a3cf36 commit 72b2a24

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

src/ui/layouts/stackComponents/Stacks/List/ForSorting/SortingHeader.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@ import { Sorting, SortingDirection } from './types';
66
import styles from './index.module.scss';
77

88
export const SortingHeader: React.FC<{
9+
onlyOneRow?: boolean;
910
sortMethod: void;
1011
activeSorting: Sorting | null;
1112
activeSortingDirection: SortingDirection | null;
1213
sorting: Sorting;
1314
}> = ({
15+
onlyOneRow,
1416
children,
1517
sortMethod,
1618
activeSorting,
1719
activeSortingDirection,
1820
sorting,
1921
}) => {
20-
return (
22+
return onlyOneRow ? (
23+
<>{children}</>
24+
) : (
2125
<LinkBox className={styles.sortingBox} onClick={sortMethod}>
2226
<FlexBox alignItems="center">
2327
{children}

src/ui/layouts/stackComponents/Stacks/List/getHeaderCols.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,15 @@ import {
77
formatDateToSort,
88
formatDateToDisplayOnTable,
99
} from '../../../../../utils';
10-
import {
11-
Box,
12-
FlexBox,
13-
icons,
14-
Paragraph,
15-
} from '../../../../components';
10+
import { Box, FlexBox, icons, Paragraph } from '../../../../components';
1611
import { HeaderCol } from '../../../common/Table';
1712
import { SortingHeader } from './ForSorting/SortingHeader';
1813
import { Sorting, SortingDirection } from './ForSorting/types';
1914

2015
import { useService } from './ForSorting/useServiceForSorting';
2116

2217
export const GetHeaderCols = ({
18+
expendedRow,
2319
openStackIds,
2420
setOpenStackIds,
2521
filteredStacks,
@@ -29,6 +25,7 @@ export const GetHeaderCols = ({
2925
setActiveSortingDirection,
3026
setActiveSorting,
3127
}: {
28+
expendedRow?: any;
3229
openStackIds: TId[];
3330
setOpenStackIds: (ids: TId[]) => void;
3431
filteredStacks: TStack[];
@@ -46,6 +43,8 @@ export const GetHeaderCols = ({
4643
activeSortingDirection,
4744
filteredStacks,
4845
});
46+
47+
console.log(expendedRow, 'expendedRow');
4948
return [
5049
{
5150
width: '2%',
@@ -55,6 +54,7 @@ export const GetHeaderCols = ({
5554
{
5655
render: () => (
5756
<SortingHeader
57+
onlyOneRow={filteredStacks.length === 1 || expendedRow?.length === 1}
5858
sorting="id"
5959
sortMethod={sortMethod('id', {
6060
asc: (filteredStacks: TStack[]) =>
@@ -87,6 +87,7 @@ export const GetHeaderCols = ({
8787
{
8888
render: () => (
8989
<SortingHeader
90+
onlyOneRow={filteredStacks.length === 1 || expendedRow?.length === 1}
9091
sorting="name"
9192
sortMethod={sortMethod('name', {
9293
asc: (filteredStacks: TStack[]) =>
@@ -119,6 +120,7 @@ export const GetHeaderCols = ({
119120
{
120121
render: () => (
121122
<SortingHeader
123+
onlyOneRow={filteredStacks.length === 1 || expendedRow?.length === 1}
122124
sorting="flavor"
123125
sortMethod={sortMethod('flavor', {
124126
asc: (filteredStacks: TStack[]) =>
@@ -151,6 +153,7 @@ export const GetHeaderCols = ({
151153
{
152154
render: () => (
153155
<SortingHeader
156+
onlyOneRow={filteredStacks.length === 1 || expendedRow?.length === 1}
154157
sorting="is_shared"
155158
sortMethod={sortMethod('is_shared', {
156159
asc: (filteredStacks: TStack[]) =>
@@ -209,6 +212,7 @@ export const GetHeaderCols = ({
209212
{
210213
render: () => (
211214
<SortingHeader
215+
onlyOneRow={filteredStacks.length === 1 || expendedRow?.length === 1}
212216
sorting="user_id"
213217
sortMethod={sortMethod('user_id', {
214218
asc: (filteredStacks: TStack[]) =>
@@ -226,7 +230,6 @@ export const GetHeaderCols = ({
226230
),
227231
width: '15%',
228232
renderRow: (stackComponent: TStack) => {
229-
230233
return (
231234
<FlexBox alignItems="center">
232235
<div
@@ -267,6 +270,7 @@ export const GetHeaderCols = ({
267270
{
268271
render: () => (
269272
<SortingHeader
273+
onlyOneRow={filteredStacks.length === 1 || expendedRow?.length === 1}
270274
sorting="created"
271275
sortMethod={sortMethod('created', {
272276
asc: (filteredStacks: TStack[]) =>

src/ui/layouts/stackComponents/Stacks/List/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ Props) => {
5151
setSelectedRunIds,
5252
} = useService(filter);
5353

54+
const expendedRow = filteredStacks.filter((item) => item.id === id);
5455
const headerCols = GetHeaderCols({
56+
expendedRow,
5557
openStackIds,
5658
setOpenStackIds,
5759
filteredStacks,
@@ -83,8 +85,6 @@ Props) => {
8385
}
8486
};
8587

86-
const expendedRow = filteredStacks.filter((item) => item.id === id);
87-
8888
return (
8989
<>
9090
<CollapseTable

0 commit comments

Comments
 (0)