Removed hardcoded action references by improving dependency injection

src/short-urls/reducers/shortUrlCreation.ts

@@ -35,12 +35,15 @@ const initialState: ShortUrlCreation = {
   error: false,
 };
 
-export const shortUrlCreationReducerCreator = (buildShlinkApiClient: ShlinkApiClientBuilder) => {
-  const createShortUrl = createAsyncThunk(CREATE_SHORT_URL, (data: ShortUrlData, { getState }): Promise<ShortUrl> => {
+export const createShortUrl = (buildShlinkApiClient: ShlinkApiClientBuilder) => createAsyncThunk(
+  CREATE_SHORT_URL,
+  (data: ShortUrlData, { getState }): Promise<ShortUrl> => {
     const { createShortUrl: shlinkCreateShortUrl } = buildShlinkApiClient(getState);
     return shlinkCreateShortUrl(data);
-  });
+  },
+);
 
+export const shortUrlCreationReducerCreator = (createShortUrlThunk: ReturnType<typeof createShortUrl>) => {
   const { reducer, actions } = createSlice({
     name: 'shortUrlCreationReducer',
     initialState: initialState as ShortUrlCreation, // Without this casting it infers type ShortUrlCreationWaiting
@@ -48,13 +51,13 @@ export const shortUrlCreationReducerCreator = (buildShlinkApiClient: ShlinkApiCl
       resetCreateShortUrl: () => initialState,
     },
     extraReducers: (builder) => {
-      builder.addCase(createShortUrl.pending, () => ({ saving: true, saved: false, error: false }));
+      builder.addCase(createShortUrlThunk.pending, () => ({ saving: true, saved: false, error: false }));
       builder.addCase(
-        createShortUrl.rejected,
+        createShortUrlThunk.rejected,
         (_, { error }) => ({ saving: false, saved: false, error: true, errorData: parseApiError(error) }),
       );
       builder.addCase(
-        createShortUrl.fulfilled,
+        createShortUrlThunk.fulfilled,
         (_, { payload: result }) => ({ result, saving: false, saved: true, error: false }),
       );
     },
@@ -64,7 +67,6 @@ export const shortUrlCreationReducerCreator = (buildShlinkApiClient: ShlinkApiCl
 
   return {
     reducer,
-    createShortUrl,
     resetCreateShortUrl,
   };
 };

src/short-urls/services/provideServices.ts

@@ -8,7 +8,7 @@ import { CreateShortUrl } from '../CreateShortUrl';
 import { DeleteShortUrlModal } from '../helpers/DeleteShortUrlModal';
 import { CreateShortUrlResult } from '../helpers/CreateShortUrlResult';
 import { listShortUrls } from '../reducers/shortUrlsList';
-import { shortUrlCreationReducerCreator } from '../reducers/shortUrlCreation';
+import { shortUrlCreationReducerCreator, createShortUrl } from '../reducers/shortUrlCreation';
 import { shortUrlDeletionReducerCreator } from '../reducers/shortUrlDeletion';
 import { shortUrlEditionReducerCreator } from '../reducers/shortUrlEdition';
 import { shortUrlDetailReducerCreator } from '../reducers/shortUrlDetail';
@@ -57,7 +57,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
   bottle.decorator('ExportShortUrlsBtn', connect(['selectedServer']));
 
   // Reducers
-  bottle.serviceFactory('shortUrlCreationReducerCreator', shortUrlCreationReducerCreator, 'buildShlinkApiClient');
+  bottle.serviceFactory('shortUrlCreationReducerCreator', shortUrlCreationReducerCreator, 'createShortUrl');
   bottle.serviceFactory('shortUrlCreationReducer', prop('reducer'), 'shortUrlCreationReducerCreator');
 
   bottle.serviceFactory('shortUrlEditionReducerCreator', shortUrlEditionReducerCreator, 'buildShlinkApiClient');
@@ -72,7 +72,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
   // Actions
   bottle.serviceFactory('listShortUrls', listShortUrls, 'buildShlinkApiClient');
 
-  bottle.serviceFactory('createShortUrl', prop('createShortUrl'), 'shortUrlCreationReducerCreator');
+  bottle.serviceFactory('createShortUrl', createShortUrl, 'buildShlinkApiClient');
   bottle.serviceFactory('resetCreateShortUrl', prop('resetCreateShortUrl'), 'shortUrlCreationReducerCreator');
 
   bottle.serviceFactory('deleteShortUrl', prop('deleteShortUrl'), 'shortUrlDeletionReducerCreator');

src/tags/reducers/tagsList.ts

@@ -7,7 +7,7 @@ import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilde
 import { CreateVisit, Stats } from '../../visits/types';
 import { parseApiError } from '../../api/utils';
 import { TagStats } from '../data';
-import { CREATE_SHORT_URL } from '../../short-urls/reducers/shortUrlCreation';
+import { createShortUrl } from '../../short-urls/reducers/shortUrlCreation';
 import { tagDeleted } from './tagDelete';
 import { tagEdited } from './tagEdit';
 import { ProblemDetailsError } from '../../api/types/errors';
@@ -88,7 +88,10 @@ export const listTags = (buildShlinkApiClient: ShlinkApiClientBuilder, force = t
 
 export const filterTags = createAction<string>(FILTER_TAGS);
 
-export const reducer = (listTagsThunk: ReturnType<typeof listTags>) => createSlice({
+export const reducer = (
+  listTagsThunk: ReturnType<typeof listTags>,
+  createShortUrlThunk: ReturnType<typeof createShortUrl>,
+) => createSlice({
   name: 'shlink/tagsList',
   initialState,
   reducers: {},
@@ -121,8 +124,7 @@ export const reducer = (listTagsThunk: ReturnType<typeof listTags>) => createSli
       stats: increaseVisitsForTags(calculateVisitsPerTag(payload.createdVisits), state.stats),
     }));
 
-    // TODO Do not hardcode action type here. Inject async thunk instead
-    builder.addCase(`${CREATE_SHORT_URL}/fulfilled`, ({ tags: stateTags, ...rest }, { payload }: any) => ({
+    builder.addCase(createShortUrlThunk.fulfilled, ({ tags: stateTags, ...rest }, { payload }) => ({
       ...rest,
       tags: stateTags.concat(payload.tags.filter((tag: string) => !stateTags.includes(tag))), // More performant than [ ...new Set(...) ]
     }));

src/tags/services/provideServices.ts

@@ -44,7 +44,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
   bottle.serviceFactory('tagDeleteReducerCreator', tagDeleteReducerCreator, 'buildShlinkApiClient');
   bottle.serviceFactory('tagDeleteReducer', prop('reducer'), 'tagDeleteReducerCreator');
 
-  bottle.serviceFactory('tagsListReducer', reducer, 'listTags');
+  bottle.serviceFactory('tagsListReducer', reducer, 'listTags', 'createShortUrl');
 
   // Actions
   const listTagsActionFactory = (force: boolean) =>