Updated to airbnb coding styles

src/short-urls/reducers/shortUrlCreation.ts

@@ -7,12 +7,10 @@ import { ProblemDetailsError } from '../../api/types';
 import { parseApiError } from '../../api/utils';
 import { ApiErrorAction } from '../../api/types/actions';
 
-/* eslint-disable padding-line-between-statements */
 export const CREATE_SHORT_URL_START = 'shlink/createShortUrl/CREATE_SHORT_URL_START';
 export const CREATE_SHORT_URL_ERROR = 'shlink/createShortUrl/CREATE_SHORT_URL_ERROR';
 export const CREATE_SHORT_URL = 'shlink/createShortUrl/CREATE_SHORT_URL';
 export const RESET_CREATE_SHORT_URL = 'shlink/createShortUrl/RESET_CREATE_SHORT_URL';
-/* eslint-enable padding-line-between-statements */
 
 export interface ShortUrlCreation {
   result: ShortUrl | null;
@@ -43,10 +41,10 @@ export const createShortUrl = (buildShlinkApiClient: ShlinkApiClientBuilder) =>
   getState: GetState,
 ) => {
   dispatch({ type: CREATE_SHORT_URL_START });
-  const { createShortUrl } = buildShlinkApiClient(getState);
+  const { createShortUrl: shlinkCreateShortUrl } = buildShlinkApiClient(getState);
 
   try {
-    const result = await createShortUrl(data);
+    const result = await shlinkCreateShortUrl(data);
 
     dispatch<CreateShortUrlAction>({ type: CREATE_SHORT_URL, result });
   } catch (e: any) {

src/short-urls/reducers/shortUrlDeletion.ts

@@ -6,12 +6,10 @@ import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilde
 import { parseApiError } from '../../api/utils';
 import { ApiErrorAction } from '../../api/types/actions';
 
-/* eslint-disable padding-line-between-statements */
 export const DELETE_SHORT_URL_START = 'shlink/deleteShortUrl/DELETE_SHORT_URL_START';
 export const DELETE_SHORT_URL_ERROR = 'shlink/deleteShortUrl/DELETE_SHORT_URL_ERROR';
 export const SHORT_URL_DELETED = 'shlink/deleteShortUrl/SHORT_URL_DELETED';
 export const RESET_DELETE_SHORT_URL = 'shlink/deleteShortUrl/RESET_DELETE_SHORT_URL';
-/* eslint-enable padding-line-between-statements */
 
 export interface ShortUrlDeletion {
   shortCode: string;
@@ -43,10 +41,10 @@ export const deleteShortUrl = (buildShlinkApiClient: ShlinkApiClientBuilder) =>
   domain?: string | null,
 ) => async (dispatch: Dispatch, getState: GetState) => {
   dispatch({ type: DELETE_SHORT_URL_START });
-  const { deleteShortUrl } = buildShlinkApiClient(getState);
+  const { deleteShortUrl: shlinkDeleteShortUrl } = buildShlinkApiClient(getState);
 
   try {
-    await deleteShortUrl(shortCode, domain);
+    await shlinkDeleteShortUrl(shortCode, domain);
     dispatch<DeleteShortUrlAction>({ type: SHORT_URL_DELETED, shortCode, domain });
   } catch (e: any) {
     dispatch<ApiErrorAction>({ type: DELETE_SHORT_URL_ERROR, errorData: parseApiError(e) });

src/short-urls/reducers/shortUrlDetail.ts

@@ -9,11 +9,9 @@ import { ProblemDetailsError } from '../../api/types';
 import { parseApiError } from '../../api/utils';
 import { ApiErrorAction } from '../../api/types/actions';
 
-/* eslint-disable padding-line-between-statements */
 export const GET_SHORT_URL_DETAIL_START = 'shlink/shortUrlDetail/GET_SHORT_URL_DETAIL_START';
 export const GET_SHORT_URL_DETAIL_ERROR = 'shlink/shortUrlDetail/GET_SHORT_URL_DETAIL_ERROR';
 export const GET_SHORT_URL_DETAIL = 'shlink/shortUrlDetail/GET_SHORT_URL_DETAIL';
-/* eslint-enable padding-line-between-statements */
 
 export interface ShortUrlDetail {
   shortUrl?: ShortUrl;
@@ -46,7 +44,7 @@ export const getShortUrlDetail = (buildShlinkApiClient: ShlinkApiClientBuilder)
   try {
     const { shortUrlsList } = getState();
     const shortUrl = shortUrlsList?.shortUrls?.data.find(
-      (shortUrl) => shortUrlMatches(shortUrl, shortCode, domain),
+      (url) => shortUrlMatches(url, shortCode, domain),
     ) ?? await buildShlinkApiClient(getState).getShortUrl(shortCode, domain);
 
     dispatch<ShortUrlDetailAction>({ shortUrl, type: GET_SHORT_URL_DETAIL });

src/short-urls/reducers/shortUrlEdition.ts

@@ -9,11 +9,9 @@ import { parseApiError } from '../../api/utils';
 import { supportsTagsInPatch } from '../../utils/helpers/features';
 import { ApiErrorAction } from '../../api/types/actions';
 
-/* eslint-disable padding-line-between-statements */
 export const EDIT_SHORT_URL_START = 'shlink/shortUrlEdition/EDIT_SHORT_URL_START';
 export const EDIT_SHORT_URL_ERROR = 'shlink/shortUrlEdition/EDIT_SHORT_URL_ERROR';
 export const SHORT_URL_EDITED = 'shlink/shortUrlEdition/SHORT_URL_EDITED';
-/* eslint-enable padding-line-between-statements */
 
 export interface ShortUrlEdition {
   shortUrl?: ShortUrl;
@@ -49,7 +47,7 @@ export const editShortUrl = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
   const { updateShortUrl, updateShortUrlTags } = buildShlinkApiClient(getState);
 
   try {
-    const [ shortUrl ] = await Promise.all([
+    const [shortUrl] = await Promise.all([
       updateShortUrl(shortCode, domain, data as any), // FIXME Parse dates
       sendTagsSeparately && data.tags ? updateShortUrlTags(shortCode, domain, data.tags) : undefined,
     ]);

src/short-urls/reducers/shortUrlsList.ts

@@ -10,11 +10,9 @@ import { DeleteShortUrlAction, SHORT_URL_DELETED } from './shortUrlDeletion';
 import { CREATE_SHORT_URL, CreateShortUrlAction } from './shortUrlCreation';
 import { SHORT_URL_EDITED, ShortUrlEditedAction } from './shortUrlEdition';
 
-/* eslint-disable padding-line-between-statements */
 export const LIST_SHORT_URLS_START = 'shlink/shortUrlsList/LIST_SHORT_URLS_START';
 export const LIST_SHORT_URLS_ERROR = 'shlink/shortUrlsList/LIST_SHORT_URLS_ERROR';
 export const LIST_SHORT_URLS = 'shlink/shortUrlsList/LIST_SHORT_URLS';
-/* eslint-enable padding-line-between-statements */
 
 export const ITEMS_IN_OVERVIEW_PAGE = 5;
 
@@ -46,19 +44,19 @@ export default buildReducer<ShortUrlsList, ListShortUrlsCombinedAction>({
   [LIST_SHORT_URLS_ERROR]: () => ({ loading: false, error: true }),
   [LIST_SHORT_URLS]: (_, { shortUrls }) => ({ loading: false, error: false, shortUrls }),
   [SHORT_URL_DELETED]: pipe(
-    (state: ShortUrlsList, { shortCode, domain }: DeleteShortUrlAction) => !state.shortUrls ? state : assocPath(
-      [ 'shortUrls', 'data' ],
+    (state: ShortUrlsList, { shortCode, domain }: DeleteShortUrlAction) => (!state.shortUrls ? state : assocPath(
+      ['shortUrls', 'data'],
       reject((shortUrl) => shortUrlMatches(shortUrl, shortCode, domain), state.shortUrls.data),
       state,
-    ),
-    (state) => !state.shortUrls ? state : assocPath(
-      [ 'shortUrls', 'pagination', 'totalItems' ],
+    )),
+    (state) => (!state.shortUrls ? state : assocPath(
+      ['shortUrls', 'pagination', 'totalItems'],
       state.shortUrls.pagination.totalItems - 1,
       state,
-    ),
+    )),
   ),
   [CREATE_VISITS]: (state, { createdVisits }) => assocPath(
-    [ 'shortUrls', 'data' ],
+    ['shortUrls', 'data'],
     state.shortUrls?.data?.map(
       (currentShortUrl) => {
         // Find the last of the new visit for this short URL, and pick the amount of visits from it
@@ -79,36 +77,36 @@ export default buildReducer<ShortUrlsList, ListShortUrlsCombinedAction>({
     // The only place where the list and the creation form coexist is the overview page.
     // There we can assume we are displaying page 1, and therefore, we can safely prepend the new short URL.
     // We can also remove the items above the amount that is displayed there.
-    (state: ShortUrlsList, { result }: CreateShortUrlAction) => !state.shortUrls ? state : assocPath(
-      [ 'shortUrls', 'data' ],
-      [ result, ...state.shortUrls.data.slice(0, ITEMS_IN_OVERVIEW_PAGE - 1) ],
+    (state: ShortUrlsList, { result }: CreateShortUrlAction) => (!state.shortUrls ? state : assocPath(
+      ['shortUrls', 'data'],
+      [result, ...state.shortUrls.data.slice(0, ITEMS_IN_OVERVIEW_PAGE - 1)],
       state,
-    ),
-    (state: ShortUrlsList) => !state.shortUrls ? state : assocPath(
-      [ 'shortUrls', 'pagination', 'totalItems' ],
+    )),
+    (state: ShortUrlsList) => (!state.shortUrls ? state : assocPath(
+      ['shortUrls', 'pagination', 'totalItems'],
       state.shortUrls.pagination.totalItems + 1,
       state,
-    ),
+    )),
   ),
-  [SHORT_URL_EDITED]: (state, { shortUrl: editedShortUrl }) => !state.shortUrls ? state : assocPath(
-    [ 'shortUrls', 'data' ],
+  [SHORT_URL_EDITED]: (state, { shortUrl: editedShortUrl }) => (!state.shortUrls ? state : assocPath(
+    ['shortUrls', 'data'],
     state.shortUrls.data.map((shortUrl) => {
       const { shortCode, domain } = editedShortUrl;
 
       return shortUrlMatches(shortUrl, shortCode, domain) ? editedShortUrl : shortUrl;
     }),
     state,
-  ),
+  )),
 }, initialState);
 
 export const listShortUrls = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
   params: ShlinkShortUrlsListParams = {},
 ) => async (dispatch: Dispatch, getState: GetState) => {
   dispatch({ type: LIST_SHORT_URLS_START });
-  const { listShortUrls } = buildShlinkApiClient(getState);
+  const { listShortUrls: shlinkListShortUrls } = buildShlinkApiClient(getState);
 
   try {
-    const shortUrls = await listShortUrls(params);
+    const shortUrls = await shlinkListShortUrls(params);
 
     dispatch<ListShortUrlsAction>({ type: LIST_SHORT_URLS, shortUrls });
   } catch (e) {