Skip to content

Commit 3a973a9

Browse files
committed
fis show active resert time
1 parent 8f09eac commit 3a973a9

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

src/Routes/Base/Header/TagsFiltersViews.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ const TagsFiltersViews = ({ sectionName }) => {
5454
// },[])
5555

5656
useEffect(() => {
57+
// write query string params
5758
const paramsToUrl = { ...instanceFilters[sectionName] };
59+
5860
if (sectionName === 'jobs') {
5961
delete paramsToUrl.datesRange;
62+
isPinActiveJobs && delete paramsToUrl.pipelineStatus;
6063
}
6164

6265
const _qParams = qs.stringify(paramsToUrl, {

src/Routes/Tables/Jobs/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const JobsTable = () => {
3333
mergedParams,
3434
dataSourceGraph,
3535
debouncedZoomChanged,
36-
isGraphLoad,
36+
3737
isTableLoad,
3838
onRow,
3939
columns,
@@ -61,7 +61,7 @@ const JobsTable = () => {
6161

6262
<WTable
6363
id="jobsTable"
64-
loading={isTableLoad || isGraphLoad}
64+
loading={isTableLoad}
6565
onRow={onRow}
6666
rowKey={rowKey}
6767
expandIcon={false}

src/Routes/Tables/Jobs/useJobsFunctionsLimit.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ const useJobsFunctionsLimit = () => {
6060
pipelineName: iJobs?.pipelineName || undefined,
6161
pipelineStatus: iJobs?.pipelineStatus || undefined,
6262
datesRange: {
63-
from: isPinActiveJob ? null : iJobs?.datesRange?.from || null,
64-
to: isPinActiveJob ? null : iJobs?.datesRange?.to || null,
63+
from: iJobs?.datesRange?.from || null,
64+
to: iJobs?.datesRange?.to || null,
6565
},
6666
};
6767

@@ -97,8 +97,15 @@ const useJobsFunctionsLimit = () => {
9797

9898
...(mergedParams?.datesRange?.from === null && {
9999
datesRange: {
100-
from: isPinActiveJob ? null : defDate,
101-
to: isPinActiveJob ? null : mergedParams?.datesRange?.to || null,
100+
from: defDate,
101+
to: mergedParams?.datesRange?.to || null,
102+
},
103+
}),
104+
105+
...(isPinActiveJob && {
106+
datesRange: {
107+
from: null,
108+
to: null,
102109
},
103110
}),
104111
},

0 commit comments

Comments
 (0)