Merge pull request #1012 from rust-lang/finish-rtk

Finish rewriting reducers in RTK

Author: shepmaster

ui/frontend/.eslintrc.js

@@ -71,10 +71,14 @@ module.exports = {
         'compileActions.ts',
         'editor/AceEditor.tsx',
         'editor/SimpleEditor.tsx',
+        'reducers/browser.ts',
         'reducers/client.ts',
+        'reducers/code.ts',
+        'reducers/configuration.ts',
         'reducers/crates.ts',
         'reducers/featureFlags.ts',
         'reducers/globalConfiguration.ts',
+        'reducers/notifications.ts',
         'reducers/output/assembly.ts',
         'reducers/output/clippy.ts',
         'reducers/output/execute.ts',
@@ -87,6 +91,9 @@ module.exports = {
         'reducers/output/mir.ts',
         'reducers/output/miri.ts',
         'reducers/output/wasm.ts',
+        'reducers/page.ts',
+        'reducers/position.ts',
+        'reducers/selection.ts',
         'reducers/versions.ts',
         'reducers/websocket.ts',
         'websocketActions.ts',

ui/frontend/.prettierignore

@@ -22,10 +22,14 @@ node_modules
 !compileActions.ts
 !editor/AceEditor.tsx
 !editor/SimpleEditor.tsx
+!reducers/browser.ts
 !reducers/client.ts
+!reducers/code.ts
+!reducers/configuration.ts
 !reducers/crates.ts
 !reducers/featureFlags.ts
 !reducers/globalConfiguration.ts
+!reducers/notifications.ts
 !reducers/output/assembly.ts
 !reducers/output/clippy.ts
 !reducers/output/execute.ts
@@ -38,6 +42,9 @@ node_modules
 !reducers/output/mir.ts
 !reducers/output/miri.ts
 !reducers/output/wasm.ts
+!reducers/page.ts
+!reducers/position.ts
+!reducers/selection.ts
 !reducers/versions.ts
 !reducers/websocket.ts
 !websocketActions.ts

ui/frontend/AdvancedOptionsMenu.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import * as actions from './actions';
+import * as config from './reducers/configuration';
 import { Either as EitherConfig, Select as SelectConfig } from './ConfigElement';
 import MenuGroup from './MenuGroup';
 import { State } from './reducers';
@@ -16,8 +16,8 @@ const AdvancedOptionsMenu: React.FC = () => {
 
   const dispatch = useDispatch();
 
-  const changeEdition = useCallback((e: Edition) => dispatch(actions.changeEdition(e)), [dispatch]);
-  const changeBacktrace = useCallback((b: Backtrace) => dispatch(actions.changeBacktrace(b)), [dispatch]);
+  const changeEdition = useCallback((e: Edition) => dispatch(config.changeEdition(e)), [dispatch]);
+  const changeBacktrace = useCallback((b: Backtrace) => dispatch(config.changeBacktrace(b)), [dispatch]);
 
   const channel  = useSelector((state: State) => state.configuration.channel);
   const switchText = (channel !== Channel.Nightly) ? ' (will select nightly Rust)' : '';

ui/frontend/ChannelMenu.tsx

@@ -4,7 +4,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import MenuGroup from './MenuGroup';
 import SelectOne from './SelectOne';
 
-import * as actions from './actions';
+import * as config from './reducers/configuration';
 import * as selectors from './selectors';
 import State from './state';
 import { Channel } from './types';
@@ -25,7 +25,7 @@ const ChannelMenu: React.FC<ChannelMenuProps> = props => {
 
   const dispatch = useDispatch();
   const changeChannel = useCallback((channel: Channel) => {
-    dispatch(actions.changeChannel(channel));
+    dispatch(config.changeChannel(channel));
     props.close();
   }, [dispatch, props]);
 

ui/frontend/ConfigMenu.tsx

@@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Either as EitherConfig, Select as SelectConfig } from './ConfigElement';
 import MenuGroup from './MenuGroup';
 
-import * as actions from './actions';
+import * as config from './reducers/configuration';
 import State from './state';
 import {
   AssemblyFlavor,
@@ -33,19 +33,19 @@ const ConfigMenu: React.FC = () => {
   const processAssembly = useSelector((state: State) => state.configuration.processAssembly);
 
   const dispatch = useDispatch();
-  const changeAceTheme = useCallback((t: string) => dispatch(actions.changeAceTheme(t)), [dispatch]);
-  const changeMonacoTheme = useCallback((t: string) => dispatch(actions.changeMonacoTheme(t)), [dispatch]);
-  const changeKeybinding = useCallback((k: string) => dispatch(actions.changeKeybinding(k)), [dispatch]);
-  const changeOrientation = useCallback((o: Orientation) => dispatch(actions.changeOrientation(o)), [dispatch]);
-  const changeEditorStyle = useCallback((e: Editor) => dispatch(actions.changeEditor(e)), [dispatch]);
+  const changeAceTheme = useCallback((t: string) => dispatch(config.changeAceTheme(t)), [dispatch]);
+  const changeMonacoTheme = useCallback((t: string) => dispatch(config.changeMonacoTheme(t)), [dispatch]);
+  const changeKeybinding = useCallback((k: string) => dispatch(config.changeKeybinding(k)), [dispatch]);
+  const changeOrientation = useCallback((o: Orientation) => dispatch(config.changeOrientation(o)), [dispatch]);
+  const changeEditorStyle = useCallback((e: Editor) => dispatch(config.changeEditor(e)), [dispatch]);
   const changeAssemblyFlavor =
-    useCallback((a: AssemblyFlavor) => dispatch(actions.changeAssemblyFlavor(a)), [dispatch]);
+    useCallback((a: AssemblyFlavor) => dispatch(config.changeAssemblyFlavor(a)), [dispatch]);
   const changePairCharacters =
-    useCallback((p: PairCharacters) => dispatch(actions.changePairCharacters(p)), [dispatch]);
+    useCallback((p: PairCharacters) => dispatch(config.changePairCharacters(p)), [dispatch]);
   const changeProcessAssembly =
-    useCallback((p: ProcessAssembly) => dispatch(actions.changeProcessAssembly(p)), [dispatch]);
+    useCallback((p: ProcessAssembly) => dispatch(config.changeProcessAssembly(p)), [dispatch]);
   const changeDemangleAssembly =
-    useCallback((d: DemangleAssembly) => dispatch(actions.changeDemangleAssembly(d)), [dispatch]);
+    useCallback((d: DemangleAssembly) => dispatch(config.changeDemangleAssembly(d)), [dispatch]);
 
   return (
     <Fragment>

ui/frontend/Header.tsx

@@ -20,6 +20,7 @@ import ToolsMenu from './ToolsMenu';
 import * as actions from './actions';
 import { useAppDispatch } from './configureStore';
 import { performGistSave } from './reducers/output/gist';
+import { navigateToHelp } from './reducers/page';
 import * as selectors from './selectors';
 
 import styles from './Header.module.css';
@@ -195,7 +196,7 @@ const ConfigMenuButton: React.FC<PortalProps> = ({ menuContainer }) => {
 };
 
 const HelpButton: React.FC = () => (
-  <IconLink title="View help" action={actions.navigateToHelp}>
+  <IconLink title="View help" action={navigateToHelp}>
     <HelpIcon />
   </IconLink>
 );

ui/frontend/Help.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
-import * as actions from './actions';
 import Example from './HelpExample';
 import Link from './uss-router/Link';
 
 import styles from './Help.module.css';
 
 import integer32Logo from './assets/integer32-logo.svg';
+import { navigateToIndex } from './reducers/page';
 
 const ACE_URL = 'https://github.com/ajaxorg/ace';
 const CLIPPY_URL = 'https://github.com/rust-lang/rust-clippy';
@@ -79,7 +79,7 @@ const Help: React.FC = () => {
   return (
     <section className={styles.container}>
       <h1>The Rust Playground</h1>
-      <Link action={actions.navigateToIndex}>Return to the playground</Link>
+      <Link action={navigateToIndex}>Return to the playground</Link>
 
       <LinkableSection id="about" header="About" level="h2">
         <p>

ui/frontend/ModeMenu.tsx

@@ -4,7 +4,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import MenuGroup from './MenuGroup';
 import SelectOne from './SelectOne';
 
-import * as actions from './actions';
+import * as config from './reducers/configuration';
 import State from './state';
 import { Mode } from './types';
 
@@ -16,7 +16,7 @@ const ModeMenu: React.FC<ModeMenuProps> = props => {
   const mode = useSelector((state: State) => state.configuration.mode);
   const dispatch = useDispatch();
   const changeMode = useCallback((mode: Mode) => {
-    dispatch(actions.changeMode(mode));
+    dispatch(config.changeMode(mode));
     props.close();
   }, [dispatch, props]
   );

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/Output/Execute.tsx

@@ -1,9 +1,9 @@
 import React, { useCallback } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import * as actions from '../actions';
 import * as selectors from '../selectors';
 import { State } from '../reducers';
+import * as code from '../reducers/code';
 
 import Section from './Section';
 import SimplePane from './SimplePane';
@@ -15,7 +15,7 @@ const Execute: React.FC = () => {
   const isAutoBuild = useSelector(selectors.isAutoBuildSelector);
 
   const dispatch = useDispatch();
-  const addMainFunction = useCallback(() => dispatch(actions.addMainFunction()), [dispatch]);
+  const addMainFunction = useCallback(() => dispatch(code.addMainFunction()), [dispatch]);
 
   return (
     <SimplePane {...details} kind="execute">