From 02a1fdf1d14a2bfa7c0780c88aa481b48280597a Mon Sep 17 00:00:00 2001
From: David Edler <david.edler@canonical.com>
Date: Mon, 17 Jun 2024 12:42:01 +0200
Subject: [PATCH] fix(network) show physical managed network state in case it
 is available, show error message if it fails to load

Signed-off-by: David Edler <david.edler@canonical.com>
---
 src/pages/networks/NetworkDetailOverview.tsx | 37 ++++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pages/networks/NetworkDetailOverview.tsx b/src/pages/networks/NetworkDetailOverview.tsx
index c10b609a0a..aff4718fa5 100644
--- a/src/pages/networks/NetworkDetailOverview.tsx
+++ b/src/pages/networks/NetworkDetailOverview.tsx
@@ -1,6 +1,6 @@
 import { FC, useEffect } from "react";
 import { Link, useParams } from "react-router-dom";
-import { Col, Row } from "@canonical/react-components";
+import { Col, Notification, Row } from "@canonical/react-components";
 import useEventListener from "@use-it/event-listener";
 import { updateMaxHeight } from "util/updateMaxHeight";
 import ItemName from "components/ItemName";
@@ -25,10 +25,12 @@ const NetworkDetailOverview: FC<Props> = ({ network }) => {
     return <>Missing project</>;
   }
 
-  const isPhysicalManagedNetwork =
-    network.type === "physical" && network.managed;
-
-  const { data: networkState, isLoading } = useQuery({
+  const {
+    data: networkState,
+    isLoading,
+    error: networkStateError,
+    isError: isNetworkStateError,
+  } = useQuery({
     queryKey: [
       queryKeys.projects,
       project,
@@ -36,8 +38,8 @@ const NetworkDetailOverview: FC<Props> = ({ network }) => {
       network.name,
       queryKeys.state,
     ],
+    retry: 0, // physical managed networks can sometimes 404, show error right away and don't retry
     queryFn: () => fetchNetworkState(network.name, project),
-    enabled: !isPhysicalManagedNetwork,
   });
 
   const updateContentHeight = () => {
@@ -96,12 +98,17 @@ const NetworkDetailOverview: FC<Props> = ({ network }) => {
           </table>
         </Col>
       </Row>
-      {!isPhysicalManagedNetwork && (
-        <Row className="section">
-          <Col size={3}>
-            <h2 className="p-heading--5">Status</h2>
-          </Col>
-          <Col size={7}>
+      <Row className="section">
+        <Col size={3}>
+          <h2 className="p-heading--5">Status</h2>
+        </Col>
+        <Col size={7}>
+          {isNetworkStateError && (
+            <Notification severity="negative" borderless>
+              Could not load network state: {networkStateError.message}
+            </Notification>
+          )}
+          {!isNetworkStateError && (
             <table>
               <tbody>
                 <tr className="list-wrapper">
@@ -128,9 +135,9 @@ const NetworkDetailOverview: FC<Props> = ({ network }) => {
                 </tr>
               </tbody>
             </table>
-          </Col>
-        </Row>
-      )}
+          )}
+        </Col>
+      </Row>
       <Row className="usage list-wrapper">
         <Col size={3}>
           <h2 className="p-heading--5">Usage ({usageCount})</h2>