forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-05-31 09:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrated to TS main services except ShlinkApiClient

Browse Source
This commit is contained in:
Alejandro Celaya
2020-08-29 18:51:03 +02:00
parent 64a968711c
commit ebd7a76896
6 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/servers/data/index.ts
View File

@@ -35,3 +35,6 @@ export const isReachableServer = (server: SelectedServer): server is ReachableSe
export const isServerWithId = (server: SelectedServer | ServerWithId): server is ServerWithId =>
!!server?.hasOwnProperty('id');
export const isNotFoundServer = (server: SelectedServer): server is NotFoundServer =>
!!server?.hasOwnProperty('serverNotFound');

4
src/servers/helpers/withSelectedServer.tsx
View File

@@ -1,7 +1,7 @@
import React, { FC, useEffect } from 'react';
import { RouteChildrenProps } from 'react-router';
import Message from '../../utils/Message';
import { isReachableServer, SelectedServer } from '../data';
import { isNotFoundServer, SelectedServer } from '../data';
interface WithSelectedServerProps extends RouteChildrenProps<{ serverId: string }> {
selectServer: (serverId: string) => void;
@@ -21,7 +21,7 @@ export const withSelectedServer = (WrappedComponent: FC<WithSelectedServerProps>
return <Message loading />;
}
if (!isReachableServer(selectedServer)) {
if (isNotFoundServer(selectedServer)) {
return <ServerError />;
}