First batch of ramda removals

This commit is contained in:
Alejandro Celaya
2023-11-01 10:03:09 +01:00
parent 98b2db99b3
commit 8699eaca32
8 changed files with 39 additions and 34 deletions

View File

@@ -1,6 +1,5 @@
import type { PayloadAction } from '@reduxjs/toolkit';
import { createSlice } from '@reduxjs/toolkit';
import { assoc, dissoc, fromPairs, map, pipe, reduce, toPairs } from 'ramda';
import { v4 as uuid } from 'uuid';
import type { ServerData, ServersMap, ServerWithId } from '../data';
@@ -17,14 +16,17 @@ interface SetAutoConnect {
const initialState: ServersMap = {};
const serverWithId = (server: ServerWithId | ServerData): ServerWithId => {
if ((server as ServerWithId).id) {
return server as ServerWithId;
if ('id' in server) {
return server;
}
return assoc('id', uuid(), server);
return { ...server, id: uuid() };
};
const serversListToMap = reduce<ServerWithId, ServersMap>((acc, server) => assoc(server.id, server, acc), {});
const serversListToMap = (servers: ServerWithId[]): ServersMap => servers.reduce<ServersMap>(
(acc, server) => ({ ...acc, [server.id]: server }),
{},
);
export const { actions, reducer } = createSlice({
name: 'shlink/servers',
@@ -37,11 +39,14 @@ export const { actions, reducer } = createSlice({
reducer: (state, { payload }: PayloadAction<EditServer>) => {
const { serverId, serverData } = payload;
return (
!state[serverId] ? state : assoc(serverId, { ...state[serverId], ...serverData }, state)
!state[serverId] ? state : { ...state, [serverId]: { ...state[serverId], ...serverData } }
);
},
},
deleteServer: (state, { payload }) => dissoc(payload.id, state),
deleteServer: (state, { payload }) => {
const { [payload.id]: deletedServer, ...rest } = state;
return rest;
},
setAutoConnect: {
prepare: ({ id: serverId }: ServerWithId, autoConnect: boolean) => ({
payload: { serverId, autoConnect },
@@ -53,11 +58,11 @@ export const { actions, reducer } = createSlice({
}
if (!autoConnect) {
return assoc(serverId, { ...state[serverId], autoConnect }, state);
return { ...state, [serverId]: { ...state[serverId], autoConnect } };
}
return fromPairs(
toPairs(state).map(([evaluatedServerId, server]) => [
return Object.fromEntries(
Object.entries(state).map(([evaluatedServerId, server]) => [
evaluatedServerId,
{ ...server, autoConnect: evaluatedServerId === serverId },
]),
@@ -65,11 +70,10 @@ export const { actions, reducer } = createSlice({
},
},
createServers: {
prepare: pipe(
map(serverWithId),
serversListToMap,
(payload: ServersMap) => ({ payload }),
),
prepare: (servers: ServerData[]) => {
const payload = serversListToMap(servers.map(serverWithId));
return { payload };
},
reducer: (state, { payload: newServers }: PayloadAction<ServersMap>) => ({ ...state, ...newServers }),
},
},