mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2025-03-14 02:08:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Migrate servers reducer to typescript

Browse source
This commit is contained in:
Alejandro Celaya 2020-08-23 10:20:31 +02:00
parent 87e64e5899
commit dc78138066
4 changed files with 59 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/container/types.ts
View file

@ -1,9 +1,10 @@
import { MercureInfo } from '../mercure/reducers/mercureInfo';
import { ServersMap } from '../servers/reducers/servers';
export type ConnectDecorator = (props: string[], actions?: string[]) => any;
export interface ShlinkState {
servers: any;
servers: ServersMap;
selectedServer: any;
shortUrlsList: any;
shortUrlsListParams: any;

35
src/servers/reducers/servers.js
View file

@ -1,35 +0,0 @@
import { handleActions } from 'redux-actions';
import { pipe, assoc, map, reduce, dissoc } from 'ramda';
import { v4 as uuid } from 'uuid';
/* eslint-disable padding-line-between-statements */
export const EDIT_SERVER = 'shlink/servers/EDIT_SERVER';
export const DELETE_SERVER = 'shlink/servers/DELETE_SERVER';
export const CREATE_SERVERS = 'shlink/servers/CREATE_SERVERS';
/* eslint-enable padding-line-between-statements */
const initialState = {};
const assocId = (server) => assoc('id', server.id || uuid(), server);
export default handleActions({
[CREATE_SERVERS]: (state, { newServers }) => ({ ...state, ...newServers }),
[DELETE_SERVER]: (state, { serverId }) => dissoc(serverId, state),
[EDIT_SERVER]: (state, { serverId, serverData }) => !state[serverId]
? state
: assoc(serverId, { ...state[serverId], ...serverData }, state),
}, initialState);
export const createServer = (server) => createServers([ server ]);
const serversListToMap = reduce((acc, server) => assoc(server.id, server, acc), {});
export const createServers = pipe(
map(assocId),
serversListToMap,
(newServers) => ({ type: CREATE_SERVERS, newServers }),
);
export const editServer = (serverId, serverData) => ({ type: EDIT_SERVER, serverId, serverData });
export const deleteServer = ({ id }) => ({ type: DELETE_SERVER, serverId: id });

48
src/servers/reducers/servers.ts Normal file
View file

@ -0,0 +1,48 @@
import { handleActions } from 'redux-actions';
import { pipe, assoc, map, reduce, dissoc } from 'ramda';
import { v4 as uuid } from 'uuid';
import { RegularServer, NewServerData } from '../data';
/* eslint-disable padding-line-between-statements */
export const EDIT_SERVER = 'shlink/servers/EDIT_SERVER';
export const DELETE_SERVER = 'shlink/servers/DELETE_SERVER';
export const CREATE_SERVERS = 'shlink/servers/CREATE_SERVERS';
/* eslint-enable padding-line-between-statements */
export type ServersMap = Record<string, RegularServer>;
const initialState: ServersMap = {};
const serverWithId = (server: RegularServer | NewServerData): RegularServer => {
if ((server as RegularServer).id) {
return server as RegularServer;
}
return assoc('id', uuid(), server);
};
export default handleActions<ServersMap, any>({
[CREATE_SERVERS]: (state, { newServers }: any) => ({ ...state, ...newServers }),
[DELETE_SERVER]: (state, { serverId }: any) => dissoc(serverId, state),
[EDIT_SERVER]: (state, { serverId, serverData }: any) => !state[serverId]
? state
: assoc(serverId, { ...state[serverId], ...serverData }, state),
}, initialState);
const serversListToMap = reduce<RegularServer, ServersMap>((acc, server) => assoc(server.id, server, acc), {});
export const createServers = pipe(
map(serverWithId),
serversListToMap,
(newServers: ServersMap) => ({ type: CREATE_SERVERS, newServers }),
);
export const createServer = (server: RegularServer) => createServers([ server ]);
export const editServer = (serverId: string, serverData: Partial<NewServerData>) => ({
type: EDIT_SERVER,
serverId,
serverData,
});
export const deleteServer = ({ id }: RegularServer) => ({ type: DELETE_SERVER, serverId: id });

16
test/servers/reducers/servers.test.js → test/servers/reducers/servers.test.ts
View file

@ -1,4 +1,5 @@
import { values } from 'ramda';
import { Mock } from 'ts-mockery';
import reducer, {
createServer,
deleteServer,
@ -8,11 +9,12 @@ import reducer, {
DELETE_SERVER,
CREATE_SERVERS,
} from '../../../src/servers/reducers/servers';
import { RegularServer } from '../../../src/servers/data';
describe('serverReducer', () => {
const list = {
abc123: { id: 'abc123' },
def456: { id: 'def456' },
abc123: Mock.of<RegularServer>({ id: 'abc123' }),
def456: Mock.of<RegularServer>({ id: 'def456' }),
};
afterEach(jest.clearAllMocks);
@ -21,14 +23,14 @@ describe('serverReducer', () => {
it('returns edited server when action is EDIT_SERVER', () =>
expect(reducer(
list,
{ type: EDIT_SERVER, serverId: 'abc123', serverData: { foo: 'foo' } },
{ type: EDIT_SERVER, serverId: 'abc123', serverData: { foo: 'foo' } } as any,
)).toEqual({
abc123: { id: 'abc123', foo: 'foo' },
def456: { id: 'def456' },
}));
it('removes server when action is DELETE_SERVER', () =>
expect(reducer(list, { type: DELETE_SERVER, serverId: 'abc123' })).toEqual({
expect(reducer(list, { type: DELETE_SERVER, serverId: 'abc123' } as any)).toEqual({
def456: { id: 'def456' },
}));
@ -38,7 +40,7 @@ describe('serverReducer', () => {
newServers: {
ghi789: { id: 'ghi789' },
},
})).toEqual({
} as any)).toEqual({
abc123: { id: 'abc123' },
def456: { id: 'def456' },
ghi789: { id: 'ghi789' },
@ -48,7 +50,7 @@ describe('serverReducer', () => {
describe('action creators', () => {
describe('createServer', () => {
it('returns expected action', () => {
const serverToCreate = { id: 'abc123' };
const serverToCreate = Mock.of<RegularServer>({ id: 'abc123' });
const result = createServer(serverToCreate);
expect(result).toEqual(expect.objectContaining({ type: CREATE_SERVERS }));
@ -66,7 +68,7 @@ describe('serverReducer', () => {
describe('deleteServer', () => {
it('returns expected action', () => {
const serverToDelete = { id: 'abc123' };
const serverToDelete = Mock.of<RegularServer>({ id: 'abc123' });
const result = deleteServer(serverToDelete);
expect(result).toEqual({ type: DELETE_SERVER, serverId: 'abc123' });