fix: simbrief auto-import spam and chart control (#8697)

* fix: simbrief auto-import spam * fix: chart control
flybywiresim · Jun 25, 2024 · c7d04da · c7d04da
1 parent c6c1386
commit c7d04da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/fbw-common/src/systems/instruments/src/EFB/Apis/Navigraph/Components/Authentication.tsx b/fbw-common/src/systems/instruments/src/EFB/Apis/Navigraph/Components/Authentication.tsx
@@ -28,21 +28,25 @@ export type NavigraphAuthInfo =
     };
 
 export const useNavigraphAuthInfo = (): NavigraphAuthInfo => {
+  const [info, setInfo] = useState<NavigraphAuthInfo>({ loggedIn: false });
+
   const navigraphAuth = useNavigraphAuth();
 
-  if (navigraphAuth.user) {
-    return {
+  if (navigraphAuth.user && info.loggedIn === false) {
+    setInfo({
       loggedIn: true,
       username: navigraphAuth.user.preferred_username,
       subscriptionStatus: [NAVIGRAPH_SUBSCRIPTION_CHARTS, NAVIGRAPH_SUBSCRIPTION_FMSDATA].every((it) =>
         navigraphAuth.user.subscriptions.includes(it),
       )
         ? NavigraphSubscriptionStatus.Unlimited
         : NavigraphSubscriptionStatus.Unknown,
-    };
+    });
+  } else if (!navigraphAuth.user && info.loggedIn === true) {
+    setInfo({ loggedIn: false });
   }
 
-  return { loggedIn: false };
+  return info;
 };
 
 interface LoadingProps {

diff --git a/fbw-common/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx b/fbw-common/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx
@@ -151,7 +151,7 @@ export const FlightWidget = () => {
     ) {
       fetchData();
     }
-  }, [navigraphAuthInfo]);
+  }, [navigraphAuthInfo.loggedIn]);
 
   const simbriefDataLoaded = isSimbriefDataLoaded();
 

diff --git a/fbw-common/src/systems/instruments/src/EFB/Navigation/Navigation.tsx b/fbw-common/src/systems/instruments/src/EFB/Navigation/Navigation.tsx
@@ -104,7 +104,7 @@ export const ChartViewer = () => {
   const navigraphAuth = useNavigraphAuth();
 
   const ref = useRef<HTMLDivElement>(null);
-  const chartRef = useRef<HTMLDivElement>(null);
+  const chartRef = useRef<HTMLImageElement>(null);
 
   const [aircraftIconVisible, setAircraftIconVisible] = useState(false);
   const [aircraftIconPosition, setAircraftIconPosition] = useState<{ x: number; y: number; r: number }>({
@@ -555,9 +555,10 @@ export const ChartViewer = () => {
                     </svg>
                   )}
 
-                  <div ref={chartRef}>
+                  <div>
                     {chartLightUrl && (
                       <img
+                        ref={chartRef}
                         className="absolute left-0 w-full select-none transition duration-100"
                         draggable={false}
                         src={chartLightUrl}