{filters.map(filter => {
if (filter.hidden) return null
return (
-
+
{getFilterTemplate(filter)}
)
})}
{actionButton &&
- !actionButton.hidden &&
- (actionButton.getCustomTemplate ? (
- actionButton.getCustomTemplate(actionButton)
- ) : (
-
- ))}
-
-
+ !actionButton.hidden &&
+ (actionButton.getCustomTemplate ? (
+ actionButton.getCustomTemplate(actionButton)
+ ) : (
+
+ ))}
+
+
{enableAutoRefresh && (
)}
applyChanges(filtersStore, true)}
- id='refresh'
+ id="refresh"
>
{!withoutExpandButton && filtersStore.groupBy !== GROUP_BY_NONE && (
handleExpandAll()}
>
diff --git a/src/components/Jobs/MonitorJobs/MonitorJobs.js b/src/components/Jobs/MonitorJobs/MonitorJobs.js
index 2274a3582..6103ebdda 100644
--- a/src/components/Jobs/MonitorJobs/MonitorJobs.js
+++ b/src/components/Jobs/MonitorJobs/MonitorJobs.js
@@ -184,7 +184,8 @@ const MonitorJobs = ({ fetchAllJobRuns, fetchJobs }) => {
labels: filtersStore.labels,
dates: {
value: dateFilter,
- isPredefined: false
+ isPredefined: false,
+ initialSelectedOptionId: filtersStore.dates.initialSelectedOptionId
}
}
}
diff --git a/src/elements/JobsTable/JobsTable.js b/src/elements/JobsTable/JobsTable.js
index 6d849b2b1..ce457f26b 100644
--- a/src/elements/JobsTable/JobsTable.js
+++ b/src/elements/JobsTable/JobsTable.js
@@ -57,6 +57,7 @@ import { useYaml } from '../../hooks/yaml.hook'
import { isRowRendered, useVirtualization } from '../../hooks/useVirtualization.hook'
import { enrichRunWithFunctionFields, handleAbortJob, handleDeleteJob } from '../../utils/jobs.util'
import { generatePageData } from './jobsTable.util'
+import { setFilters } from '../../reducers/filtersReducer'
import cssVariables from './jobsTable.scss'
@@ -255,7 +256,7 @@ const JobsTable = React.forwardRef(
Are you sure you want to abort the job "{job.name}"?
{isJobKindLocal(job) &&
- 'This is a local run. You can abort the run, though the actual process will continue.'}
+ 'This is a local run. You can abort the run, though the actual process will continue.'}
),
btnConfirmLabel: 'Abort',
@@ -508,7 +509,10 @@ const JobsTable = React.forwardRef(
actionsMenu={actionsMenu}
detailsMenu={pageData.details.menu}
getCloseDetailsLink={() => getCloseDetailsLink(location, params.jobName)}
- handleCancel={() => setSelectedJob({})}
+ handleCancel={() => {
+ setSelectedJob({})
+ dispatch(setFilters({ saveFilters: true }))
+ }}
handleRefresh={fetchRun}
isDetailsScreen
pageData={pageData}
diff --git a/src/reducers/filtersReducer.js b/src/reducers/filtersReducer.js
index da61388d5..7b17e8770 100644
--- a/src/reducers/filtersReducer.js
+++ b/src/reducers/filtersReducer.js
@@ -141,10 +141,8 @@ const filtersSlice = createSlice({
name: 'filtersStore',
initialState,
reducers: {
- removeFilters(state) {
- for (let filterProp in state) {
- state[filterProp] = initialState[filterProp]
- }
+ removeFilters() {
+ return initialState
},
resetModalFilter(state, action) {
delete state[FILTER_MENU_MODAL][action.payload]