Infer redux types when possible

src/api/services/ShlinkApiClientBuilder.ts

@@ -1,8 +1,8 @@
 import type { HttpClient } from '@shlinkio/shlink-js-sdk';
 import { ShlinkApiClient } from '@shlinkio/shlink-js-sdk';
-import type { GetState } from '../../container/types';
 import type { ServerWithId } from '../../servers/data';
 import { hasServerData } from '../../servers/data';
+import type { GetState } from '../../store';
 
 const apiClients: Map<string, ShlinkApiClient> = new Map();
 

src/container/types.ts

@@ -1,15 +1 @@
-import type { Settings } from '@shlinkio/shlink-web-component/settings';
-import type { SelectedServer, ServersMap } from '../servers/data';
-
-/** Deprecated Use RootState */
-export type ShlinkState = {
-  servers: ServersMap;
-  selectedServer: SelectedServer;
-  settings: Settings;
-  appUpdated: boolean;
-};
-
 export type ConnectDecorator = (props: string[] | null, actions?: string[]) => any;
-
-/** @deprecated */
-export type GetState = () => ShlinkState;

src/servers/reducers/remoteServers.ts

@@ -1,6 +1,6 @@
 import type { HttpClient } from '@shlinkio/shlink-js-sdk';
 import pack from '../../../package.json';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../store/helpers';
 import { hasServerData } from '../data';
 import { ensureUniqueIds } from '../helpers';
 import { createServers } from './servers';

src/servers/reducers/selectedServer.ts

@@ -4,7 +4,7 @@ import type { ShlinkHealth } from '@shlinkio/shlink-web-component/api-contract';
 import { useCallback } from 'react';
 import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
 import { useAppDispatch, useAppSelector } from '../../store';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../store/helpers';
 import { versionToPrintable, versionToSemVer as toSemVer } from '../../utils/helpers/version';
 import type { SelectedServer, ServerWithId } from '../data';
 

src/settings/helpers/index.ts

@@ -1,12 +1,6 @@
-import type { ShlinkState } from '../../container/types';
-
-export const migrateDeprecatedSettings = (state: Partial<ShlinkState>): Partial<ShlinkState> => {
-  if (!state.settings) {
-    return state;
-  }
-
+export const migrateDeprecatedSettings = (state: any): any => {
   // The "last180Days" interval had a typo, with a lowercase d
-  if (state.settings.visits && (state.settings.visits.defaultInterval as any) === 'last180days') {
+  if (state.settings?.visits?.defaultInterval === 'last180days') {
     state.settings.visits.defaultInterval = 'last180Days';
   }
 

src/settings/reducers/settings.ts

@@ -4,8 +4,7 @@ import { mergeDeepRight } from '@shlinkio/data-manipulation';
 import { getSystemPreferredTheme } from '@shlinkio/shlink-frontend-kit';
 import type { Settings, ShortUrlsListSettings } from '@shlinkio/shlink-web-component/settings';
 import { useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import type { ShlinkState } from '../../container/types';
+import { useAppDispatch, useAppSelector } from '../../store';
 import type { Defined } from '../../utils/types';
 
 type ShortUrlsOrder = Defined<ShortUrlsListSettings['defaultOrdering']>;
@@ -46,9 +45,9 @@ export const { setSettings } = actions;
 export const settingsReducer = reducer;
 
 export const useSettings = () => {
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
   const setSettings = useCallback((settings: Settings) => dispatch(actions.setSettings(settings)), [dispatch]);
-  const settings = useSelector((state: ShlinkState) => state.settings);
+  const settings = useAppSelector((state) => state.settings);
 
   return { settings, setSettings };
 };

src/store/helpers.ts

@@ -1,10 +1,10 @@
 import type { AsyncThunkPayloadCreator } from '@reduxjs/toolkit';
 import { createAsyncThunk as baseCreateAsyncThunk } from '@reduxjs/toolkit';
-import type { ShlinkState } from '../../container/types';
+import type { RootState } from '.';
 
 export const createAsyncThunk = <Returned, ThunkArg>(
   typePrefix: string,
-  payloadCreator: AsyncThunkPayloadCreator<Returned, ThunkArg, { state: ShlinkState, serializedErrorType: any }>,
+  payloadCreator: AsyncThunkPayloadCreator<Returned, ThunkArg, { state: RootState, serializedErrorType: any }>,
 ) => baseCreateAsyncThunk(
   typePrefix,
   payloadCreator,

src/store/index.ts

@@ -24,7 +24,8 @@ export const setUpStore = (preloadedState = getStateFromLocalStorage()) => confi
 
 export type StoreType = ReturnType<typeof setUpStore>;
 export type AppDispatch = StoreType['dispatch'];
-export type RootState = ReturnType<StoreType['getState']>;
+export type GetState = StoreType['getState'];
+export type RootState = ReturnType<GetState>;
 
 // Typed versions of useDispatch() and useSelector()
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();