noah/noahspan-flying
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

fixing logbook page responsiveness (#116)

Browse Source 
* fixing logbook page responsiveness

* fixing logbook page responsiveness
This commit was merged in pull request #116.
This commit is contained in:
noahspannbauer
2026-03-21 20:30:05 -05:00
committed by GitHub
parent a9abb5863c
commit 9c96774f7b
8 changed files with 127 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
api/src/log/log.interceptor.ts
View File

@@ -15,23 +15,21 @@ export class LogInterceptor implements NestInterceptor {
]);
return handler.handle().pipe(
map((data: { entities: LogEntity[], total: number, hasNextPage: boolean }) => {
map((data: any) => {
const req = context.switchToHttp().getRequest();
const limitData = (entities: LogEntity[]) => {
return entities.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,
};
});
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,
};
}
if (req.headers.authorization) {
@@ -41,25 +39,39 @@ export class LogInterceptor implements NestInterceptor {
const rolesKeyName = Object.keys(jwtPayload).find((key) => key.includes('roles'));
if (jwtPayload[rolesKeyName].includes('Flying.Read')) {
const logs = limitData(data.entities);
if (data.entities) {
const logs = data.entities.map((entity) => limitData(data.entities));
return {
entities: logs,
total: data.total,
hasNextPage: data.hasNextPage
};
return {
entities: logs,
total: data.total,
hasNextPage: data.hasNextPage
};
} else {
const log = limitData(data);
return log;
}
} else {
return data;
}
} else if (!req.headers.authorization && isPublic) {
const publicData = limitData(data.entities)
const logs = publicData.slice(0, 5)
if (data.entities) {
const publicData = data.entities.map((entity) => limitData(entity))
const logs = publicData.slice(0, 5)
return {
entities: logs,
total: data.total,
hasNextPage: data.hasNextPage
};
return {
entities: publicData,
total: data.total,
hasNextPage: false
};
} else {
const publicData = limitData(data);
return publicData
}
}
})
);