Ne uplne otestovany prepis storu

src/pages/profile/flight/NewFlightPage.vue

@@ -1,28 +1,21 @@
 <script setup>
-import {onMounted, ref} from "vue";
+import {computed, onMounted, ref} from "vue";
 import {useAircraftsStore} from "stores/Aircrafts";
 import {useFlightsStore} from "stores/Flights";
 import {useRouter} from "vue-router";
 import {usePointsOfInterestStore} from "stores/PointsOfInterest";
 import {storeToRefs} from "pinia";
 import {useAirportsStore} from "stores/Airports";
+import {useAppStore} from "stores/App";
 import FlightFormSteps from "components/flights/form/FlightFormSteps.vue";
 import FlightFormBasic from "components/flights/form/FlightFormBasic.vue";
-import {useAppStore} from "stores/App";
-import {isRequestPending} from "src/composables/objects/flight";
 import FlightEditSkeleton from "components/flights/FlightEditSkeleton.vue";
 
-const loading = ref(true);
 onMounted(() => {
-  const promises = [
-    useAircraftsStore().fetch(),
-    usePointsOfInterestStore().fetch(),
-    useFlightsStore().fetch(),
-    useAirportsStore().fetch(),
-  ];
-
-  loading.value = true;
-  Promise.all(promises).finally(() => loading.value = false);
+  useAircraftsStore().fetch()
+  usePointsOfInterestStore().fetch()
+  useFlightsStore().fetch()
+  useAirportsStore().fetch()
 
   useAppStore().setPageTitle("Nový let");
   useAppStore().setBreadcrumbs([
@@ -31,9 +24,14 @@ onMounted(() => {
   ]);
 });
 
-const aircrafts = storeToRefs(useAircraftsStore()).items;
-const locations = storeToRefs(usePointsOfInterestStore()).items;
-const airports = storeToRefs(useAirportsStore()).items;
+const {isMutationRunning} = storeToRefs(useFlightsStore());
+const {aircrafts} = storeToRefs(useAircraftsStore());
+const {pointsOfInterest} = storeToRefs(usePointsOfInterestStore());
+const {airports} = storeToRefs(useAirportsStore());
+
+const loading = computed(() => [
+  useAircraftsStore().isQueryRunning, usePointsOfInterestStore().isQueryRunning, useAirportsStore().isQueryRunning
+].some(i => i.value))
 
 const router = useRouter();
 const handleSave = (formData) => {
@@ -49,11 +47,11 @@ const handleSave = (formData) => {
   <FlightEditSkeleton step="basic" v-if="loading"/>
   <template v-else>
     <FlightFormBasic
-      @save="handleSave"
-      :is-request-pending="isRequestPending"
-      :aircrafts="aircrafts"
-      :airports="airports"
-      :locations="locations"
+        @save="handleSave"
+        :is-request-pending="isMutationRunning"
+        :aircrafts="aircrafts"
+        :airports="airports"
+        :locations="pointsOfInterest"
     />
   </template>
 </template>