Refaktoring

src/pages/profile/flight/EditFlightPage.vue

@@ -16,7 +16,7 @@ import FlightFormNotes from "components/flights/form/FlightFormNotes.vue";
 import FlightFormPhotos from "components/flights/form/FlightFormPhotos.vue";
 import {usePhotosStore} from "stores/Photo";
 import PhotosList from "components/photos/PhotosList.vue";
-import {successObject} from "src/composables/dialog";
+import {successObject, warningObject} from "src/composables/dialog";
 import PhotoFormDialog from "components/photos/PhotoFormDialog.vue";
 import FlightFormTrack from "components/flights/form/FlightFormTrack.vue";
 import {fetchFlight, flight, loading} from "src/composables/objects/flight";
@@ -76,8 +76,18 @@ const handlePhotosUpload = (data) => {
     promises.push(usePhotosStore().upload(flightId, {photo}));
   }
 
-  Promise.all(promises).then(() => {
-    $q.notify(successObject("Úspěšně nahráno"));
+  Promise.allSettled(promises).then((values) => {
+    console.log(values.map(v => v.status));
+
+    const success = values.filter(v => v.status === 'fulfilled');
+    const failed = values.filter(v => v.status === 'rejected'); // TODO: nebo vse - success?
+
+    if (success.length > 0)
+      $q.notify(successObject(`Úspěšně nahráno ${success.length} fotek`));
+
+    if (failed.length > 0)
+      $q.notify(warningObject(`Nepovedlo se nahrát ${failed.length} fotek. Zde jsou důvody: ${failed.map(f => f.reason)}`));
+
     fetchFlight(flightId);
   }).finally(() => uploadInProgress.value = false);
 }
@@ -101,11 +111,11 @@ const deletePhoto = (id) => {
     <q-tab-panels v-model="formStep">
       <q-tab-panel name="basic">
         <FlightFormBasic
-            @save="handleFlightEdit"
-            :flight="flight"
-            :locations="locations"
-            :airports="airports"
-            :aircrafts="aircrafts"
+          @save="handleFlightEdit"
+          :flight="flight"
+          :locations="locations"
+          :airports="airports"
+          :aircrafts="aircrafts"
         />
       </q-tab-panel>
 
@@ -115,41 +125,41 @@ const deletePhoto = (id) => {
 
       <q-tab-panel name="track">
         <FlightFormTrack
-            v-if="locations"
-            :flight="flight"
-            :locations="locations"
-            @save="handleFlightEdit"
+          v-if="locations"
+          :flight="flight"
+          :locations="locations"
+          @save="handleFlightEdit"
         />
       </q-tab-panel>
 
       <q-tab-panel name="photos">
         <FlightFormPhotos
-            :flight="flight"
-            :is-request-pending="isRequestPending || uploadInProgress"
-            @save="handlePhotosUpload"
+          :flight="flight"
+          :is-request-pending="isRequestPending || uploadInProgress"
+          @save="handlePhotosUpload"
         />
 
         <PhotosList
-            :photos="flight.photos"
-            @edit="openPhotoEdit"
-            @batch-edit="openBatchPhotoForm"
-            @delete="deletePhoto"
+          :photos="flight.photos"
+          @edit="openPhotoEdit"
+          @batch-edit="openBatchPhotoForm"
+          @delete="deletePhoto"
         />
 
         <!-- Dialogs for photo edit -->
         <PhotoFormDialog
-            v-model="openEdit"
-            :locations="locations"
-            :photo="editPhoto"
-            @save="handlePhotoUpdate(flightId, $event)"
+          v-model="openEdit"
+          :locations="locations"
+          :photo="editPhoto"
+          @save="handlePhotoUpdate(flightId, $event)"
         />
 
         <BatchPhotoFormDialog
-            v-model="openBatchEdit"
-            :locations="locations"
-            :photos="editBatchPhotos"
-            @save="handleBatchPhotoEdit(flightId, $event)"
-            @delete="deletePhoto"
+          v-model="openBatchEdit"
+          :locations="locations"
+          :photos="editBatchPhotos"
+          @save="handleBatchPhotoEdit(flightId, $event)"
+          @delete="deletePhoto"
         />
       </q-tab-panel>
 

src/pages/profile/flight/FlightDetailPage.vue

@@ -8,7 +8,7 @@ import FlightBasicInfo from "components/flights/FlightBasicInfo.vue";
 import {copyToClipboard, useQuasar} from "quasar";
 import {successObject} from "src/composables/dialog";
 import {useFlightsStore} from "stores/Flights";
-import PhotoCarousel from "components/flights/PhotoCarousel.vue";
+import PhotoCarousel from "components/photos/PhotoCarousel.vue";
 import FlightTrackMap from "components/flights/FlightTrackMap.vue";
 import {useUserStore} from "stores/User";
 import {storeToRefs} from "pinia";

src/pages/public/FlightDetailPage.vue

@@ -2,7 +2,7 @@
 import {onMounted, watch} from "vue";
 import {fetchFlight, flight, flightName, loading} from "src/composables/objects/flight";
 import {useRoute} from "vue-router";
-import PhotoCarousel from "components/flights/PhotoCarousel.vue";
+import PhotoCarousel from "components/photos/PhotoCarousel.vue";
 import FlightTrackMap from "components/flights/FlightTrackMap.vue";
 import FlightBasicInfo from "components/flights/FlightBasicInfo.vue";
 import {useAppStore} from "stores/App";