Do not inject remoteServers state or actions

This commit is contained in:
Alejandro Celaya
2025-11-14 23:20:42 +01:00
parent a7f2d3224b
commit 9e8498b16a
6 changed files with 42 additions and 35 deletions

View File

@@ -1,21 +1,44 @@
import type { HttpClient } from '@shlinkio/shlink-js-sdk';
import { useCallback, useEffect, useRef } from 'react';
import pack from '../../../package.json';
import { useAppDispatch } from '../../store';
import { createAsyncThunk } from '../../store/helpers';
import { hasServerData } from '../data';
import { ensureUniqueIds } from '../helpers';
import { createServers } from './servers';
import { createServers, useServers } from './servers';
const responseToServersList = (data: any) => ensureUniqueIds(
{},
(Array.isArray(data) ? data.filter(hasServerData) : []),
);
export const fetchServers = (httpClient: HttpClient) => createAsyncThunk(
export const fetchServers = createAsyncThunk(
'shlink/remoteServers/fetchServers',
async (_: void, { dispatch }): Promise<void> => {
async (httpClient: HttpClient, { dispatch }): Promise<void> => {
const resp = await httpClient.jsonRequest<any>(`${pack.homepage}/servers.json`);
const result = responseToServersList(resp);
dispatch(createServers(result));
},
);
export const useRemoteServers = () => {
const dispatch = useAppDispatch();
const dispatchFetchServer = useCallback((httpClient: HttpClient) => dispatch(fetchServers(httpClient)), [dispatch]);
return { fetchServers: dispatchFetchServer };
};
export const useLoadRemoteServers = (httpClient: HttpClient) => {
const { fetchServers } = useRemoteServers();
const { servers } = useServers();
const initialServers = useRef(servers);
useEffect(() => {
// Try to fetch the remote servers if the list is empty during first render.
// We use a ref because we don't care if the servers list becomes empty later.
if (Object.keys(initialServers.current).length === 0) {
fetchServers(httpClient);
}
}, [fetchServers, httpClient]);
};

View File

@@ -3,7 +3,6 @@ import { CreateServerFactory } from '../CreateServer';
import { ImportServersBtnFactory } from '../helpers/ImportServersBtn';
import { withoutSelectedServer } from '../helpers/withoutSelectedServer';
import { ManageServersFactory } from '../ManageServers';
import { fetchServers } from '../reducers/remoteServers';
import { ServersExporter } from './ServersExporter';
import { ServersImporter } from './ServersImporter';
@@ -20,7 +19,4 @@ export const provideServices = (bottle: Bottle) => {
// Services
bottle.service('ServersImporter', ServersImporter, 'csvToJson');
bottle.service('ServersExporter', ServersExporter, 'Storage', 'window', 'jsonToCsv');
// Actions
bottle.serviceFactory('fetchServers', fetchServers, 'HttpClient');
};