Skip to content

Commit 42ce27e

Browse files
fixed polling for expend
1 parent 749eb24 commit 42ce27e

File tree

17 files changed

+58
-31
lines changed

17 files changed

+58
-31
lines changed

src/ui/layouts/pipelines/PipelineDetail/Runs/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ import { RunsTable } from '../../RunsTable';
44
import { useService } from './useService';
55

66
export const Runs: React.FC<{
7+
isExpended?: any;
78
fromAllruns?: boolean;
89
pipelineId: TId;
910
filter: any;
1011
runId?: any;
1112
pagination?: boolean;
12-
}> = ({ pipelineId, filter, pagination, runId, fromAllruns }) => {
13+
}> = ({ pipelineId, filter, pagination, runId, fromAllruns, isExpended }) => {
1314
const [sortBy, setSortBy] = useState('created');
1415
function getSorted(activeSorting: any, activeSortingDirection: any) {
1516
setSortBy(activeSortingDirection?.toLowerCase() + ':' + activeSorting);
1617
// console.log(activeSorting, activeSortingDirection, 'aaaaaaa');
1718
}
1819
const { fetching, runIds, runsPaginated } = useService({
20+
isExpended,
1921
sortBy,
2022
pipelineId,
2123
filter,

src/ui/layouts/pipelines/PipelineDetail/Runs/useService.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ export const useService = ({
2121
sortBy,
2222
filter,
2323
pipelineId,
24+
isExpended,
2425
}: {
26+
isExpended?: any;
2527
filter: {
2628
column: filterValue;
2729
type: filterValue;
@@ -38,7 +40,7 @@ export const useService = ({
3840
console.log(runsPaginated, 'runsPaginated');
3941
useEffect(() => {}, [runs]);
4042
useEffect(() => {
41-
if (!isValidFilter) {
43+
if (!isValidFilter && !isExpended) {
4244
const intervalId = setInterval(() => {
4345
//assign interval to a variable to clear it.
4446

src/ui/layouts/pipelines/Pipelines/AllRuns/useService.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ interface filterValue {
3535
export const useService = ({
3636
filter,
3737
sortBy,
38+
isExpended,
3839
}: {
40+
isExpended?: any;
3941
sortBy: string;
4042
filter: {
4143
column: filterValue;
@@ -48,9 +50,9 @@ export const useService = ({
4850
const runs = useSelector(runSelectors.myRuns);
4951
const selectedProject = useSelector(projectSelectors.selectedProject);
5052
const runsPaginated = useSelector(runSelectors.myRunsPaginated);
51-
const isValidFilter = filter.map((f) => f.value).join('');
53+
const isValidFilter = filter?.map((f) => f.value).join('');
5254
useEffect(() => {
53-
if (!isValidFilter) {
55+
if (!isValidFilter && !isExpended) {
5456
const intervalId = setInterval(() => {
5557
//assign interval to a variable to clear it.
5658
dispatch(

src/ui/layouts/pipelines/Pipelines/List/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const List: React.FC<Props> = ({
4141
activeSortingDirection,
4242
setActiveSortingDirection,
4343
setSelectedRunIds,
44-
} = useService(filter);
44+
} = useService({ filter, isExpended });
4545
const expendedRow = filteredPipelines.filter((item) => item.id === id);
4646

4747
const headerCols = GetHeaderCols({

src/ui/layouts/pipelines/Pipelines/List/useService.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,17 @@ interface filterValue {
3535
type: string;
3636
value: string;
3737
}
38-
export const useService = (
38+
export const useService = ({
39+
filter,
40+
isExpended,
41+
}: {
42+
isExpended?: any;
3943
filter: {
4044
column: filterValue;
4145
type: filterValue;
4246
value: string;
43-
}[],
44-
): ServiceInterface => {
47+
}[];
48+
}): ServiceInterface => {
4549
const [activeSorting, setActiveSorting] = React.useState<Sorting | null>(
4650
'created',
4751
);
@@ -61,14 +65,14 @@ export const useService = (
6165
const pipelinesPaginated = useSelector(
6266
pipelineSelectors.myPipelinesPaginated,
6367
);
64-
const isValidFilter = filter.map((f) => f.value).join('');
68+
const isValidFilter = filter?.map((f) => f.value).join('');
6569
const { dispatchPipelineData } = callActionForPipelinesForPagination();
6670
useEffect(() => {
6771
setFilteredPipelines(pipelines as any[]);
6872
}, [filter, pipelines]);
6973

7074
useEffect(() => {
71-
if (!isValidFilter) {
75+
if (!isValidFilter && !isExpended) {
7276
const intervalId = setInterval(() => {
7377
const applySorting =
7478
activeSortingDirection?.toLowerCase() + ':' + activeSorting;

src/ui/layouts/pipelines/RunDetail/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const RunDetail: React.FC = () => {
120120
filter={[]}
121121
pagination={false}
122122
runId={runId}
123-
// isExpended
123+
isExpended
124124
pipelineId={pipelineId}
125125
></Runs>
126126
{/* <Box style={boxStyle}>

src/ui/layouts/runs/RunDetail/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ export const RunDetail: React.FC = () => {
9898
breadcrumbs={breadcrumbs}
9999
>
100100
<Runs
101+
isExpended
101102
filter={[]}
102103
pagination={false}
103104
runId={runId}

src/ui/layouts/stackComponents/RunDetail/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export const RunDetail: React.FC = () => {
102102
filter={[]}
103103
pagination={false}
104104
runId={runId}
105-
// isExpended
105+
isExpended
106106
stackComponentId={stackComponentId}
107107
></Runs>
108108
{/* <Box style={boxStyle}>

src/ui/layouts/stackComponents/StackDetail/Runs/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ import { useService } from './useService';
55
// import { Pagination } from '../../../common/Pagination';
66

77
export const Runs: React.FC<{
8+
isExpended?: any;
89
stackComponentId: TId;
910
filter?: any;
1011
runId?: any;
1112
pagination?: boolean;
12-
}> = ({ stackComponentId, filter, pagination, runId }) => {
13+
}> = ({ stackComponentId, filter, pagination, runId, isExpended }) => {
1314
const [sortBy, setSortBy] = useState('created');
1415
function getSorted(activeSorting: any, activeSortingDirection: any) {
1516
setSortBy(activeSortingDirection?.toLowerCase() + ':' + activeSorting);
1617
// console.log(activeSorting, activeSortingDirection, 'aaaaaaa');
1718
}
1819
const { fetching, runIds, runsPaginated } = useService({
20+
isExpended,
1921
stackComponentId,
2022
filter,
2123
sortBy,

src/ui/layouts/stackComponents/StackDetail/Runs/useService.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ export const useService = ({
2020
sortBy,
2121
filter,
2222
stackComponentId,
23+
isExpended,
2324
}: {
25+
isExpended?: any;
2426
filter: {
2527
column: filterValue;
2628
type: filterValue;
@@ -35,10 +37,10 @@ export const useService = ({
3537
runSelectors.runsForStackComponentId(stackComponentId),
3638
);
3739
const runsPaginated = useSelector(runSelectors.myRunsPaginated);
38-
const isValidFilter = filter.map((f) => f.value).join('');
40+
const isValidFilter = filter?.map((f) => f.value).join('');
3941
useEffect(() => {}, [runs]);
4042
useEffect(() => {
41-
if (!isValidFilter) {
43+
if (!isValidFilter && !isExpended) {
4244
const intervalId = setInterval(() => {
4345
//assign interval to a variable to clear it.
4446

0 commit comments

Comments
 (0)