Merge pull request #4348 from webkom/refactor-approute

webkom · Nov 30, 2023 · e30a75a · e30a75a
2 parents 9039346 + 6de69c2
commit e30a75a
Show file tree

Hide file tree

Showing 22 changed files with 503 additions and 673 deletions.
diff --git a/app/Root.tsx b/app/Root.tsx
@@ -12,20 +12,17 @@ type Props = {
   connectedHistory: History & { listenObject: boolean };
 };
 
-const Root = (props: Props) => {
-  const { store, connectedHistory, ...restProps } = props;
-  return (
-    <HelmetProvider>
-      <Provider store={store}>
-        <ThemeContextListener />
-        <ErrorBoundary openReportDialog>
-          <Router history={connectedHistory}>
-            <RouteConfig {...restProps} />
-          </Router>
-        </ErrorBoundary>
-      </Provider>
-    </HelmetProvider>
-  );
-};
+const Root = ({ store, connectedHistory }: Props) => (
+  <HelmetProvider>
+    <Provider store={store}>
+      <ThemeContextListener />
+      <ErrorBoundary openReportDialog>
+        <Router history={connectedHistory}>
+          <RouteConfig />
+        </Router>
+      </ErrorBoundary>
+    </Provider>
+  </HelmetProvider>
+);
 
 export default Root;
diff --git a/app/actions/FeedActions.ts b/app/actions/FeedActions.ts
@@ -2,9 +2,8 @@ import { feedActivitySchema } from 'app/reducers';
 import { feedIdByUserId } from 'app/reducers/feeds';
 import { Feed } from './ActionTypes';
 import callAPI from './callAPI';
-import type { Thunk } from 'app/types';
 
-export function fetchUserFeed(userId: string): Thunk<any> {
+export function fetchUserFeed(userId: string) {
   return callAPI({
     types: Feed.FETCH,
     endpoint: `/feed-user/${userId}/`,
@@ -14,7 +13,7 @@ export function fetchUserFeed(userId: string): Thunk<any> {
     },
   });
 }
-export function fetchPersonalFeed(): Thunk<any> {
+export function fetchPersonalFeed() {
   return callAPI({
     types: Feed.FETCH,
     endpoint: '/feed-personal/',
@@ -24,7 +23,7 @@ export function fetchPersonalFeed(): Thunk<any> {
     },
   });
 }
-export function fetchNotificationFeed(): Thunk<any> {
+export function fetchNotificationFeed() {
   return callAPI({
     types: Feed.FETCH,
     endpoint: '/feed-notifications/',

diff --git a/app/actions/GroupActions.ts b/app/actions/GroupActions.ts
@@ -2,21 +2,17 @@ import { push } from 'redux-first-history';
 import callAPI from 'app/actions/callAPI';
 import { groupSchema, membershipSchema } from 'app/reducers';
 import { Group, Membership } from './ActionTypes';
+import type { AppDispatch } from 'app/store/createStore';
 import type { ID } from 'app/store/models';
 import type MembershipType from 'app/store/models/Membership';
-import type { Thunk } from 'app/types';
 import type { RoleType } from 'app/utils/constants';
 
 export type AddMemberArgs = {
   groupId: ID;
   userId: ID;
   role: RoleType;
 };
-export function addMember({
-  groupId,
-  userId,
-  role,
-}: AddMemberArgs): Thunk<any> {
+export function addMember({ groupId, userId, role }: AddMemberArgs) {
   return callAPI({
     types: Membership.CREATE,
     endpoint: `/groups/${groupId}/memberships/`,
@@ -33,7 +29,7 @@ export function addMember({
     },
   });
 }
-export function removeMember(membership: MembershipType): Thunk<any> {
+export function removeMember(membership: MembershipType) {
   return callAPI({
     types: Membership.REMOVE,
     endpoint: `/groups/${membership.abakusGroup}/memberships/${membership.id}/`,
@@ -46,18 +42,18 @@ export function removeMember(membership: MembershipType): Thunk<any> {
     },
   });
 }
-export function fetchGroup(groupId: ID): Thunk<any> {
+export function fetchGroup(groupId: ID, { propagateError = true } = {}) {
   return callAPI({
     types: Group.FETCH,
     endpoint: `/groups/${groupId}/`,
     schema: groupSchema,
     meta: {
       errorMessage: 'Henting av gruppe feilet',
     },
-    propagateError: true,
+    propagateError,
   });
 }
-export function fetchAll(): Thunk<any> {
+export function fetchAll() {
   return callAPI({
     types: Group.FETCH,
     endpoint: '/groups/',
@@ -68,7 +64,7 @@ export function fetchAll(): Thunk<any> {
     propagateError: true,
   });
 }
-export function fetchAllWithType(type: string): Thunk<any> {
+export function fetchAllWithType(type: string) {
   return callAPI({
     types: Group.FETCH,
     endpoint: `/groups/?type=${type}`,
@@ -79,8 +75,8 @@ export function fetchAllWithType(type: string): Thunk<any> {
     propagateError: true,
   });
 }
-export function editGroup(group: Record<string, any>): Thunk<any> {
-  return (dispatch) =>
+export function editGroup(group: Record<string, any>) {
+  return (dispatch: AppDispatch) =>
     dispatch(
       callAPI({
         types: Group.UPDATE,
@@ -110,8 +106,8 @@ export function joinGroup(
   groupId: number,
   user: Record<string, any>,
   role = 'member'
-): Thunk<any> {
-  return (dispatch) =>
+) {
+  return (dispatch: AppDispatch) =>
     dispatch(
       callAPI({
         types: Membership.JOIN_GROUP,
@@ -134,11 +130,8 @@ export function joinGroup(
       return dispatch(fetchMemberships(groupId));
     });
 }
-export function leaveGroup(
-  membership: Record<string, any>,
-  groupId: number
-): Thunk<any> {
-  return (dispatch) => {
+export function leaveGroup(membership: Record<string, any>, groupId: number) {
+  return (dispatch: AppDispatch) => {
     return dispatch(
       callAPI({
         types: Membership.LEAVE_GROUP,
@@ -157,11 +150,8 @@ export function leaveGroup(
     });
   };
 }
-export function fetchAllMemberships(
-  groupId: number,
-  descendants = false
-): Thunk<any> {
-  return (dispatch) => {
+export function fetchAllMemberships(groupId: number, descendants = false) {
+  return (dispatch: AppDispatch) => {
     return dispatch(
       fetchMembershipsPagination({
         descendants,
@@ -178,7 +168,7 @@ export function fetchMemberships(
   groupId: number,
   descendants = false,
   query: Record<string, any> = {}
-): Thunk<any> {
+) {
   return fetchMembershipsPagination({
     groupId,
     descendants,
@@ -196,28 +186,24 @@ export function fetchMembershipsPagination({
   next: boolean;
   descendants: boolean;
   query?: Record<string, string | number | boolean>;
-}): Thunk<any> {
-  return (dispatch) => {
-    return dispatch(
-      callAPI({
-        types: Group.MEMBERSHIP_FETCH,
-        endpoint: `/groups/${groupId}/memberships/`,
-        schema: [membershipSchema],
-        pagination: {
-          fetchNext: next,
-        },
-        query: { ...query, descendants },
-        meta: {
-          groupId: groupId,
-          errorMessage: 'Henting av medlemmene for gruppen feilet',
-        },
-        propagateError: true,
-      })
-    );
-  };
+}) {
+  return callAPI({
+    types: Group.MEMBERSHIP_FETCH,
+    endpoint: `/groups/${groupId}/memberships/`,
+    schema: [membershipSchema],
+    pagination: {
+      fetchNext: next,
+    },
+    query: { ...query, descendants },
+    meta: {
+      groupId: groupId,
+      errorMessage: 'Henting av medlemmene for gruppen feilet',
+    },
+    propagateError: true,
+  });
 }
-export function createGroup(group: Record<string, any>): Thunk<any> {
-  return (dispatch) => {
+export function createGroup(group: Record<string, any>) {
+  return (dispatch: AppDispatch) => {
     const { name, description, text, logo, type, showBadge, active } = group;
     return dispatch(
       callAPI({
@@ -256,11 +242,8 @@ export function createGroup(group: Record<string, any>): Thunk<any> {
     });
   };
 }
-export function removeGroup(
-  id: string,
-  group: Record<string, any>
-): Thunk<any> {
-  return (dispatch) =>
+export function removeGroup(id: string, group: Record<string, any>) {
+  return (dispatch: AppDispatch) =>
     dispatch(
       callAPI({
         types: Group.REMOVE,

diff --git a/app/actions/SearchActions.ts b/app/actions/SearchActions.ts
@@ -1,13 +1,11 @@
+import { createAction } from '@reduxjs/toolkit';
 import callAPI from 'app/actions/callAPI';
 import { selectAutocomplete } from 'app/reducers/search';
 import { Search } from './ActionTypes';
-import type { Action, Thunk } from 'app/types';
+import type { Thunk } from 'app/types';
+
+export const toggleSearch = createAction(Search.TOGGLE_OPEN);
 
-export function toggleSearch(): Action {
-  return {
-    type: Search.TOGGLE_OPEN,
-  };
-}
 export function autocomplete(
   query: string,
   filter?: Array<string>

diff --git a/app/actions/UserActions.ts b/app/actions/UserActions.ts
@@ -521,3 +521,15 @@ export function resetPassword({
     },
   });
 }
+
+export function updateUserTheme(username: string, theme: 'light' | 'dark') {
+  return updateUser(
+    {
+      username,
+      selectedTheme: theme,
+    },
+    {
+      noRedirect: true,
+    }
+  );
+}