From 6c381f20b1d52c96525cbd5c41b0c972c3394a48 Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Sun, 24 Mar 2024 15:17:06 +0100 Subject: [PATCH] Restore advanced filter bar setting (#29737) --- .../notifications/components/column_settings.jsx | 11 +++++++++++ .../notifications/containers/filter_bar_container.js | 2 +- app/javascript/mastodon/locales/en.json | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx index caa1b757a4..fc737c0fe2 100644 --- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx +++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx @@ -54,6 +54,7 @@ export default class ColumnSettings extends PureComponent { render () { const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props; + const filterAdvancedStr = ; const unreadMarkersShowStr = ; const alertStr = ; const showStr = ; @@ -116,6 +117,16 @@ export default class ColumnSettings extends PureComponent { +
+

+ +

+ +
+ +
+
+

diff --git a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js index e448cd26ad..4e0184cef3 100644 --- a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js +++ b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js @@ -5,7 +5,7 @@ import FilterBar from '../components/filter_bar'; const makeMapStateToProps = state => ({ selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']), - advancedMode: false, + advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']), }); const mapDispatchToProps = (dispatch) => ({ diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index efda92d213..1134b393a7 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -484,6 +484,8 @@ "notifications.column_settings.admin.sign_up": "New sign-ups:", "notifications.column_settings.alert": "Desktop notifications", "notifications.column_settings.favourite": "Favorites:", + "notifications.column_settings.filter_bar.advanced": "Display all categories", + "notifications.column_settings.filter_bar.category": "Quick filter bar", "notifications.column_settings.follow": "New followers:", "notifications.column_settings.follow_request": "New follow requests:", "notifications.column_settings.mention": "Mentions:",