Integration finished

2025-07-03 21:22:06 +02:00
parent 8952aba12d
commit 09397edef9
15 changed files with 678 additions and 611 deletions
@@ -10,18 +10,17 @@ import ActionBar from '../actionbar/ActionBar';
 interface SBEntryProps {
  WASMData: WASMDataPax;
  loadingState: LoadingState;
-  username: string;
  setLoadingState: (newState: LoadingState) => void;
 }

-const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, username, setLoadingState }) => {
+const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, setLoadingState }) => {
  const [CGTarget, setCGTarget] = useState(WASMData.targetPayload.CGTarget);
  const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
  const [fuelEnabled, setFuelEnabled] = useState(true);
  const [SBInFlight, setSBInFlight] = useState(false);

  // FROM EFB
-  const simBrief = useSelector((state) => state.simbrief);
+  const simBrief = useSelector((state) => state.simbrief.plan);

  const ZFW = () => {
    if (loadingState !== 'loaded' && !GSXActive()) return Math.round(WASMData.targetPayload.total);
@@ -59,10 +58,12 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, username, setLoa
    }
  };

-  const handleSB = async () => {
+  useEffect(() => {
+    if (!simBrief) return;
+
    setSBInFlight(true);

-    const SBResponse = await ImportFlightPlanKH(
+    const SBResponse = ImportFlightPlanKH(
      simBrief,
      WASMData.limits.maxZFW,
      WASMData.limits.maxTOW,
@@ -75,11 +76,11 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, username, setLoa
      return;
    }

-    updateData(undefined, SBResponse.message);
+    updateData(undefined, SBResponse.message as SimBrief);

-    setFuel(parseFloat(SBResponse.message.fuel as unknown as string) ?? 0);
+    setFuel(parseFloat((SBResponse.message as SimBrief).fuel as unknown as string) ?? 0);
    setSBInFlight(false);
-  };
+  }, [simBrief]);

  useEffect(
    () =>
@@ -100,8 +101,8 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, username, setLoa
  return (
    <>
      <div className="block flex w-full flex-col opacity-100 transition-opacity duration-150 ease-linear mb-4">
-        <div className="flex w-full items-center justify-between text-xs">
-          <div className="flex w-full items-center justify-between rounded-md bg-zinc-600 p-2 px-4">
+        <div className="flex w-full items-center justify-between rounded-md bg-zinc-600 p-2 px-4">
+          <div className="flex w-full items-center justify-between text-xs">
            <label>Fuel ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
            <input
              type="text"
@@ -132,79 +133,89 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, username, setLoa
      </div>

      <div className="block flex w-full flex-col opacity-100 transition-opacity duration-150 ease-linear mb-4">
-        <div className="relative flex w-full items-center justify-between rounded-t-md bg-zinc-600 p-2 px-4">
-          <label>Planned ZFW ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
-          <input
-            type="text"
-            placeholder=""
-            className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
-            value={WASMData.sbPlanned.ZFW}
-            disabled
-          />
+        <div className="flex w-full items-center justify-between rounded-t-md bg-zinc-600 p-2 px-4">
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>Planned ZFW ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
+            <input
+              type="text"
+              placeholder=""
+              className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
+              value={WASMData.sbPlanned.ZFW}
+              disabled
+            />
+          </div>
        </div>
-        <div className="relative flex w-full items-center justify-between bg-zinc-700 p-2 px-4">
-          <label>Planned GW ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
-          <input
-            type="text"
-            placeholder=""
-            className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
-            value={WASMData.sbPlanned.GW}
-            disabled
-          />
+        <div className="flex w-full items-center justify-between bg-zinc-700 p-2 px-4">
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>Planned GW ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
+            <input
+              type="text"
+              placeholder=""
+              className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
+              value={WASMData.sbPlanned.GW}
+              disabled
+            />
+          </div>
        </div>
-        <div className="relative flex w-full items-center justify-between rounded-b-md bg-zinc-600 p-2 px-4">
-          <label>
-            Target ZFWCG ({WASMData.limits.minCG} - {WASMData.limits.maxCG})
-          </label>
-          <CGSelect
-            minCG={WASMData.limits.minCG}
-            maxCG={WASMData.limits.maxCG}
-            value={CGTarget}
-            disabled={loadingState !== 'preview' || GSXActive()}
-            increase={() =>
-              setCGTarget((prev) => {
-                const _new = prev + 0.1;
-                updateData(_new);
-                return _new;
-              })
-            }
-            decrease={() =>
-              setCGTarget((prev) => {
-                const _new = prev - 0.1;
-                updateData(_new);
-                return _new;
-              })
-            }
-          />
+        <div className="flex w-full items-center justify-between rounded-b-md bg-zinc-600 p-2 px-4">
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>
+              Target ZFWCG ({WASMData.limits.minCG} - {WASMData.limits.maxCG})
+            </label>
+            <CGSelect
+              minCG={WASMData.limits.minCG}
+              maxCG={WASMData.limits.maxCG}
+              value={CGTarget}
+              disabled={loadingState !== 'preview' || GSXActive()}
+              increase={() =>
+                setCGTarget((prev) => {
+                  const _new = prev + 0.1;
+                  updateData(_new);
+                  return _new;
+                })
+              }
+              decrease={() =>
+                setCGTarget((prev) => {
+                  const _new = prev - 0.1;
+                  updateData(_new);
+                  return _new;
+                })
+              }
+            />
+          </div>
        </div>
      </div>

      <div className="block flex w-full flex-col opacity-100 transition-opacity duration-150 ease-linear mb-4">
-        <div className="relative flex w-full items-center justify-between rounded-t-md bg-zinc-600 p-2 px-4">
-          <label>
-            {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} ZFW (
-            {WASMData.userData.isImperial ? 'lbs' : 'kg'})
-          </label>
-          <input
-            type="text"
-            placeholder=""
-            className={`w-1/2 rounded-lg border ${ZFWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
-            disabled
-            value={ZFW()}
-          />
+        <div className="flex w-full items-center justify-between rounded-t-md bg-zinc-600 p-2 px-4">
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>
+              {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} ZFW (
+              {WASMData.userData.isImperial ? 'lbs' : 'kg'})
+            </label>
+            <input
+              type="text"
+              placeholder=""
+              className={`w-1/2 rounded-lg border ${ZFWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
+              disabled
+              value={ZFW()}
+            />
+          </div>
        </div>
-        <div className="relative flex w-full items-center justify-between rounded-b-md bg-zinc-700 p-2 px-4">
-          <label>
-            {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} GW (
-            {WASMData.userData.isImperial ? 'lbs' : 'kg'})
-          </label>
-          <input
-            type="text"
-            placeholder=""
-            className={`w-1/2 rounded-lg border ${GWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
-            disabled
-            value={GW()}
-          />
+        <div className="flex w-full items-center justify-between rounded-b-md bg-zinc-700 p-2 px-4">
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>
+              {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} GW (
+              {WASMData.userData.isImperial ? 'lbs' : 'kg'})
+            </label>
+            <input
+              type="text"
+              placeholder=""
+              className={`w-1/2 rounded-lg border ${GWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
+              disabled
+              value={GW()}
+            />
+          </div>
        </div>
      </div>

@@ -212,8 +223,6 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, username, setLoa
        loadingState={loadingState}
        loadDisabled={!GWValid() || SBInFlight}
        GSXSync={WASMData.options.GSXSync}
-        GSXActive={GSXActive()}
-        importSB={handleSB}
        load={() => {
          setLoadingState('loaded');