From f620927f3bddb9bdeac016280c11a02e981f5b91 Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:35:27 +0100 Subject: [PATCH] fix: use state instead apollo `loading` result --- new-lamassu-admin/src/pages/Machines/Machines.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/new-lamassu-admin/src/pages/Machines/Machines.js b/new-lamassu-admin/src/pages/Machines/Machines.js index 19381f20..c4b5635f 100644 --- a/new-lamassu-admin/src/pages/Machines/Machines.js +++ b/new-lamassu-admin/src/pages/Machines/Machines.js @@ -6,7 +6,7 @@ import NavigateNextIcon from '@material-ui/icons/NavigateNext' import classnames from 'classnames' import gql from 'graphql-tag' import * as R from 'ramda' -import React from 'react' +import React, { useState } from 'react' import { Link, useLocation, useHistory } from 'react-router-dom' import { TL1, TL2, Label3 } from 'src/components/typography' @@ -67,12 +67,16 @@ const MachineRoute = () => { const id = getMachineID(location.pathname) - const { loading } = useQuery(GET_MACHINES, { + const [loading, setLoading] = useState(true) + + useQuery(GET_MACHINES, { onCompleted: data => { const machines = data.machines const machineFound = machines.map(m => m.deviceId).includes(id) if (!machineFound) return history.push('/maintenance/machine-status') + + setLoading(false) } })