[Glitch] Rewrite actions/modal and reducers/modal with typescript

Port 38c6216082 to glitch-soc

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

app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js

@@ -126,18 +126,24 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onMediaDescriptionConfirm(routerHistory, mediaId, overriddenVisibility = null) {
-    dispatch(openModal('CONFIRM', {
-      message: intl.formatMessage(messages.missingDescriptionMessage),
-      confirm: intl.formatMessage(messages.missingDescriptionConfirm),
-      onConfirm: () => {
-        if (overriddenVisibility) {
-          dispatch(changeComposeVisibility(overriddenVisibility));
-        }
-        dispatch(submitCompose(routerHistory));
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.missingDescriptionMessage),
+        confirm: intl.formatMessage(messages.missingDescriptionConfirm),
+        onConfirm: () => {
+          if (overriddenVisibility) {
+            dispatch(changeComposeVisibility(overriddenVisibility));
+          }
+          dispatch(submitCompose(routerHistory));
+        },
+        secondary: intl.formatMessage(messages.missingDescriptionEdit),
+        onSecondary: () => dispatch(openModal({
+          modalType: 'FOCAL_POINT',
+          modalProps: { id: mediaId },
+        })),
+        onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_missing_media_description'], false)),
       },
-      secondary: intl.formatMessage(messages.missingDescriptionEdit),
-      onSecondary: () => dispatch(openModal('FOCAL_POINT', { id: mediaId })),
-      onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_missing_media_description'], false)),
     }));
   },
 

app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js

@@ -7,7 +7,7 @@ import Dropdown from '../components/dropdown';
 
 const mapDispatchToProps = dispatch => ({
   isUserTouching,
-  onModalOpen: props => dispatch(openModal('ACTIONS', props)),
+  onModalOpen: props => dispatch(openModal({ modalType: 'ACTIONS', modalProps: props })),
   onModalClose: () => dispatch(closeModal()),
 });
 

app/javascript/flavours/glitch/features/compose/containers/header_container.js

@@ -24,14 +24,17 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   onSettingsClick (e) {
     e.preventDefault();
     e.stopPropagation();
-    dispatch(openModal('SETTINGS', {}));
+    dispatch(openModal({ modalType: 'SETTINGS', modalProps: {} }));
   },
   onLogout () {
-    dispatch(openModal('CONFIRM', {
-      message: intl.formatMessage(messages.logoutMessage),
-      confirm: intl.formatMessage(messages.logoutConfirm),
-      closeWhenConfirm: false,
-      onConfirm: () => logOut(),
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
     }));
   },
 });

app/javascript/flavours/glitch/features/compose/containers/navigation_container.js

@@ -21,11 +21,14 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onLogout () {
-    dispatch(openModal('CONFIRM', {
-      message: intl.formatMessage(messages.logoutMessage),
-      confirm: intl.formatMessage(messages.logoutConfirm),
-      closeWhenConfirm: false,
-      onConfirm: () => logOut(),
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
     }));
   },
 });

app/javascript/flavours/glitch/features/compose/containers/options_container.js

@@ -46,7 +46,10 @@ const mapDispatchToProps = (dispatch) => ({
   },
 
   onDoodleOpen() {
-    dispatch(openModal('DOODLE', { noEsc: true, noClose: true }));
+    dispatch(openModal({
+      modalType: 'DOODLE',
+      modalProps: { noEsc: true, noClose: true },
+    }));
   },
 });
 

app/javascript/flavours/glitch/features/compose/containers/privacy_dropdown_container.js

@@ -17,8 +17,14 @@ const mapDispatchToProps = dispatch => ({
   },
 
   isUserTouching,
-  onModalOpen: props => dispatch(openModal('ACTIONS', props)),
-  onModalClose: () => dispatch(closeModal()),
+  onModalOpen: props => dispatch(openModal({
+    modalType: 'ACTIONS',
+    modalProps: props,
+  })),
+  onModalClose: () => dispatch(closeModal({
+    modalType: undefined,
+    ignoreFocus: false,
+  })),
 
 });