Skip to content

Commit 4f4977d

Browse files
authored
fix: Changing "Relative dates" option of saved filter does not enable save button (#2947)
1 parent 4214aee commit 4f4977d

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/components/BrowserFilter/BrowserFilter.react.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export default class BrowserFilter extends React.Component {
4141
originalFilterName: '',
4242
confirmDelete: false,
4343
originalFilters: new List(), // Track original filters when entering edit mode
44+
originalRelativeDates: false, // Track original relative dates setting when entering edit mode
4445
};
4546
this.toggle = this.toggle.bind(this);
4647
this.wrapRef = React.createRef();
@@ -223,6 +224,7 @@ export default class BrowserFilter extends React.Component {
223224
relativeDates: currentFilter.hasRelativeDates,
224225
filters: filtersToUse,
225226
originalFilters: originalFiltersToStore,
227+
originalRelativeDates: currentFilter.hasRelativeDates, // Track original relative dates setting
226228
};
227229
});
228230
}
@@ -284,6 +286,11 @@ export default class BrowserFilter extends React.Component {
284286
return false;
285287
}
286288

289+
// Check if relative dates setting has changed
290+
if (this.state.relativeDates !== this.state.originalRelativeDates) {
291+
return true;
292+
}
293+
287294
// Compare current state filters with the original filters stored when entering edit mode
288295
const currentFilters = this.normalizeFiltersForComparison(this.state.filters);
289296
const originalFilters = this.normalizeFiltersForComparison(this.state.originalFilters);
@@ -447,6 +454,7 @@ export default class BrowserFilter extends React.Component {
447454
editMode: this.props.filters.size === 0,
448455
relativeDates: false, // Reset relative dates state when opening/closing
449456
showMore: false, // Reset showMore state when opening/closing
457+
originalRelativeDates: false, // Reset original relative dates state when opening/closing
450458
}));
451459
this.props.setCurrent(null);
452460
}
@@ -564,6 +572,8 @@ export default class BrowserFilter extends React.Component {
564572
this.setState({
565573
originalFilterName: this.state.name,
566574
filters: uiFilters, // Ensure UI stays with JavaScript Date objects
575+
originalFilters: uiFilters, // Update original filters to reflect the saved state
576+
originalRelativeDates: this.state.relativeDates, // Update original relative dates to reflect the saved state
567577
});
568578
}
569579
}

0 commit comments

Comments
 (0)