forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-02-27 04:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensured server is properly loaded before trying to render any children component

Browse Source
This commit is contained in:
Alejandro Celaya
2020-03-05 08:59:07 +01:00
parent 853032ac7f
commit bc8905ee7f
9 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/services/ShlinkApiClientBuilder.js
View File

@@ -1,21 +1,16 @@
import { wait } from '../utils';
import ShlinkApiClient from './ShlinkApiClient';
const apiClients = {};
const getSelectedServerFromState = async (getState) => {
const getSelectedServerFromState = (getState) => {
const { selectedServer } = getState();
if (!selectedServer) {
return wait(250).then(() => getSelectedServerFromState(getState));
}
return selectedServer;
};
const buildShlinkApiClient = (axios) => async (getStateOrSelectedServer) => {
const { url, apiKey } = typeof getStateOrSelectedServer === 'function'
? await getSelectedServerFromState(getStateOrSelectedServer)
? getSelectedServerFromState(getStateOrSelectedServer)
: getStateOrSelectedServer;
const clientKey = `${url}_${apiKey}`;

2
src/utils/utils.js
View File

@@ -53,8 +53,6 @@ export const useToggle = (initialValue = false) => {
return [ flag, () => setFlag(!flag) ];
};
export const wait = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
export const compareVersions = (firstVersion, operator, secondVersion) => compare(
firstVersion,
secondVersion,