use effect fix

kubeshop · Aug 4, 2023 · e27bf1a · e27bf1a
1 parent c498db1
commit e27bf1a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -94,16 +94,16 @@ const App: React.FC<AppProps> = ({plugins}) => {
   useEffect(() => {
     // Do not fire the effect if new endpoint is just being set up,
     // or it can't be changed.
-    if (location.pathname === '/apiEndpoint' || isApiEndpointLocked()) {
+    if (location.pathname === '/apiEndpoint') {
       return;
     }
 
-    if (!apiEndpoint) {
+    if (!apiEndpoint && !isApiEndpointLocked()) {
       setEndpointModalState(true);
       return;
     }
 
-    getApiDetails(apiEndpoint)
+    getApiDetails(apiEndpoint!)
       .then(setClusterDetails)
       .catch(() => {
         // Handle race condition
@@ -113,7 +113,9 @@ const App: React.FC<AppProps> = ({plugins}) => {
 
         // Display popup
         notificationCall('failed', 'Could not receive data from the specified API endpoint');
-        setEndpointModalState(true);
+        if (isApiEndpointLocked()) {
+          setEndpointModalState(true);
+        }
       });
   }, [apiEndpoint]);