Remove more ovbious ramda helper usages

src/servers/helpers/ImportServersBtn.tsx

@@ -1,7 +1,6 @@
 import { faFileUpload as importIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useElementRef, useToggle } from '@shlinkio/shlink-frontend-kit';
-import { complement } from 'ramda';
 import type { ChangeEvent, PropsWithChildren } from 'react';
 import { useCallback, useRef, useState } from 'react';
 import { Button, UncontrolledTooltip } from 'reactstrap';
@@ -27,8 +26,8 @@ type ImportServersBtnDeps = {
   ServersImporter: ServersImporter
 };
 
-const serversFiltering = (servers: ServerData[]) =>
-  ({ url, apiKey }: ServerData) => servers.some((server) => server.url === url && server.apiKey === apiKey);
+const serversInclude = (servers: ServerData[], { url, apiKey }: ServerData) =>
+  servers.some((server) => server.url === url && server.apiKey === apiKey);
 
 const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBtnDeps> = ({
   createServers,
@@ -56,7 +55,7 @@ const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBt
           serversToCreate.current = newServers;
 
           const existingServers = Object.values(servers);
-          const dupServers = newServers.filter(serversFiltering(existingServers));
+          const dupServers = newServers.filter((server) => serversInclude(existingServers, server));
           const hasDuplicatedServers = !!dupServers.length;
 
           !hasDuplicatedServers ? create(newServers) : setDuplicatedServers(dupServers);
@@ -75,7 +74,7 @@ const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBt
     hideModal();
   }, [create, hideModal, serversToCreate]);
   const createNonDuplicatedServers = useCallback(() => {
-    create(serversToCreate.current.filter(complement(serversFiltering(duplicatedServers))));
+    create(serversToCreate.current.filter((server) => !serversInclude(duplicatedServers, server)));
     hideModal();
   }, [create, duplicatedServers, hideModal]);
 

src/servers/services/ServersExporter.ts

@@ -1,4 +1,3 @@
-import { values } from 'ramda';
 import type { JsonToCsv } from '../../utils/helpers/csvjson';
 import { saveCsv } from '../../utils/helpers/files';
 import type { LocalStorage } from '../../utils/services/LocalStorage';
@@ -15,7 +14,7 @@ export class ServersExporter {
   ) {}
 
   public readonly exportServers = async () => {
-    const servers = values(this.storage.get<ServersMap>('servers') ?? {}).map(serverWithIdToServerData);
+    const servers = Object.values(this.storage.get<ServersMap>('servers') ?? {}).map(serverWithIdToServerData);
 
     try {
       const csv = this.jsonToCsv(servers);

src/servers/services/provideServices.ts

@@ -1,5 +1,4 @@
 import type Bottle from 'bottlejs';
-import { prop } from 'ramda';
 import type { ConnectDecorator } from '../../container/types';
 import { CreateServerFactory } from '../CreateServer';
 import { DeleteServerButtonFactory } from '../DeleteServerButton';
@@ -70,5 +69,5 @@ export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
 
   // Reducers
   bottle.serviceFactory('selectedServerReducerCreator', selectedServerReducerCreator, 'selectServer');
-  bottle.serviceFactory('selectedServerReducer', prop('reducer'), 'selectedServerReducerCreator');
+  bottle.serviceFactory('selectedServerReducer', (obj) => obj.reducer, 'selectedServerReducerCreator');
 };

src/utils/helpers/redux.ts

@@ -1,6 +1,5 @@
 import type { AsyncThunkPayloadCreator } from '@reduxjs/toolkit';
 import { createAsyncThunk as baseCreateAsyncThunk } from '@reduxjs/toolkit';
-import { identity } from 'ramda';
 import type { ShlinkState } from '../../container/types';
 
 export const createAsyncThunk = <Returned, ThunkArg>(
@@ -9,5 +8,5 @@ export const createAsyncThunk = <Returned, ThunkArg>(
 ) => baseCreateAsyncThunk(
     typePrefix,
     payloadCreator,
-    { serializeError: identity },
+    { serializeError: (e) => e },
   );

src/utils/helpers/version.ts

@@ -1,9 +1,15 @@
 import { compare } from 'compare-versions';
-import { identity, isEmpty, isNil, memoizeWith } from 'ramda';
+import { memoizeWith } from 'ramda';
 
 export type Empty = null | undefined | '' | never[];
 
-const hasValue = <T>(value: T | Empty): value is T => !isNil(value) && !isEmpty(value);
+const isEmpty = (value: Exclude<any, undefined | null>): boolean => (
+  (Array.isArray(value) && value.length === 0)
+  || (typeof value === 'string' && value === '')
+  || (typeof value === 'object' && Object.keys(value).length === 0)
+);
+
+export const hasValue = <T>(value: T | Empty): value is T => value !== undefined && value !== null && !isEmpty(value);
 
 type SemVerPatternFragment = `${bigint | '*'}`;
 
@@ -29,7 +35,7 @@ export const versionMatch = (versionToMatch: SemVer | Empty, { maxVersion, minVe
   return matchesMaxVersion && matchesMinVersion;
 };
 
-const versionIsValidSemVer = memoizeWith(identity, (version: string): version is SemVer => {
+const versionIsValidSemVer = memoizeWith((v) => v, (version: string): version is SemVer => {
   try {
     return compare(version, version, '=');
   } catch (e) {

src/utils/utils.ts

@@ -1,14 +1,10 @@
-import { pipe, range } from 'ramda';
+import { range } from 'ramda';
 import type { SyntheticEvent } from 'react';
 
-type Optional<T> = T | null | undefined;
-
-export type OptionalString = Optional<string>;
-
-export const handleEventPreventingDefault = <T>(handler: () => T) => pipe(
-  (e: SyntheticEvent) => e.preventDefault(),
-  handler,
-);
+export const handleEventPreventingDefault = <T>(handler: () => T) => (e: SyntheticEvent) => {
+  e.preventDefault();
+  handler();
+};
 
 export const rangeOf = <T>(size: number, mappingFn: (value: number) => T, startAt = 1): T[] =>
   range(startAt, size + 1).map(mappingFn);

test/servers/ServersDropdown.test.tsx

@@ -1,6 +1,5 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { values } from 'ramda';
 import { MemoryRouter } from 'react-router-dom';
 import type { ServersMap } from '../../src/servers/data';
 import { ServersDropdown } from '../../src/servers/ServersDropdown';
@@ -28,7 +27,7 @@ describe('<ServersDropdown />', () => {
 
     await user.click(screen.getByText('Servers'));
     const items = screen.getAllByRole('menuitem');
-    expect(items).toHaveLength(values(fallbackServers).length + 1);
+    expect(items).toHaveLength(Object.values(fallbackServers).length + 1);
     expect(items[0]).toHaveTextContent('foo');
     expect(items[1]).toHaveTextContent('bar');
     expect(items[2]).toHaveTextContent('baz');

test/servers/reducers/servers.test.ts

@@ -1,5 +1,4 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { dissoc, values } from 'ramda';
 import type { RegularServer, ServersMap, ServerWithId } from '../../../src/servers/data';
 import {
   createServers,
@@ -101,17 +100,17 @@ describe('serversReducer', () => {
 
     describe('createServers', () => {
       it('returns expected action', () => {
-        const newServers = values(list);
+        const newServers = Object.values(list);
         const { payload } = createServers(newServers);
 
         expect(payload).toEqual(list);
       });
 
       it('generates an id for every provided server if they do not have it', () => {
-        const servers = values(list).map(dissoc('id'));
+        const servers = Object.values(list).map(({ id, ...rest }) => rest);
         const { payload } = createServers(servers);
 
-        expect(values(payload).every(({ id }) => !!id)).toEqual(true);
+        expect(Object.values(payload).every(({ id }) => !!id)).toEqual(true);
       });
     });