External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix missing details message in Topology view.

Browse Source
This commit is contained in:
Kia Lam 2022-09-16 14:03:38 -07:00 committed by Jeff Bradberry
parent 301807466d
commit 78cc9fb019
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
awx/ui/src/screens/TopologyView/MeshGraph.js
View File

@ -47,7 +47,7 @@ function MeshGraph({ data, showLegend, zoom, setShowZoomControls }) {
const [simulationProgress, setSimulationProgress] = useState(null);
const history = useHistory();
const {
result: { instance, instanceGroups },
result: { instance = {}, instanceGroups },
error: fetchError,
isLoading,
request: fetchDetails,
@ -68,12 +68,13 @@ function MeshGraph({ data, showLegend, zoom, setShowZoomControls }) {
result: {},
}
);
const { error: fetchInstanceError, dismissError } =
useDismissableError(fetchError);
useEffect(() => {
fetchDetails();
if (selectedNode) {
fetchDetails();
}
}, [selectedNode, fetchDetails]);
function updateNodeSVG(nodes) {
@ -383,33 +384,31 @@ function MeshGraph({ data, showLegend, zoom, setShowZoomControls }) {
<div id="chart" style={{ position: 'relative', height: '100%' }}>
{showLegend && <Legend />}
{instance && (
<>
{fetchInstanceError && (
<AlertModal
variant="error"
title={t`Error!`}
isOpen
onClose={dismissError}
>
{t`Failed to update instance.`}
<ErrorDetail error={fetchInstanceError} />
</AlertModal>
)}
<Tooltip
isNodeSelected={isNodeSelected}
renderNodeIcon={renderNodeIcon(selectedNode)}
selectedNode={selectedNode}
fetchInstance={fetchDetails}
instanceGroups={instanceGroups}
instanceDetail={instance}
isLoading={isLoading}
redirectToDetailsPage={() =>
redirectToDetailsPage(selectedNode, history)
}
/>
</>
<Tooltip
isNodeSelected={isNodeSelected}
renderNodeIcon={renderNodeIcon(selectedNode)}
selectedNode={selectedNode}
fetchInstance={fetchDetails}
instanceGroups={instanceGroups}
instanceDetail={instance}
isLoading={isLoading}
redirectToDetailsPage={() =>
redirectToDetailsPage(selectedNode, history)
}
/>
)}
<Loader className="simulation-loader" progress={simulationProgress} />
{fetchInstanceError && (
<AlertModal
variant="error"
title={t`Error!`}
isOpen
onClose={dismissError}
>
{t`Failed to get instance.`}
<ErrorDetail error={fetchInstanceError} />
</AlertModal>
)}
</div>
);
}