Merge branch 'main' into update-logbook-table-pagesize

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "2.1.3",
+  "version": "2.0.2",
   "description": "",
   "author": "",
   "private": true,

api/src/interfaces/customJwtPayload.interface.ts

@@ -0,0 +1,5 @@
+import { JwtPayload } from "jwt-decode";
+
+export interface CustomJwtPayload extends JwtPayload {
+  permissions: string[];
+}

api/src/log/log.controller.spec.ts

@@ -13,8 +13,7 @@ describe('LogController', () => {
     create: jest.fn(),
     delete: jest.fn(),
     find: jest.fn(),
-    findLogsWithCount: jest.fn(),
-    findLogsWithTracks: jest.fn(),
+    findAll: jest.fn(),
     update: jest.fn()
   }
 
@@ -39,41 +38,18 @@ describe('LogController', () => {
   })
 
   it('find => should find a log by id', async () => {
+    const id: string = '95834f84-0a02-44d3-884e-a20237adeca0';
     const log = {
-      id: '95834f84-0a02-44d3-884e-a20237adeca0',
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test',
-      tracks: []
+
     } as LogEntity
 
     jest.spyOn(mockLogService, 'find').mockReturnValue(log);
 
-    const result = await controller.find(log.id);
+    const result = await controller.find(id);
 
     expect(result).toEqual(log);
     expect(mockLogService.find).toHaveBeenCalled();
-    expect(mockLogService.find).toHaveBeenCalledWith(log.id);
+    expect(mockLogService.find).toHaveBeenCalledWith(id);
   })
 
   it('find => should fail to find a log by id', async () => {
@@ -93,201 +69,42 @@ describe('LogController', () => {
     }
   })
 
-  it('findLogsWithCount => should find logs with count', async () => {
+  it('findAll => should find all logs', async () => {
+    const id: string = '95834f84-0a02-44d3-884e-a20237adeca0';
     const log = {
-      id: '95834f84-0a02-44d3-884e-a20237adeca0',
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test',
-      tracks: [
-        {
-          "id": "4645ce0c-6fd7-432c-8089-777a7139cf7e",
-          "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KANE_KONA_20250628.kml",
-          "order": 1
-        },
-        {
-          "id": "5ce26898-a18b-46f4-b989-3fb7acdace08",
-          "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KONA_KANE_20250628.kml",
-          "order": 2
-        }
-      ]
+
     } as LogEntity;
     const logs = [log]
-    const count = 1
-    const morePages = false
 
-    jest.spyOn(mockLogService, 'findLogsWithCount').mockReturnValue({
-      entities: logs, 
-      total: count, 
-      hasNextPage: morePages
-    });
+    jest.spyOn(mockLogService, 'findAll').mockReturnValue(logs);
 
-    const {entities, total, hasNextPage} = await controller.findLogsWithCount();
+    const result = await controller.findAll();
 
-    expect(entities).toEqual(logs);
-    expect(total).toEqual(count);
-    expect(hasNextPage).toEqual(morePages)
-    expect(mockLogService.findLogsWithCount).toHaveBeenCalled();
+    expect(result).toEqual(logs);
+    expect(mockLogService.findAll).toHaveBeenCalled();
   })
 
-  it('findLogsWithCount => should fail to find logs with count', async () => {
-    jest.spyOn(mockLogService, 'findLogsWithCount').mockRejectedValue(new Error('Logs not found'))
+  it('findAll => should fail to find all logs', async () => {
+    jest.spyOn(mockLogService, 'findAll').mockRejectedValue(new Error('Logs not found'))
 
     try {
-      await controller.findLogsWithCount();
+      await controller.findAll();
 
-      fail('findLogsWithCount did not throw error');
+      fail('findAll did not throw error');
     } catch (error) {
       expect(error).toBeInstanceOf(Error);
-      expect(mockLogService.findLogsWithCount).toHaveBeenCalled();
-      expect(mockLogService.findLogsWithCount).rejects.toThrow('Logs not found')
-    }
-  })
-
-  it('findLogsWithTracks => should find logs with tracks', async () => {
-    const log = {
-      id: '95834f84-0a02-44d3-884e-a20237adeca0',
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test',
-      tracks: [
-        {
-            "id": "4645ce0c-6fd7-432c-8089-777a7139cf7e",
-            "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KANE_KONA_20250628.kml",
-            "order": 1
-        },
-        {
-            "id": "5ce26898-a18b-46f4-b989-3fb7acdace08",
-            "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KONA_KANE_20250628.kml",
-            "order": 2
-        }
-      ]
-    } as LogEntity;
-    const logs = [log]
-    const count = 1
-    const morePages = false
-
-    jest.spyOn(mockLogService, 'findLogsWithTracks').mockReturnValue({
-      entities: logs, 
-      total: count, 
-      hasNextPage: morePages
-  });
-
-    const {entities, total, hasNextPage} = await controller.findLogsWithTracks();
-
-    expect(entities).toEqual(logs);
-    expect(total).toEqual(count);
-    expect(hasNextPage).toEqual(morePages)
-    expect(mockLogService.findLogsWithTracks).toHaveBeenCalled();
-  })
-
-  it('findLogsWithCount => should fail to find logs with tracks', async () => {
-    jest.spyOn(mockLogService, 'findLogsWithTracks').mockRejectedValue(new Error('Logs not found'))
-
-    try {
-      await controller.findLogsWithTracks();
-
-      fail('findLogsWithTracks did not throw error');
-    } catch (error) {
-      expect(error).toBeInstanceOf(Error);
-      expect(mockLogService.findLogsWithTracks).toHaveBeenCalled();
-      expect(mockLogService.findLogsWithTracks).rejects.toThrow('Logs not found')
+      expect(mockLogService.findAll).toHaveBeenCalled();
+      expect(mockLogService.findAll).rejects.toThrow('Logs not found')
     }
   })
 
   it('create => should create a new log', async () => {
     const logDto = {
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test'
+
     } as LogDto;
 
     const log = {
-      id: '95834f84-0a02-44d3-884e-a20237adeca0',
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test',
-      tracks: []
+
     } as LogEntity;
 
     jest.spyOn(mockLogService, 'create').mockReturnValue(log);
@@ -299,31 +116,9 @@ describe('LogController', () => {
     expect(result).toEqual(log);
   })
 
-  it('create => should fail to create a new log', async () => {
+  it('create => should failt to create a new log', async () => {
     const logDto = {
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test'
+
     } as LogDto;
 
     jest.spyOn(mockLogService, 'create').mockRejectedValue(new Error('Log failed to create'))
@@ -343,29 +138,7 @@ describe('LogController', () => {
   it('update => should update an existing log', async () => {
     const id: string = '95834f84-0a02-44d3-884e-a20237adeca0';
     const logDto = {
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test'
+
     } as LogDto
 
     jest.spyOn(mockLogService, 'update').mockReturnValue(logDto);
@@ -380,29 +153,7 @@ describe('LogController', () => {
   it('update => should fail to update an exising log', async () => {
     const id: string = '95834f84-0a02-44d3-884e-a20237adeca0';
     const logDto = {
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test'
+
     } as LogDto;
 
     jest.spyOn(mockLogService, 'update').mockRejectedValue(new Error('Log failed to update'))

api/src/log/log.controller.ts

@@ -7,7 +7,6 @@ import {
   Param,
   Post,
   Put,
-  Query,
   UseGuards,
   UseInterceptors
 } from '@nestjs/common';
@@ -20,7 +19,6 @@ import { LogInterceptor } from './log.interceptor';
 import { FileService } from '../file/file.service';
 import { DeleteResult, InsertResult, UpdateResult } from 'typeorm';
 import { Reflector } from '@nestjs/core';
-import { Logs } from './logs.interface';
 
 const reflector = new Reflector();
 
@@ -32,30 +30,7 @@ export class LogController {
     private readonly logService: LogService
   ) {}
 
-  @Get()
-  @Public()
-  async findLogsWithCount(@Query('skip') skip?, @Query('take') take?: number,): Promise<Logs> {
-    try {
-      return await this.logService.findLogsWithCount(skip, take)
-    } catch (error) {
-      const customError = error as CustomError;
-
-      throw new HttpException(customError.message, customError.statusCode)
-    }
-  }
-
-  @Get('flights')
-  @Public()
-  async findLogsWithTracks(@Query('skip') skip?, @Query('take') take?: number,): Promise<Logs> {
-    try {
-      return await this.logService.findLogsWithTracks(skip, take)
-    } catch (error) {
-      const customError = error as CustomError;
-
-      throw new HttpException(customError.message, customError.statusCode);
-    }
-  }
-
+ 
   @Get(':id')
   @Public()
   async find(
@@ -69,6 +44,19 @@ export class LogController {
       throw new HttpException(customError.message, customError.statusCode);
     }
   }
+
+  @Get()
+  @Public()
+  async findAll(): Promise<LogEntity[]> {
+    try {
+      return await this.logService.findAll();
+    } catch (error) {
+      const customError = error as CustomError;
+
+      throw new HttpException(customError.message, customError.statusCode);
+    }
+  }
+
   
   @Post()
   @UseGuards(AuthGuard)

api/src/log/log.interceptor.ts

@@ -15,21 +15,23 @@ export class LogInterceptor implements NestInterceptor {
     ]);
 
     return handler.handle().pipe(
-      map((data: any) => {
+      map((data: LogEntity[]) => {
         const req = context.switchToHttp().getRequest();
-        const limitData = (log: LogEntity) => {
-          return {
-            id: log.id,
-            pilot: {
-              name: log.pilot.name
-            },
-            date: log.date,
-            aircraftMakeModel: log.aircraftMakeModel,
-            routeFrom: log.routeFrom,
-            routeTo: log.routeTo,
-            durationOfFlight: log.durationOfFlight,
-            tracks: log.tracks,
-          };
+        const limitData = (data) => {
+          return data.map((log: LogEntity) => {
+            return {
+              id: log.id,
+              pilot: {
+                name: log.pilot.name
+              },
+              date: log.date,
+              aircraftMakeModel: log.aircraftMakeModel,
+              routeFrom: log.routeFrom,
+              routeTo: log.routeTo,
+              durationOfFlight: log.durationOfFlight,
+              tracks: log.tracks,
+            };
+          });
         }
 
         if (req.headers.authorization) {
@@ -39,38 +41,17 @@ export class LogInterceptor implements NestInterceptor {
           const rolesKeyName = Object.keys(jwtPayload).find((key) => key.includes('roles'));
 
           if (jwtPayload[rolesKeyName].includes('Flying.Read')) {
-            if (data.entities) {
-              const logs = data.entities.map((entity) => limitData(data.entities));
+            const logs = limitData(data);
 
-              return {
-                entities: logs,
-                total: data.total,
-                hasNextPage: data.hasNextPage
-              };
-            } else {
-              const log = limitData(data);
-
-              return log;
-            }
-            
+            return logs;
           } else {
             return data;
           }
         } else if (!req.headers.authorization && isPublic) {
-          if (data.entities) {
-            const publicData = data.entities.map((entity) => limitData(entity))
-            const logs = publicData.slice(0, 5)
+          const publicData = limitData(data)
+          const logs = publicData.slice(0, 5)
 
-            return {
-              entities: logs,
-              total: data.total,
-              hasNextPage: false
-            };
-          } else {
-            const publicData = limitData(data);
-
-            return publicData
-          }
+          return logs;
         }
       })
     );

api/src/log/log.service.spec.ts

@@ -15,19 +15,9 @@ describe('LogService', () => {
     deleteFolder: jest.fn()
   }
 
-  const mockQueryBuilder = {
-    createQueryBuilder: jest.fn().mockReturnThis(),
-    innerJoinAndSelect: jest.fn().mockReturnThis(),
-    orderBy: jest.fn().mockReturnThis(),
-    skip: jest.fn().mockReturnThis(),
-    take: jest.fn().mockReturnThis(),
-    getManyAndCount: jest.fn()
-  }
-
   const mockLogRepository = {
-    createQueryBuilder: jest.fn().mockReturnValue(mockQueryBuilder),
     delete: jest.fn(),
-    findAndCount: jest.fn(),
+    find: jest.fn(),
     findOne: jest.fn(),
     findOneBy: jest.fn(),
     save: jest.fn(),
@@ -69,7 +59,7 @@ describe('LogService', () => {
     expect(service).toBeDefined();
   })
 
-  it('create => should create a log entry', async () => {
+  it('create => shoule create a log entry', async () => {
     const logDto = {
       pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
       date: new Date('2026-02-21'),
@@ -191,7 +181,7 @@ describe('LogService', () => {
     })
   })
 
-  it('findLogsWithCount => should find log entries with count', async () => {
+  it('findAll => should find all log entries', async () => {
     const log = {
       id: 'd685f1ca-28e0-40b9-8713-74467db12965',
       pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
@@ -217,84 +207,16 @@ describe('LogService', () => {
       instrumentHolds: null,
       instrumentNavTrack: null,
       notes: 'This is a test',
-      tracks: [
-        {
-            "id": "4645ce0c-6fd7-432c-8089-777a7139cf7e",
-            "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KANE_KONA_20250628.kml",
-            "order": 1
-        },
-        {
-            "id": "5ce26898-a18b-46f4-b989-3fb7acdace08",
-            "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KONA_KANE_20250628.kml",
-            "order": 2
-        }
-      ]
+      tracks: []
     } as LogEntity;
-    const logs = [log];
-    const count = 1
-    const morePages = false
-    
-    jest.spyOn(mockQueryBuilder, 'getManyAndCount').mockReturnValue([logs, count, morePages]);
+    const logs = [log]
 
-    const {entities, total, hasNextPage} = await service.findLogsWithCount();
+    jest.spyOn(mockLogRepository, 'find').mockReturnValue(logs);
 
-    expect(entities).toEqual(logs);
-    expect(count).toEqual(total);
-    expect(hasNextPage).toEqual(morePages);
-    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
-  })
+    const result = await service.findAll();
 
-    it('findLogsWithTracks => should find log entries with tracks', async () => {
-    const log = {
-      id: 'd685f1ca-28e0-40b9-8713-74467db12965',
-      pilotId: '7c4bae6b-9ec4-469e-8e16-fcbf0b940936',
-      date: new Date('2026-02-21'),
-      aircraftMakeModel: 'Cessna 172M',
-      aircraftIdentity: 'N12345',
-      routeFrom: 'KMSP',
-      routeTo: 'KMSP',
-      durationOfFlight: 1,
-      singleEngineLand: 1,
-      simulatorAtd: null,
-      landingsDay: 1,
-      landingsNight: null,
-      groundTrainingReceived: null,
-      flightTrainingReceived: null,
-      crossCountry: 1,
-      night: null,
-      solo: 1,
-      pilotInCommand: 1,
-      instrumentActual: null,
-      instrumentSimulated: null,
-      instrumentApproaches: null,
-      instrumentHolds: null,
-      instrumentNavTrack: null,
-      notes: 'This is a test',
-      tracks: [
-        {
-            "id": "4645ce0c-6fd7-432c-8089-777a7139cf7e",
-            "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KANE_KONA_20250628.kml",
-            "order": 1
-        },
-        {
-            "id": "5ce26898-a18b-46f4-b989-3fb7acdace08",
-            "url": "http://127.0.0.1:10000/devstoreaccount1/tracks/0e7a641a-0264-47f0-88bf-7c296c842d8b/FlightAware_N70392_KONA_KANE_20250628.kml",
-            "order": 2
-        }
-      ]
-    } as LogEntity;
-    const logs = [log];
-    const count = 1
-    const morePages = false
-    
-    jest.spyOn(mockQueryBuilder, 'getManyAndCount').mockResolvedValue([logs, count, morePages])
-
-    const {entities, total, hasNextPage} = await service.findLogsWithTracks();
-
-    expect(entities).toEqual(logs);
-    expect(count).toEqual(total);
-    expect(hasNextPage).toEqual(morePages);
-    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
+    expect(result).toEqual(logs);
+    expect(mockLogRepository.find).toHaveBeenCalled();
   })
 
   it('update => should update a log entry', async () => {

api/src/log/log.service.ts

@@ -7,7 +7,6 @@ import { PilotService } from '../pilot/pilot.service';
 import { PilotEntity } from '../pilot/pilot.entity';
 import { CustomError } from '../error/customError';
 import { FileService } from '../file/file.service';
-import { Logs } from './logs.interface';
 
 @Injectable()
 export class LogService {
@@ -18,52 +17,18 @@ export class LogService {
   ) {}
 
   async find(id: string): Promise<LogEntity> {
-    return await this.logRepository.findOne({
+    const logEntity: LogEntity = await this.logRepository.findOne({
       where: { id: id },
       relations: ['pilot', 'tracks']
     });
+
+    return logEntity;
   }
 
-  async findLogsWithCount(skip?: number, take?: number): Promise<Logs> {
-    // const [entities, total] = await this.logRepository.findAndCount({ 
-    //   take, 
-    //   skip,
-    //   order: {
-    //     date: 'DESC'
-    //   },
-    //   relations: ['pilot', 'tracks']
-    // })
-
-    const [entities, total] = await this.logRepository
-      .createQueryBuilder('logs')
-      .innerJoinAndSelect('logs.pilot', 'pilot')
-      .orderBy('logs.date', 'DESC')
-      .skip(skip)
-      .take(take)
-      .getManyAndCount()
-
-    return {
-      entities,
-      total,
-      hasNextPage: skip + take < total
-    }
-  }
-
-  async findLogsWithTracks(skip?: number, take?: number): Promise<Logs> {
-    const [entities, total] = await this.logRepository
-      .createQueryBuilder('logs')
-      .innerJoinAndSelect('logs.tracks', 'track')
-      .innerJoinAndSelect('logs.pilot', 'pilot')
-      .orderBy('logs.date', 'DESC')
-      .skip(skip)
-      .take(take)
-      .getManyAndCount();
-
-    return {
-      entities,
-      total,
-      hasNextPage: skip + take < total
-    }
+  async findAll(): Promise<LogEntity[]> {
+    return await this.logRepository.find({
+      relations: ['pilot', 'tracks']
+    });
   }
 
   async create(logDto: LogDto): Promise<LogDto> {

api/src/log/logs.interface.ts

@@ -1,7 +0,0 @@
-import { LogEntity } from "src/log/log.entity";
-
-export interface Logs {
-  entities: LogEntity[],
-  total: number,
-  hasNextPage: boolean
-}

api/src/track/track.service.ts

@@ -7,7 +7,6 @@ import { LogService } from "../log/log.service";
 import { LogEntity } from "../log/log.entity";
 import { CustomError } from "../error/customError";
 import { FileService } from "../file/file.service";
-import { Logs } from "src/log/logs.interface";
 
 @Injectable()
 export class TrackService {

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "2.1.3",
+  "version": "2.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

client/src/components/flights/Flights.tsx

@@ -5,68 +5,39 @@ import { LogbookEntry } from "../logbook/LogbookEntry.interface";
 import { initialState, reducer } from "./reducer";
 import { useOidc } from "../../auth/oidcConfig";
 import Alert from "../alert/Alert";
-import { AxiosError, AxiosResponse } from "axios";
-import httpClient from "../../httpClient/httpClient";
-import { useBreakpoints } from "../../hooks/useBreakpoints/UseBreakpoints";
-import { ScreenSize } from "../../enums/screenSize";
 
 const Flights = () => {
   const [state, dispatch] = useReducer(reducer, initialState);
+  const { logs, logsLoading } = useLogs();
   const { isUserLoggedIn } = useOidc();
-  const { screenSize } = useBreakpoints();
-
-  const getFlights = async (pageIndex: number, pageSize: number) => {
-    try {
-      const response: AxiosResponse = await httpClient.get(`api/logs/flights`, {
-        params: {
-          skip: pageIndex,
-          take: pageSize
-        }
-      });
-      const flights: LogbookEntry[] = response.data.entities;
-      const hasMore: boolean = response.data.hasNextPage;
-      const total: number = response.data.total;
-
-      if (flights.length > 0) {
-        const newFlights: LogbookEntry[] = [...state.flights, ...flights]
-        const newPageIndex: number = state.pageIndex + flights.length;
-
-        dispatch({ type: 'SET_FLIGHTS', payload: { flights: newFlights, hasMoreFlights: hasMore, pageIndex: newPageIndex, totalFlights: total }})
-
-        if (!isUserLoggedIn && flights.length >= 5) {
-          dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'A limited number of flights displayed. Sign in to view all flights.'}})
-        } else {
-          dispatch({ type: 'SET_ALERT', payload: undefined })
-        }
-      } else {
-        dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'No flights found' }})
-      }
-    } catch (error) {
-      const axiosError = error as AxiosError;
-
-      dispatch({
-        type: 'SET_ALERT',
-        payload: { severity: 'error', message: `Loading of flights failed with the following message: ${axiosError.message}`}
-      });
-    } finally {
-      dispatch({ type: 'SET_IS_LOADING', payload: false })
-    }
-  }
-
-  const loadMore = () => {
-    getFlights(state.pageIndex, state.pageSize)
-  }
 
   useEffect(() => {
-    getFlights(state.pageIndex, state.pageSize);
-  }, [])
- 
+
+    const flights: LogbookEntry[] | undefined = logs?.filter((log: LogbookEntry) => {
+      if (log.tracks && log.tracks.length > 0) {
+        return log;
+      }
+    })
+
+    if (flights && flights.length > 0) {
+      dispatch({ type: 'SET_FLIGHTS', payload: flights})
+
+      if (!isUserLoggedIn && flights.length >= 5) {
+        dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'A limited number of flights displayed. Sign in to view all flights.'}})
+      } else {
+        dispatch({ type: 'SET_ALERT', payload: undefined })
+      }
+    } else {
+      dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'No flights found' }})
+    }
+  }, [logs])
+  
   return (
-    <div className={`max-w-screen-lg mx-auto ${screenSize === ScreenSize.SM || screenSize === ScreenSize.MD? 'mr-4 ml-4' : ''}`}>
+    <div className='max-w-screen-lg mx-auto'>
       <div className='prose mt-5 mb-5'>
         <h1>Flights</h1>
       </div>
-      {!state.isLoading && state.alert && (
+      {!logsLoading && state.alert && (
         <div>
           <Alert
             className='mb-5'
@@ -79,21 +50,14 @@ const Flights = () => {
           </Alert>
         </div>
       )}
-      {!state.isLoading &&
+      {!logsLoading &&
         <div>
-          <div>
-            <LogbookCard logs={state.flights} mode='flights' />
-          </div>
-          {state.hasMoreFlights &&
-            <div className='flex items-center justify-center mb-5'>
-              <button className='btn btn-link' onClick={loadMore}>Load more</button>
-            </div>
-          }
+          <LogbookCard logs={state.flights} mode='flights' />
         </div>
       }
-      {state.isLoading && [...Array(5)].map((_element, index) => {
+      {logsLoading && [...Array(5)].map((_element, index) => {
         return (
-          <div className='card bg-base-100 border border-base-300 p-2 mb-5'>
+          <div className='card bg-base-100 border border-base-300 p-2 mb-7'>
             <div className='card-body' key={index}>
               <div className='skeleton h-10 w-[150px]' />
               <div className='skeleton h-[350px]' />

client/src/components/flights/FlightsState.interface.ts

@@ -5,8 +5,4 @@ export interface FlightsState {
   alert: Alert | undefined;
   flights: LogbookEntry[];
   isLoading: boolean;
-  hasMoreFlights: boolean;
-  pageIndex: number;
-  pageSize: number
-  totalFlights: number;
 }

client/src/components/flights/reducer.tsx

@@ -5,17 +5,13 @@ import { FlightsState } from "./FlightsState.interface";
 
 type Action = 
   | { type: 'SET_ALERT'; payload: Alert | undefined }
-  | { type: 'SET_FLIGHTS'; payload: { flights: LogbookEntry[], hasMoreFlights: boolean, pageIndex: number, totalFlights: number } }
+  | { type: 'SET_FLIGHTS'; payload: LogbookEntry[] }
   | { type: 'SET_IS_LOADING'; payload: boolean }
 
 export const initialState: FlightsState = {
   alert: undefined,
   flights: [],
-  isLoading: true,
-  hasMoreFlights: true,
-  pageIndex: 0,
-  pageSize: 5,
-  totalFlights: 0
+  isLoading: true
 }
 
 export const reducer = (
@@ -32,10 +28,7 @@ export const reducer = (
     case 'SET_FLIGHTS': {
       return {
         ...state,
-        flights: action.payload.flights,
-        hasMoreFlights: action.payload.hasMoreFlights,
-        pageIndex: action.payload.pageIndex,
-        totalFlights: action.payload.totalFlights
+        flights: action.payload
       }
     }
     case 'SET_IS_LOADING': {

client/src/components/logbook/Logbook.tsx

@@ -12,40 +12,19 @@ import { UserRole } from '../../enums/userRole';
 import { useBreakpoints } from '../../hooks/useBreakpoints/UseBreakpoints';
 import { ScreenSize } from '../../enums/screenSize';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faAdd, faEllipsisVertical, faPen, faEye, faTrash, faAngleLeft, faAngleRight, faAnglesLeft, faAnglesRight } from '@fortawesome/free-solid-svg-icons'
-import { CellContext, ColumnDef, flexRender, getCoreRowModel, HeaderContext, PaginationState, useReactTable } from '@tanstack/react-table';
+import { faAdd, faEllipsisVertical, faPen, faEye, faTrash, faMapLocationDot } from '@fortawesome/free-solid-svg-icons'
+import { CellContext, ColumnDef, flexRender, getCoreRowModel, getPaginationRowModel, HeaderContext, useReactTable } from '@tanstack/react-table';
 import { useLogbookContext } from '../../hooks/logbookContext/UseLogbookContext';
 import LogbookDrawer from '../logbookDrawer/LogbookDrawer';
 import Alert from '../alert/Alert';
-import TrackMap from '../trackMap/TrackMap';
-
-interface ActionsProps {
-  id: string;
-}
 
 const Logbook: React.FC<unknown> = () => {
   const [state, dispatch] = useReducer(reducer, initialState);
-  const [columnVisibility, setColumnVisibility] = useState({});
-  const logbookContext = useLogbookContext();
+  const [columnVisibility, setColumnVisibility] = useState({})
+  const logbookContext = useLogbookContext()
   const { isUserLoggedIn } = useOidc();
   const { userRole } = useUserRole();
   const { screenSize } = useBreakpoints();
-  const Actions = ({ id }: ActionsProps) => {
-    return (
-      <div className='dropdown dropdown-end'>
-        <div tabIndex={0} role='button' className='btn btn-ghost p-0'><FontAwesomeIcon icon={faEllipsisVertical} /></div>
-        <ul tabIndex={-1} className="dropdown-content menu bg-base-100 rounded-box w-52 p-2 shadow-sm border border-base-300 !z-[100]">
-          {isUserLoggedIn && userRole === UserRole.WRITE &&
-            <li><a onClick={() => onOpenCloseDrawer(FormMode.EDIT, id)}><FontAwesomeIcon icon={faPen} />Edit</a></li>
-          }
-          <li><a onClick={() => onOpenCloseDrawer(FormMode.VIEW, id)}><FontAwesomeIcon icon={faEye} />View</a></li>
-          {isUserLoggedIn && userRole === UserRole.WRITE &&
-            <li><a onClick={() => onDeleteLog(id)}><FontAwesomeIcon icon={faTrash} />Delete</a></li>
-          }
-        </ul>
-      </div>
-    )
-  }
   const columnTotal = (info: HeaderContext<LogbookEntry, unknown>): number => {
     const values: number[] = info.table.getPaginationRowModel().rows.map((row: any) => Number(row.getValue(info.column.id))).filter((value: any) => !Number.isNaN(value));
     let total: number = 0;
@@ -137,7 +116,18 @@ const Logbook: React.FC<unknown> = () => {
     },
     cell: (info: CellContext<LogbookEntry, unknown>) => {
       return (
-        <Actions id={info.row.original.id} />
+        <div className='dropdown dropdown-end'>
+          <div tabIndex={0} role='button' className='btn btn-ghost'><FontAwesomeIcon icon={faEllipsisVertical} /></div>
+          <ul tabIndex={-1} className="dropdown-content menu bg-base-100 rounded-box w-52 p-2 shadow-sm border border-base-300 !z-[100]">
+            {isUserLoggedIn && userRole === UserRole.WRITE &&
+              <li><a onClick={() => onOpenCloseDrawer(FormMode.EDIT, info.row.original.id)}><FontAwesomeIcon icon={faPen} />Edit</a></li>
+            }
+            <li><a onClick={() => onOpenCloseDrawer(FormMode.VIEW, info.row.original.id)}><FontAwesomeIcon icon={faEye} />View</a></li>
+            {isUserLoggedIn && userRole === UserRole.WRITE &&
+              <li><a onClick={() => onDeleteLog(info.row.original.id)}><FontAwesomeIcon icon={faTrash} />Delete</a></li>
+            }
+          </ul>
+        </div>
       )
     }
   }
@@ -348,51 +338,31 @@ const Logbook: React.FC<unknown> = () => {
     actions
   ];
 
-  const onPaginationChange = (updater: any) => {
-    const newPaginationState: PaginationState = typeof updater === 'function' ? updater(state.pagination) : updater;
-
-    dispatch({ type: 'SET_PAGINATION', payload: newPaginationState })
-  }
-
   const table = useReactTable({
     data: state.entries,
     columns: columns,
     getCoreRowModel: getCoreRowModel(),
-    manualPagination: true,
+    getPaginationRowModel: getPaginationRowModel(),
+    initialState: {
+      pagination: {
+        pageIndex: 0,
+        pageSize: 100
+      }
+    },
     onColumnVisibilityChange: setColumnVisibility,
-    onPaginationChange: onPaginationChange,
-    rowCount: state.totalEntries,
     state: {
       columnVisibility: columnVisibility,
-      pagination: state.pagination
     }
   });
 
-  const {
-    firstPage,
-    getCanNextPage,
-    getCanPreviousPage,
-    getPageCount,
-    getState,
-    lastPage,
-    nextPage,
-    previousPage,
-    setPageIndex
-  } = table;
-
-  const getLogbookEntries = async (pageIndex: number, pageSize: number) => {
+  const getLogbookEntries = async () => {
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 
-      const response: AxiosResponse = await httpClient.get(`api/logs`, {
-        params: {
-          skip: pageIndex * pageSize,
-          take: pageSize
-        }
-      });
+      const response: AxiosResponse = await httpClient.get(`api/logs`);
 
-      if (response.data.entities.length > 0) {
-        const entries: LogbookEntry[] = response.data.entities;
+      if (response.data.length > 0) {
+        const entries: LogbookEntry[] = response.data;
         const entryColumns: string[] = Object.keys(entries[0]);
         const columnVisibility: {[key: string]: boolean} = {}
 
@@ -411,7 +381,7 @@ const Logbook: React.FC<unknown> = () => {
 
         entries.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
         setColumnVisibility(columnVisibility)
-        dispatch({ type: 'SET_ENTRIES', payload: { entries: entries, totalEntries: response.data.total }});
+        dispatch({ type: 'SET_ENTRIES', payload: entries });
 
         if (!isUserLoggedIn && response.data.length >= 5) {
           dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'A limited number of log entries displayed. Sign in to view all log entries.'}})
@@ -478,7 +448,7 @@ const Logbook: React.FC<unknown> = () => {
         payload: false
       });
       logbookContext.dispatch({ type: 'SET_SELECTED_LOG_ID', payload: '' })
-      await getLogbookEntries(state.pagination?.pageIndex, state.pagination?.pageSize);
+      await getLogbookEntries();
     } catch (error) {
       const axiosError = error as AxiosError;
 
@@ -498,46 +468,19 @@ const Logbook: React.FC<unknown> = () => {
     });
   };
 
-  const onRowsPerPageChanged = (event: any) => {
-    const newPaginationState: PaginationState = {
-      pageIndex: 0,
-      pageSize: event.target.value !== 'All' ? Number(event.target.value) : state.totalEntries
-    };
-
-    dispatch({ type: 'SET_PAGINATION', payload: newPaginationState })
-  }
-
   useEffect(() => {
     if (!logbookContext.state.isDrawerOpen) {
-      getLogbookEntries(state.pagination.pageIndex, state.pagination.pageSize);
+      getLogbookEntries();
     }
-  }, [logbookContext.state.isDrawerOpen, state.pagination.pageIndex, state.pagination.pageSize]);
-
-  useEffect(() => {
-    const pages: number[] = [];
-
-    if (state.pagination?.pageSize) {
-      const totalPages = getPageCount();
-
-      for(let i = 0; i < totalPages; i++) {
-        pages.push(i + 1)
-      }
-    }
-
-    dispatch({ type: 'SET_PAGES', payload: pages })
-  }, [state.totalEntries, state.pagination?.pageSize])
-
-  useEffect(() => {
-    console.log(state.pagination)
-  }, [state.pagination])
+  }, [logbookContext.state.isDrawerOpen]);
 
   return (
     <>
-      <div className={`${screenSize === ScreenSize.SM ? 'mr-4 ml-4' : 'mr-10 ml-10'} grid grid-cols-12`}>
-        <div className='prose max-w-none col-span-6 mt-5 mb-5'>
+      <div className='mr-10 ml-10 grid grid-cols-12'>
+        <div className='prose max-w-none col-span-10 mt-5 mb-5'>
           <h1>Logbook</h1>
         </div>
-        <div className='col-span-6 justify-self-end self-center'>
+        <div className='col-span-2 justify-self-end self-center'>
           {userRole === UserRole.WRITE &&
             <button className='btn btn-primary'
               onClick={() => onOpenCloseDrawer(FormMode.ADD)}
@@ -560,25 +503,9 @@ const Logbook: React.FC<unknown> = () => {
             </Alert>
           </div>
         )}
-        {!state.isLoading && state.entries.length > 0 && screenSize !== ScreenSize.SM && screenSize !== ScreenSize.MD && (
-          <div className='col-span-12 pr-5 pb-5 pl-5 bg-base-100 border border-base-100 rounded-lg '>
-            <div className='overflow-x-auto mb-5'>
-              <div className='col-span-12 justify-self-end self-center mt-1 mr-1 mb-2'>
-                <label className='select select-sm select-ghost'>
-                  <span className='label'>Rows per page</span>
-                  <select
-                    defaultValue={1}
-                    onChange={onRowsPerPageChanged}
-                    value={state.pagination?.pageSize}
-                  >
-                    <option value={10}>10</option>
-                    <option value={25}>25</option>
-                    <option value={50}>50</option>
-                    <option value={state.totalEntries}>All</option>
-                  </select>
-                </label>
-                
-              </div>
+        {!state.isLoading && state.entries.length > 0 && screenSize !== ScreenSize.SM && (
+          <div className='col-span-12 p-5 bg-base-100 border border-base-100 rounded-lg'>
+            <div className='overflow-x-auto'>
               <table className='table min-w-full h-auto table-auto w-full'>
                 <thead className='bg-base-200'>
                   {table.getHeaderGroups().map((headerGroup, headerGroupIndex) => (
@@ -664,92 +591,10 @@ const Logbook: React.FC<unknown> = () => {
                 </thead>
               </table>
             </div>
-            {state.pagination.pageSize !== state.totalEntries &&
-              <div className='col-span-12 justify-self-center self-center'>
-                <div className='join'>
-                  <button
-                    className='join-item btn btn-sm'
-                    onClick={firstPage}
-                  >
-                    <FontAwesomeIcon icon={faAnglesLeft} />
-                  </button>
-                  <button
-                    className='join-item btn btn-sm'
-                    onClick={previousPage}
-                    disabled={!getCanPreviousPage()}
-                  >
-                    <FontAwesomeIcon icon={faAngleLeft} />
-                  </button>
-                  {state.pages.map((page, index) => {
-                    return (
-                      <button
-                        className={`join-item btn btn-sm ${getState().pagination.pageIndex === index ? 'btn-active' : ''}`}
-                        onClick={() => setPageIndex(index)}
-                      >
-                        {page}
-                      </button>
-                    )
-                  })}
-                  <button
-                    className='join-item btn btn-sm'
-                    onClick={() => nextPage()}
-                    disabled={!getCanNextPage()}
-                  >
-                    <FontAwesomeIcon icon={faAngleRight} />
-                  </button>
-                  <button
-                    className='join-item btn btn-sm'
-                    onClick={lastPage}
-                  >
-                    <FontAwesomeIcon icon={faAnglesRight} />
-                  </button>
-                </div>
-              </div>
-            }
           </div>
         )}
         {state.entries.length > 0 && screenSize === ScreenSize.SM &&
-          <div className='col-span-12'>
-            <>
-              {table.getRowModel().rows.map((row) => {
-                const date = new Date(row.original.date.replace('Z', ''));
-                const formattedDate: string = `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
-
-                return (
-                  <div className='card bg-base-100 border border-base-300 mb-5'>
-                    <div className={`card-body ${screenSize === ScreenSize.SM || screenSize === ScreenSize.MD ? 'p-4' : ''}`} key={row.id}>
-                      <div className={`grid grid-cols-12 gap-3`}>
-                        <>
-                          <div className='col-span-8'>
-                            <h2 className='card-title font-bold text-2xl'>{formattedDate}</h2>
-                          </div>
-                          <div className='col-span-4 justify-self-end self-center'>
-                            <Actions id={row.original.id} />
-                          </div>
-                          {row.getVisibleCells().map((cell) => {
-                            return (
-                              <>
-                                {cell.column.columnDef.header !== 'Actions' && cell.column.columnDef.header !== 'Date' && cell.column.columnDef.header !== 'Pilot' &&
-                                  <>
-                                    <div className='col-span-8 font-bold'>
-                                      <span>{cell.getContext().column.columnDef.header?.toString()}</span>
-                                    </div>
-                                    <div className='col-span-4'>
-                                      <span>{flexRender(cell.column.columnDef.cell, cell.getContext())}</span>
-                                    </div>
-                                  </>
-                                }
-                              </>
-                            )
-                          })}
-                        </>
-                      </div>
-                    </div>
-                  </div>
-                )
-              })}
-            </>
-          </div>
+          <LogbookCard logs={state.entries} onDelete={onDeleteLog} mode='logbook' onOpenCloseForm={onOpenCloseDrawer} />
         }
         {state.isLoading && !state.alert && (
           <div className='col-span-12 p-5 bg-base-100 border border-base-100 rounded-lg'>

client/src/components/logbook/LogbookState.interface.ts

@@ -1,4 +1,4 @@
-import { ColumnDef, PaginationState } from '@tanstack/react-table';
+import { ColumnDef } from '@tanstack/react-table';
 import { FormMode } from '../../enums/formMode';
 import { Alert } from '../../interfaces/Alert.interface';
 import { LogbookEntry } from './LogbookEntry.interface';
@@ -10,7 +10,4 @@ export interface LogbookState {
   isConfirmDialogLoading: boolean;
   isConfirmDialogOpen: boolean;
   isLoading: boolean;
-  pages: number[];
-  pagination: PaginationState;
-  totalEntries: number;
 }

client/src/components/logbook/reducer.ts

@@ -1,4 +1,4 @@
-import { ColumnDef, PaginationState } from '@tanstack/react-table';
+import { ColumnDef } from '@tanstack/react-table';
 import { FormMode } from '../../enums/formMode';
 import { Alert } from '../../interfaces/Alert.interface';
 import { LogbookEntry } from './LogbookEntry.interface';
@@ -7,12 +7,11 @@ import { LogbookState } from './LogbookState.interface';
 type Action =
   | { type: 'SET_COLUMNS'; payload: ColumnDef<LogbookEntry>[] }
   | { type: 'SET_IS_CONFIRMATION_DIALOG_OPEN'; payload: boolean }
-  | { type: 'SET_ENTRIES'; payload: { entries: LogbookEntry[], totalEntries: number } }
+  | { type: 'SET_ENTRIES'; payload: LogbookEntry[] }
   | { type: 'SET_ALERT'; payload: Alert | undefined }
   | { type: 'SET_IS_CONFIRMATION_DIALOG_LOADING'; payload: boolean }
-  | { type: 'SET_IS_LOADING'; payload: boolean }
-  | { type: 'SET_PAGES'; payload: number[] }
-  | { type: 'SET_PAGINATION'; payload: PaginationState };
+  | { type: 'SET_IS_LOADING'; payload: boolean };
+
 
 export const initialState: LogbookState = {
   alert: undefined,
@@ -20,13 +19,7 @@ export const initialState: LogbookState = {
   entries: [],
   isConfirmDialogLoading: false,
   isConfirmDialogOpen: false,
-  isLoading: false,
-  pages: [],
-  pagination: {
-    pageIndex: 0,
-    pageSize: 10
-  },
-  totalEntries: 0
+  isLoading: false
 };
 
 export const reducer = (
@@ -49,8 +42,7 @@ export const reducer = (
     case 'SET_ENTRIES': {
       return {
         ...state,
-        entries: action.payload.entries,
-        totalEntries: action.payload.totalEntries
+        entries: action.payload
       };
     }
     case 'SET_ALERT': {
@@ -71,18 +63,6 @@ export const reducer = (
         isLoading: action.payload
       };
     }
-    case 'SET_PAGES': {
-      return {
-        ...state,
-        pages: action.payload
-      }
-    }
-    case 'SET_PAGINATION': {
-      return {
-        ...state,
-        pagination: action.payload
-      }
-    }
     default: {
       return state;
     }

client/src/components/logbookCard/LogbookCard.tsx

@@ -1,12 +1,7 @@
 import { LogbookCardProps } from "./LogbookCardProps.interface";
 import TrackMap from "../trackMap/TrackMap";
-import { useBreakpoints } from "../../hooks/useBreakpoints/UseBreakpoints";
-import { ScreenSize } from "../../enums/screenSize";
-import { useEffect } from "react";
 
 const LogbookCard = ({ logs, mode, onDelete, onOpenCloseForm }: LogbookCardProps) => {  
-  const { screenSize } = useBreakpoints();
-  
   return (
     <div>
       {logs.map((log) => {
@@ -14,8 +9,8 @@ const LogbookCard = ({ logs, mode, onDelete, onOpenCloseForm }: LogbookCardProps
         const formattedDate: string = `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
 
         return (
-          <div className='card bg-base-100 border border-base-300 p-2 mb-5'>
-            <div className={`card-body ${screenSize === ScreenSize.SM || screenSize === ScreenSize.MD ? 'p-2' : ''}`} key={log.id}>
+          <div className='card bg-base-100 border border-base-300 p-2'>
+            <div className='card-body' key={log.id}>
               <h2 className='card-title font-bold text-2xl'>{formattedDate}</h2>
               <div>    
                 {mode === 'flights' && log.tracks && log.tracks.length > 0 &&
@@ -29,10 +24,10 @@ const LogbookCard = ({ logs, mode, onDelete, onOpenCloseForm }: LogbookCardProps
                 }
               </div>
               <div className='collapse collapse-arrow bg-base-100 border-base-300 border'>
-                <input type='checkbox' />
+                <input type='radio' name='details-accordion' />
                 <div className='collapse-title font-semibold'>Details</div>
                 <div className='collapse-content'>
-                  <div className={`grid grid-cols-12 gap-3 ${screenSize === ScreenSize.SM || screenSize === ScreenSize.MD ? 'mr-[5%] ml-[5%]' : 'mr-[30%] ml-[30%]'} mt-4 mb-4`}>
+                  <div className='grid grid-cols-12 gap-3 mr-[30%] ml-[30%] mt-4 mb-4'>
                     <div className='col-span-6 font-bold'>
                       <span>Aircraft Make and Model</span>
                     </div>

client/src/components/pilots/Pilots.tsx

@@ -17,31 +17,11 @@ import { Pilot } from './Pilot.interface';
 import Alert from '../alert/Alert';
 import { useOidc } from '../../auth/oidcConfig';
 
-interface ActionsProps {
-  id: string;
-}
-
 const Pilots: React.FC<unknown> = () => {
   const [state, dispatch] = useReducer(reducer, initialState);
   const { userRole } = useUserRole();
   const { screenSize } = useBreakpoints();
   const { isUserLoggedIn } = useOidc();
-  const Actions = ({ id }: ActionsProps) => {
-    return (
-      <div className='dropdown dropdown-end'>
-        <div tabIndex={0} role='button' className='btn btn-ghost'><FontAwesomeIcon icon={faEllipsisVertical} /></div>
-        <ul tabIndex={-1} className="dropdown-content menu bg-base-100 rounded-box z-1 w-52 p-2 shadow-sm border border-base-300">
-          {isUserLoggedIn && userRole === UserRole.WRITE &&
-            <li><a onClick={() => onOpenClosePilotForm(FormMode.EDIT, id)}><FontAwesomeIcon icon={faPen} />Edit</a></li>
-          }
-          <li><a onClick={() => onOpenClosePilotForm(FormMode.VIEW, id)}><FontAwesomeIcon icon={faEye} />View</a></li>
-          {isUserLoggedIn && userRole === UserRole.WRITE &&
-            <li><a onClick={() => onDeletePilot(id)}><FontAwesomeIcon icon={faTrash} />Delete</a></li>
-          }
-        </ul>
-      </div>
-    )
-  }
 
   const getPilots = async () => {
     try {
@@ -154,7 +134,18 @@ const Pilots: React.FC<unknown> = () => {
       },
       cell: (info: CellContext<Pilot, unknown>) => {
         return (
-          <Actions id={info.row.original.id} />
+          <div className='dropdown dropdown-end'>
+            <div tabIndex={0} role='button' className='btn btn-ghost'><FontAwesomeIcon icon={faEllipsisVertical} /></div>
+            <ul tabIndex={-1} className="dropdown-content menu bg-base-100 rounded-box z-1 w-52 p-2 shadow-sm border border-base-300">
+              {isUserLoggedIn && userRole === UserRole.WRITE &&
+                <li><a onClick={() => onOpenClosePilotForm(FormMode.EDIT, info.row.original.id)}><FontAwesomeIcon icon={faPen} />Edit</a></li>
+              }
+              <li><a onClick={() => onOpenClosePilotForm(FormMode.VIEW, info.row.original.id)}><FontAwesomeIcon icon={faEye} />View</a></li>
+              {isUserLoggedIn && userRole === UserRole.WRITE &&
+                <li><a onClick={() => onDeletePilot(info.row.original.id)}><FontAwesomeIcon icon={faTrash} />Delete</a></li>
+              }
+            </ul>
+          </div>
         )
       }
     }
@@ -181,11 +172,11 @@ const Pilots: React.FC<unknown> = () => {
 
   return (
     <>
-    <div className={`${screenSize === ScreenSize.SM ? 'mr-4 ml-4' : 'mr-10 ml-10'} grid grid-cols-12`}>
-      <div className='prose max-w-none col-span-6 mt-5 mb-5' >
+    <div className='mr-10 ml-10 grid grid-cols-12'>
+      <div className='prose max-w-none col-span-10 mt-5 mb-5' >
         <h1>Pilots</h1>
       </div>
-      <div className='col-span-6 justify-self-end self-center'>
+      <div className='col-span-2 justify-self-end self-center'>
         {!state.isLoading && userRole === UserRole.WRITE &&
           <button
             className='btn btn-primary'
@@ -268,40 +259,9 @@ const Pilots: React.FC<unknown> = () => {
           </table>
         </div>
       }
-      {state.pilots.length > 0 && screenSize === ScreenSize.SM &&
-        <div className='col-span-12'>
-          <>
-            {table.getRowModel().rows.map((row) => {
-              return (
-                <div className='card bg-base-100 border border-base-300 mb-5'>
-                  <div className={`card-body ${screenSize === ScreenSize.SM || screenSize === ScreenSize.MD ? 'p-4' : ''}`} key={row.id}>
-                    <div className={`grid grid-cols-12 gap-3`}>
-                      <>
-                        {row.getVisibleCells().map((cell) => {
-                          return (
-                            <>
-                              {cell.column.columnDef.header !== 'Actions' &&
-                                <>
-                                  <div className='col-span-10 self-center'>
-                                    <span>{flexRender(cell.column.columnDef.cell, cell.getContext())}</span>
-                                  </div>
-                                  <div className='col-span-2'>
-                                    <Actions id={row.original.id} />
-                                  </div>
-                                </>
-                              }
-                            </>
-                          )
-                        })}
-                      </>
-                    </div>
-                  </div>
-                </div>
-              )
-            })}
-          </>
-        </div>
-      }
+      {/* {state.pilots.length > 0 && screenSize === ScreenSize.SM &&
+        <PilotCard pilots={state.pilots} onDelete={onDeletePilot} onOpenCloseForm={onOpenClosePilotForm} />
+      } */}
     </div>
       {state.isFormOpen && (
         <PilotForm

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@noahspan/flying",
-  "version": "2.0.2",
+  "version": "2.0.0-alpha-3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@noahspan/flying",
-      "version": "2.0.2",
+      "version": "2.0.0-alpha-3",
       "workspaces": [
         "api",
         "client",
@@ -26,7 +26,7 @@
       }
     },
     "api": {
-      "version": "2.0.2",
+      "version": "2.0.0-alpha-3",
       "license": "UNLICENSED",
       "dependencies": {
         "@azure/storage-blob": "^12.27.0",
@@ -81,7 +81,7 @@
       }
     },
     "client": {
-      "version": "2.0.2",
+      "version": "2.0.0-alpha-3",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^7.1.0",
         "@fortawesome/free-solid-svg-icons": "^7.1.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/flying",
-  "version": "2.1.3",
+  "version": "2.0.2",
   "scripts": {
     "start": "node api/dist/main",
     "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",