Rewrite notifications reducer in RTK

Author: shepmaster

ui/frontend/.eslintrc.js

@@ -77,6 +77,7 @@ module.exports = {
         'reducers/crates.ts',
         'reducers/featureFlags.ts',
         'reducers/globalConfiguration.ts',
+        'reducers/notifications.ts',
         'reducers/output/assembly.ts',
         'reducers/output/clippy.ts',
         'reducers/output/execute.ts',

ui/frontend/.prettierignore

@@ -28,6 +28,7 @@ node_modules
 !reducers/crates.ts
 !reducers/featureFlags.ts
 !reducers/globalConfiguration.ts
+!reducers/notifications.ts
 !reducers/output/assembly.ts
 !reducers/output/clippy.ts
 !reducers/output/execute.ts

ui/frontend/Notifications.tsx

@@ -4,8 +4,8 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { Close } from './Icon';
 
-import * as actions from './actions';
 import * as selectors from './selectors';
+import { seenRustSurvey2022 } from './reducers/notifications';
 
 import styles from './Notifications.module.css';
 
@@ -25,7 +25,7 @@ const RustSurvey2022Notification: React.FC = () => {
   const showRustSurvey2022 = useSelector(selectors.showRustSurvey2022Selector);
 
   const dispatch = useDispatch();
-  const seenRustSurvey2021 = useCallback(() => dispatch(actions.seenRustSurvey2022()), [dispatch]);
+  const seenRustSurvey2021 = useCallback(() => dispatch(seenRustSurvey2022()), [dispatch]);
 
   return showRustSurvey2022 ? (
     <Notification onClose={seenRustSurvey2021}>

ui/frontend/actions.ts

@@ -14,7 +14,6 @@ import {
   Edition,
   Editor,
   Mode,
-  Notification,
   Orientation,
   PairCharacters,
   PrimaryAction,
@@ -58,7 +57,6 @@ export enum ActionType {
   ChangeEdition = 'CHANGE_EDITION',
   ChangeBacktrace = 'CHANGE_BACKTRACE',
   SelectText = 'SELECT_TEXT',
-  NotificationSeen = 'NOTIFICATION_SEEN',
 }
 
 export const initializeApplication = () => createAction(ActionType.InitializeApplication);
@@ -194,11 +192,6 @@ export const performCompileToWasm =
 export const selectText = (start: Position, end: Position) =>
   createAction(ActionType.SelectText, { start, end });
 
-const notificationSeen = (notification: Notification) =>
-  createAction(ActionType.NotificationSeen, { notification });
-
-export const seenRustSurvey2022 = () => notificationSeen(Notification.RustSurvey2022);
-
 function parseChannel(s?: string): Channel | null {
   switch (s) {
     case 'stable':
@@ -301,7 +294,6 @@ export type Action =
   | ReturnType<typeof changeAceTheme>
   | ReturnType<typeof changeMonacoTheme>
   | ReturnType<typeof selectText>
-  | ReturnType<typeof notificationSeen>
   | ReturnType<typeof editCode>
   | ReturnType<typeof addCrateType>
   | ReturnType<typeof navigateToIndex>

ui/frontend/reducers/notifications.ts

@@ -1,4 +1,5 @@
-import { Action, ActionType } from '../actions';
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+
 import { Notification } from '../types';
 
 interface State {
@@ -11,7 +12,7 @@ interface State {
   seenRustSurvey2022: boolean;
 }
 
-const DEFAULT: State = {
+const initialState: State = {
   seenRustSurvey2018: true,
   seenRust2018IsDefault: true,
   seenRustSurvey2020: true,
@@ -21,16 +22,22 @@ const DEFAULT: State = {
   seenRustSurvey2022: false,
 };
 
-export default function notifications(state = DEFAULT, action: Action): State {
-  switch (action.type) {
-    case ActionType.NotificationSeen: {
-      switch (action.notification) {
+const slice = createSlice({
+  name: 'notifications',
+  initialState,
+  reducers: {
+    notificationSeen: (state, action: PayloadAction<Notification>) => {
+      switch (action.payload) {
         case Notification.RustSurvey2022: {
-          return { ...state, seenRustSurvey2022: true };
+          state.seenRustSurvey2022 = true;
         }
       }
-    }
-    default:
-      return state;
-  }
-}
+    },
+  },
+});
+
+const { notificationSeen } = slice.actions;
+
+export const seenRustSurvey2022 = () => notificationSeen(Notification.RustSurvey2022);
+
+export default slice.reducer;