From cfb4dbdc1188a9b680655598f58324cfc102b6d5 Mon Sep 17 00:00:00 2001
From: kudukm <kuduk.marcin@gmail.com>
Date: Fri, 15 May 2026 17:14:38 +0200
Subject: [PATCH 1/7] (SKY-40) Add GET /api/aircraft API request

---
 skyroster-frontend/src/stores/aircraft.js     | 47 ++++++++++++++++---
 skyroster-frontend/src/views/AircraftView.vue |  6 ++-
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/skyroster-frontend/src/stores/aircraft.js b/skyroster-frontend/src/stores/aircraft.js
index a38496b..5b1c35f 100644
--- a/skyroster-frontend/src/stores/aircraft.js
+++ b/skyroster-frontend/src/stores/aircraft.js
@@ -1,19 +1,51 @@
-import { ref, computed } from 'vue'
-import { defineStore } from 'pinia'
-import { initialAircraft, AIRCRAFT_TYPES, BASES, AVAILABILITY_STATUSES } from '../data/mockData'
+import {computed, ref} from 'vue'
+import {defineStore} from 'pinia'
+import apiClient from '../api/axios'
+import {AIRCRAFT_TYPES, AVAILABILITY_STATUSES, BASES} from '../data/mockData'
+
+async function getAircraftList() {
+  const res = await apiClient.get('http://localhost:8001/api/aircraft', {
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  });
+
+  if (!res.ok) {
+    let errorData = {};
+
+    try {
+      errorData = await res.json();
+    } catch {
+      errorData = {message: 'Failed to fetch aircraft data'};
+    }
+
+    const error = new Error(
+      errorData.message || 'Failed to fetch aircraft data'
+    );
+
+    error.code = errorData.code;
+    throw error;
+  }
+
+  return await res.json();
+}
 
 export const useAircraftStore = defineStore('aircraft', () => {
-  const aircraft = ref([...initialAircraft])
+  const aircraft = ref([]);
   const aircraftTypeOptions = AIRCRAFT_TYPES
   const baseOptions = BASES
   const availabilityOptions = AVAILABILITY_STATUSES
 
   const aircraftCount = computed(() => aircraft.value.length)
-  
-  const availableAircraft = computed(() => 
+
+  const availableAircraft = computed(() =>
     aircraft.value.filter(a => a.dostepnosc === 'dostepny')
   )
 
+  async function fetchAircraftList() {
+    aircraft.value = await getAircraftList();
+  }
+
   function generateId() {
     const maxId = aircraft.value.reduce((max, a) => {
       const num = parseInt(a.id.replace('A', ''))
@@ -74,6 +106,7 @@ export const useAircraftStore = defineStore('aircraft', () => {
     deleteAircraft,
     getAircraftById,
     getAircraftDisplay,
-    getAvailabilityInfo
+    getAvailabilityInfo,
+    fetchAircraftList
   }
 })
diff --git a/skyroster-frontend/src/views/AircraftView.vue b/skyroster-frontend/src/views/AircraftView.vue
index 8afc6da..b5f99e4 100644
--- a/skyroster-frontend/src/views/AircraftView.vue
+++ b/skyroster-frontend/src/views/AircraftView.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue'
+import {onMounted, ref} from 'vue'
 import { useAircraftStore } from '../stores/aircraft'
 import { useToast } from 'primevue/usetoast'
 import { useConfirm } from 'primevue/useconfirm'
@@ -19,6 +19,10 @@ const dialogVisible = ref(false)
 const selectedAircraft = ref(null)
 const isEditMode = ref(false)
 
+onMounted(async () => {
+  await aircraftStore.fetchAircraftList();
+});
+
 function getTypeLabel(typeCode) {
   const type = aircraftStore.aircraftTypeOptions.find(t => t.value === typeCode)
   return type ? type.label : typeCode

From 56536e004d121c988edb1a0cc523145e305651fd Mon Sep 17 00:00:00 2001
From: kudukm <kuduk.marcin@gmail.com>
Date: Sat, 16 May 2026 10:01:46 +0200
Subject: [PATCH 2/7] (SKY-40) Implement aircraft table filling

---
 skyroster-frontend/src/stores/aircraft.js     | 32 ++++++++-----------
 skyroster-frontend/src/views/AircraftView.vue |  4 +--
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/skyroster-frontend/src/stores/aircraft.js b/skyroster-frontend/src/stores/aircraft.js
index 5b1c35f..335618e 100644
--- a/skyroster-frontend/src/stores/aircraft.js
+++ b/skyroster-frontend/src/stores/aircraft.js
@@ -10,24 +10,7 @@ async function getAircraftList() {
     }
   });
 
-  if (!res.ok) {
-    let errorData = {};
-
-    try {
-      errorData = await res.json();
-    } catch {
-      errorData = {message: 'Failed to fetch aircraft data'};
-    }
-
-    const error = new Error(
-      errorData.message || 'Failed to fetch aircraft data'
-    );
-
-    error.code = errorData.code;
-    throw error;
-  }
-
-  return await res.json();
+  return res.data;
 }
 
 export const useAircraftStore = defineStore('aircraft', () => {
@@ -43,7 +26,18 @@ export const useAircraftStore = defineStore('aircraft', () => {
   )
 
   async function fetchAircraftList() {
-    aircraft.value = await getAircraftList();
+    try {
+      const response = await getAircraftList();
+
+      aircraft.value = response.map(aircraft => ({
+        id: aircraft.id,
+        rejestracja: aircraft.registrationNumber,
+        typ: aircraft.aircraftType.icaoCode,
+        baza: aircraft.operationalBase.icaoCode
+      }));
+    } catch (error) {
+      console.error(error);
+    }
   }
 
   function generateId() {
diff --git a/skyroster-frontend/src/views/AircraftView.vue b/skyroster-frontend/src/views/AircraftView.vue
index b5f99e4..2b4036d 100644
--- a/skyroster-frontend/src/views/AircraftView.vue
+++ b/skyroster-frontend/src/views/AircraftView.vue
@@ -110,11 +110,11 @@ function confirmDelete(aircraft) {
           {{ getBaseLabel(data.baza) }}
         </template>
       </Column>
-      <Column field="dostepnosc" header="Dostępność" sortable>
+<!--      <Column field="dostepnosc" header="Dostępność" sortable>
         <template #body="{ data }">
           <Tag :value="getAvailabilityLabel(data.dostepnosc)" :severity="getAvailabilitySeverity(data.dostepnosc)" />
         </template>
-      </Column>
+      </Column>-->
       <Column header="Akcje" :exportable="false" style="min-width: 8rem">
         <template #body="{ data }">
           <div class="action-buttons">

From 9ea871c0044a652d385a74acce37d27edd34f893 Mon Sep 17 00:00:00 2001
From: kudukm <kuduk.marcin@gmail.com>
Date: Sat, 16 May 2026 10:47:14 +0200
Subject: [PATCH 3/7] (SKY-40) Implement aircraft deleting

---
 skyroster-frontend/src/stores/aircraft.js     | 42 ++++++++++++++++---
 skyroster-frontend/src/views/AircraftView.vue | 24 +++++++++--
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/skyroster-frontend/src/stores/aircraft.js b/skyroster-frontend/src/stores/aircraft.js
index 335618e..fba4720 100644
--- a/skyroster-frontend/src/stores/aircraft.js
+++ b/skyroster-frontend/src/stores/aircraft.js
@@ -66,13 +66,43 @@ export const useAircraftStore = defineStore('aircraft', () => {
     return null
   }
 
-  function deleteAircraft(id) {
-    const index = aircraft.value.findIndex(a => a.id === id)
-    if (index !== -1) {
-      aircraft.value.splice(index, 1)
-      return true
+  async function deleteAircraft(id) {
+    try {
+      const res = await apiClient.delete(
+        `http://localhost:8001/api/aircraft/${id}`,
+        {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }
+      );
+
+      if (res.status >= 200 && res.status < 300) {
+        const index = aircraft.value.findIndex(a => a.id === id);
+
+        if (index !== -1) {
+          aircraft.value.splice(index, 1);
+        }
+
+        return {
+          success: true
+        };
+      }
+    } catch (error) {
+      console.error(error);
+
+      return {
+        success: false,
+        message:
+          error.response?.data?.message ||
+          'Failed to delete aircraft'
+      };
     }
-    return false
+
+    return {
+      success: false,
+      message: 'Unexpected error occurred'
+    };
   }
 
   function getAircraftById(id) {
diff --git a/skyroster-frontend/src/views/AircraftView.vue b/skyroster-frontend/src/views/AircraftView.vue
index 2b4036d..9c7a294 100644
--- a/skyroster-frontend/src/views/AircraftView.vue
+++ b/skyroster-frontend/src/views/AircraftView.vue
@@ -72,11 +72,27 @@ function confirmDelete(aircraft) {
     icon: 'pi pi-exclamation-triangle',
     acceptLabel: 'Tak, usuń',
     rejectLabel: 'Anuluj',
-    accept: () => {
-      aircraftStore.deleteAircraft(aircraft.id)
-      toast.add({ severity: 'success', summary: 'Sukces', detail: 'Samolot został usunięty', life: 3000 })
+
+    accept: async () => {
+      const result = await aircraftStore.deleteAircraft(aircraft.id);
+
+      if (result.success) {
+        toast.add({
+          severity: 'success',
+          summary: 'Sukces',
+          detail: 'Samolot został usunięty',
+          life: 3000
+        });
+      } else {
+        toast.add({
+          severity: 'error',
+          summary: 'Błąd',
+          detail: result.message,
+          life: 5000
+        });
+      }
     }
-  })
+  });
 }
 </script>
 

From bea0e234e43040c34a0aeaf929ee23dbdd8bbbf4 Mon Sep 17 00:00:00 2001
From: kudukm <kuduk.marcin@gmail.com>
Date: Sat, 16 May 2026 11:43:13 +0200
Subject: [PATCH 4/7] (SKY-40) SchedulerView repaired

---
 skyroster-frontend/src/views/SchedulerView.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/skyroster-frontend/src/views/SchedulerView.vue b/skyroster-frontend/src/views/SchedulerView.vue
index 4667fd2..601e66b 100644
--- a/skyroster-frontend/src/views/SchedulerView.vue
+++ b/skyroster-frontend/src/views/SchedulerView.vue
@@ -25,8 +25,9 @@ const selectedFlight = ref(null)
 
 const flightForm = ref(getEmptyForm())
 
-onMounted(() => {
-  flightsStore.loadPlanningSchedules()
+onMounted(async () => {
+  await aircraftStore.fetchAircraftList();
+  await flightsStore.loadPlanningSchedules()
 })
 
 const baseOptions = BASES.map(b => ({

From 0618a68263250c65b1a12e65b07ca27e32fd3a22 Mon Sep 17 00:00:00 2001
From: kudukm <kuduk.marcin@gmail.com>
Date: Sat, 16 May 2026 11:57:34 +0200
Subject: [PATCH 5/7] (SKY-40) CI/CD warning suppression

---
 skyroster-frontend/src/views/AircraftView.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/skyroster-frontend/src/views/AircraftView.vue b/skyroster-frontend/src/views/AircraftView.vue
index 9c7a294..5ebd602 100644
--- a/skyroster-frontend/src/views/AircraftView.vue
+++ b/skyroster-frontend/src/views/AircraftView.vue
@@ -1,14 +1,14 @@
 <script setup>
 import {onMounted, ref} from 'vue'
-import { useAircraftStore } from '../stores/aircraft'
-import { useToast } from 'primevue/usetoast'
-import { useConfirm } from 'primevue/useconfirm'
+import {useAircraftStore} from '../stores/aircraft'
+import {useToast} from 'primevue/usetoast'
+import {useConfirm} from 'primevue/useconfirm'
 import DataTable from 'primevue/datatable'
 import Column from 'primevue/column'
 import Button from 'primevue/button'
 import Toast from 'primevue/toast'
 import ConfirmDialog from 'primevue/confirmdialog'
-import Tag from 'primevue/tag'
+// import Tag from 'primevue/tag'
 import AircraftDialog from '../components/aircraft/AircraftDialog.vue'
 
 const aircraftStore = useAircraftStore()
@@ -33,7 +33,7 @@ function getBaseLabel(baseCode) {
   return base ? base.label : baseCode
 }
 
-function getAvailabilitySeverity(status) {
+/*function getAvailabilitySeverity(status) {
   const info = aircraftStore.getAvailabilityInfo(status)
   return info ? info.severity : 'secondary'
 }
@@ -41,7 +41,7 @@ function getAvailabilitySeverity(status) {
 function getAvailabilityLabel(status) {
   const info = aircraftStore.getAvailabilityInfo(status)
   return info ? info.label : status
-}
+}*/
 
 function openAddDialog() {
   selectedAircraft.value = null

From c92d87728b39f9335f42fc151a05a75e20a22e10 Mon Sep 17 00:00:00 2001
From: kudukm <57731221+kudukm@users.noreply.github.com>
Date: Sat, 16 May 2026 12:51:16 +0200
Subject: [PATCH 6/7] Update API Endpoints addresses changed to relative paths

---
 skyroster-frontend/src/stores/aircraft.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skyroster-frontend/src/stores/aircraft.js b/skyroster-frontend/src/stores/aircraft.js
index fba4720..1e0408f 100644
--- a/skyroster-frontend/src/stores/aircraft.js
+++ b/skyroster-frontend/src/stores/aircraft.js
@@ -4,7 +4,7 @@ import apiClient from '../api/axios'
 import {AIRCRAFT_TYPES, AVAILABILITY_STATUSES, BASES} from '../data/mockData'
 
 async function getAircraftList() {
-  const res = await apiClient.get('http://localhost:8001/api/aircraft', {
+  const res = await apiClient.get('/aircraft', {
     headers: {
       'Content-Type': 'application/json'
     }
@@ -69,7 +69,7 @@ export const useAircraftStore = defineStore('aircraft', () => {
   async function deleteAircraft(id) {
     try {
       const res = await apiClient.delete(
-        `http://localhost:8001/api/aircraft/${id}`,
+        `/aircraft/${id}`,
         {
           headers: {
             'Content-Type': 'application/json'

From 9aa7a77e86af98c789629a9d6e5e805ea9611cb3 Mon Sep 17 00:00:00 2001
From: kudukm <57731221+kudukm@users.noreply.github.com>
Date: Sat, 16 May 2026 12:58:02 +0200
Subject: [PATCH 7/7] Asynchronously fetch data from endpoints

---
 skyroster-frontend/src/views/SchedulerView.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/skyroster-frontend/src/views/SchedulerView.vue b/skyroster-frontend/src/views/SchedulerView.vue
index 601e66b..bb4de5e 100644
--- a/skyroster-frontend/src/views/SchedulerView.vue
+++ b/skyroster-frontend/src/views/SchedulerView.vue
@@ -26,8 +26,7 @@ const selectedFlight = ref(null)
 const flightForm = ref(getEmptyForm())
 
 onMounted(async () => {
-  await aircraftStore.fetchAircraftList();
-  await flightsStore.loadPlanningSchedules()
+  await Promise.all([aircraftStore.fetchAircraftList(), flightsStore.loadPlanningSchedules()]);
 })
 
 const baseOptions = BASES.map(b => ({