Flatten model holding list of servers

src/common/Home.js

@@ -10,9 +10,9 @@ const propTypes = {
   servers: PropTypes.object,
 };
 
-const Home = ({ resetSelectedServer, servers: { list, loading } }) => {
-  const servers = values(list);
-  const hasServers = !isEmpty(servers);
+const Home = ({ resetSelectedServer, servers }) => {
+  const serversList = values(servers);
+  const hasServers = !isEmpty(serversList);
 
   useEffect(() => {
     resetSelectedServer();
@@ -21,10 +21,9 @@ const Home = ({ resetSelectedServer, servers: { list, loading } }) => {
   return (
     <div className="home">
       <h1 className="home__title">Welcome to Shlink</h1>
-      <ServersListGroup servers={servers}>
-        {!loading && hasServers && <span>Please, select a server.</span>}
-        {!loading && !hasServers && <span>Please, <Link to="/server/create">add a server</Link>.</span>}
-        {loading && <span>Trying to load servers...</span>}
+      <ServersListGroup servers={serversList}>
+        {hasServers && <span>Please, select a server.</span>}
+        {!hasServers && <span>Please, <Link to="/server/create">add a server</Link>.</span>}
       </ServersListGroup>
     </div>
   );

src/servers/ServersDropdown.js

@@ -15,22 +15,18 @@ const ServersDropdown = (serversExporter) => class ServersDropdown extends React
   };
 
   renderServers = () => {
-    const { servers: { list, loading }, selectedServer } = this.props;
-    const servers = values(list);
+    const { servers, selectedServer } = this.props;
+    const serversList = values(servers);
     const { push } = this.props.history;
     const loadServer = (id) => push(`/server/${id}/list-short-urls/1`);
 
-    if (loading) {
-      return <DropdownItem disabled><i>Trying to load servers...</i></DropdownItem>;
-    }
-
-    if (isEmpty(servers)) {
+    if (isEmpty(serversList)) {
       return <DropdownItem disabled><i>Add a server first...</i></DropdownItem>;
     }
 
     return (
       <React.Fragment>
-        {servers.map(({ name, id }) => (
+        {serversList.map(({ name, id }) => (
           <DropdownItem key={id} active={selectedServer && selectedServer.id === id} onClick={() => loadServer(id)}>
             {name}
           </DropdownItem>

src/servers/helpers/ServerError.js

@@ -13,7 +13,7 @@ const propTypes = {
 };
 
 export const ServerError = (DeleteServerButton) => {
-  const ServerErrorComp = ({ type, servers: { list }, selectedServer }) => (
+  const ServerErrorComp = ({ type, servers, selectedServer }) => (
     <div className="server-error__container flex-column">
       <div className="row w-100 mb-3 mb-md-5">
         <Message type="error">
@@ -27,7 +27,7 @@ export const ServerError = (DeleteServerButton) => {
         </Message>
       </div>
 
-      <ServersListGroup servers={Object.values(list)}>
+      <ServersListGroup servers={Object.values(servers)}>
         These are the Shlink servers currently configured. Choose one of
         them or <Link to="/server/create">add a new one</Link>.
       </ServersListGroup>

src/servers/reducers/server.js

@@ -3,25 +3,17 @@ import { pipe, isEmpty, assoc, map, prop } from 'ramda';
 import { v4 as uuid } from 'uuid';
 import { homepage } from '../../../package.json';
 
-/* eslint-disable padding-line-between-statements */
-export const FETCH_SERVERS_START = 'shlink/servers/FETCH_SERVERS_START';
 export const FETCH_SERVERS = 'shlink/servers/FETCH_SERVERS';
-/* eslint-enable padding-line-between-statements */
 
-const initialState = {
-  list: {},
-  loading: false,
-};
+const initialState = {};
 
 const assocId = (server) => assoc('id', server.id || uuid(), server);
 
 export default handleActions({
-  [FETCH_SERVERS_START]: (state) => ({ ...state, loading: true }),
-  [FETCH_SERVERS]: (state, { list }) => ({ list, loading: false }),
+  [FETCH_SERVERS]: (state, { list }) => list,
 }, initialState);
 
 export const listServers = ({ listServers, createServers }, { get }) => () => async (dispatch) => {
-  dispatch({ type: FETCH_SERVERS_START });
   const localList = listServers();
 
   if (!isEmpty(localList)) {