[Glitch] Add ability for admins to force grouped notifications in web UI

Port c73868cd78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx

@@ -6,6 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
+import { forceGroupedNotifications } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'flavours/glitch/permissions';
 
 import ClearColumnButton from './clear_column_button';
@@ -78,15 +79,17 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
-        <section role='group' aria-labelledby='notifications-beta'>
-          <h3 id='notifications-beta'>
-            <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
-          </h3>
+        {!forceGroupedNotifications && (
+          <section role='group' aria-labelledby='notifications-beta'>
+            <h3 id='notifications-beta'>
+              <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
+            </h3>
 
-          <div className='column-settings__row'>
-            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
-          </div>
-        </section>
+            <div className='column-settings__row'>
+              <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
+            </div>
+          </section>
+        )}
 
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>

app/javascript/flavours/glitch/features/notifications_wrapper.jsx

@@ -1,9 +1,10 @@
 import Notifications from 'flavours/glitch/features/notifications';
 import Notifications_v2 from 'flavours/glitch/features/notifications_v2';
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { useAppSelector } from 'flavours/glitch/store';
 
 export const NotificationsWrapper = (props) => {
-  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+  const optedInGroupedNotifications = useAppSelector(selectUseGroupedNotifications);
 
   return (
     optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />

app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx

@@ -24,7 +24,8 @@ export const BoostModal: React.FC<{
   status: Status;
   onClose: () => void;
   onReblog: (status: Status, privacy: StatusVisibility) => void;
-}> = ({ status, onReblog, onClose }) => {
+  missingMediaDescription?: boolean;
+}> = ({ status, onReblog, onClose, missingMediaDescription }) => {
   const intl = useIntl();
 
   const defaultPrivacy = useAppSelector(
@@ -80,17 +81,24 @@ export const BoostModal: React.FC<{
               )}
             </h1>
             <div>
-              <FormattedMessage
-                id='boost_modal.combo'
-                defaultMessage='You can press {combo} to skip this next time'
-                values={{
-                  combo: (
-                    <span className='hotkey-combination'>
-                      <kbd>Shift</kbd>+<Icon id='retweet' icon={RepeatIcon} />
-                    </span>
-                  ),
-                }}
-              />
+              {missingMediaDescription ? (
+                <FormattedMessage
+                  id='boost_modal.missing_description'
+                  defaultMessage='This toot contains some media without description'
+                />
+              ) : (
+                <FormattedMessage
+                  id='boost_modal.combo'
+                  defaultMessage='You can press {combo} to skip this next time'
+                  values={{
+                    combo: (
+                      <span className='hotkey-combination'>
+                        <kbd>Shift</kbd>+<Icon id='retweet' icon={RepeatIcon} />
+                      </span>
+                    ),
+                  }}
+                />
+              )}
             </div>
           </div>
         </div>

app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx

@@ -36,6 +36,7 @@ import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
 import { canManageReports, canViewAdminDashboard } from 'flavours/glitch/permissions';
 import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 import ColumnLink from './column_link';
@@ -65,7 +66,7 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
-  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+  const optedInGroupedNotifications = useSelector(selectUseGroupedNotifications);
   const count = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0);
   const intl = useIntl();