From 3d9e35375c6c60a4bb9dc6ba39b43ebda94ce9d7 Mon Sep 17 00:00:00 2001
From: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
Date: Wed, 3 May 2023 22:28:39 +0900
Subject: [PATCH] [Glitch] Rewrite actions/app.ts and
 reducers/missed_updates.ts with createAction

Port 0999cb46013ff3d78ae2a195d39d3e28ffd74d24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/app.js        | 6 ------
 app/javascript/flavours/glitch/actions/app.ts        | 7 +++++++
 app/javascript/flavours/glitch/features/ui/index.jsx | 2 +-
 app/javascript/flavours/glitch/reducers/meta.js      | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/actions/app.js
 create mode 100644 app/javascript/flavours/glitch/actions/app.ts

diff --git a/app/javascript/flavours/glitch/actions/app.js b/app/javascript/flavours/glitch/actions/app.js
deleted file mode 100644
index de2d93e29..000000000
--- a/app/javascript/flavours/glitch/actions/app.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const APP_LAYOUT_CHANGE = 'APP_LAYOUT_CHANGE';
-
-export const changeLayout = layout => ({
-  type: APP_LAYOUT_CHANGE,
-  layout,
-});
diff --git a/app/javascript/flavours/glitch/actions/app.ts b/app/javascript/flavours/glitch/actions/app.ts
new file mode 100644
index 000000000..1fc441609
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/app.ts
@@ -0,0 +1,7 @@
+import { createAction } from '@reduxjs/toolkit';
+
+type ChangeLayoutPayload = {
+  layout: 'mobile' | 'single-column' | 'multi-column';
+};
+export const changeLayout =
+  createAction<ChangeLayoutPayload>('APP_LAYOUT_CHANGE');
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index aee6743dc..cc7937e5e 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -378,7 +378,7 @@ class UI extends React.Component {
 
     if (layout !== this.props.layout) {
       this.handleLayoutChange.cancel();
-      this.props.dispatch(changeLayout(layout));
+      this.props.dispatch(changeLayout({ layout }));
     } else {
       this.handleLayoutChange();
     }
diff --git a/app/javascript/flavours/glitch/reducers/meta.js b/app/javascript/flavours/glitch/reducers/meta.js
index 7a38a9090..c38dc6096 100644
--- a/app/javascript/flavours/glitch/reducers/meta.js
+++ b/app/javascript/flavours/glitch/reducers/meta.js
@@ -1,5 +1,5 @@
 import { STORE_HYDRATE } from 'flavours/glitch/actions/store';
-import { APP_LAYOUT_CHANGE } from 'flavours/glitch/actions/app';
+import { changeLayout } from 'flavours/glitch/actions/app';
 import { Map as ImmutableMap } from 'immutable';
 import { layoutFromWindow } from 'flavours/glitch/is_mobile';
 
@@ -16,8 +16,8 @@ export default function meta(state = initialState, action) {
     return state.merge(action.state.get('meta'))
       .set('permissions', action.state.getIn(['role', 'permissions']))
       .set('layout', layoutFromWindow(action.state.getIn(['local_settings', 'layout'])));
-  case APP_LAYOUT_CHANGE:
-    return state.set('layout', action.layout);
+  case changeLayout.type:
+    return state.set('layout', action.payload.layout);
   default:
     return state;
   }