Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ee0e10072c | |||
| 899f92f342 | |||
| 5c4245179f | |||
| a7a9f01fd9 | |||
| a367b517db | |||
| fd514e4c8b |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "api",
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.4",
|
||||
"description": "",
|
||||
"author": "",
|
||||
"private": true,
|
||||
|
||||
@@ -62,8 +62,8 @@ export class LogInterceptor implements NestInterceptor {
|
||||
const logs = publicData.slice(0, 5)
|
||||
|
||||
return {
|
||||
entities: publicData,
|
||||
total: data.total,
|
||||
entities: logs,
|
||||
total: logs.length,
|
||||
hasNextPage: false
|
||||
};
|
||||
} else {
|
||||
@@ -71,7 +71,6 @@ export class LogInterceptor implements NestInterceptor {
|
||||
|
||||
return publicData
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "client",
|
||||
"private": true,
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.4",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -413,7 +413,7 @@ const Logbook: React.FC<unknown> = () => {
|
||||
setColumnVisibility(columnVisibility)
|
||||
dispatch({ type: 'SET_ENTRIES', payload: { entries: entries, totalEntries: response.data.total }});
|
||||
|
||||
if (!isUserLoggedIn && response.data.length >= 5) {
|
||||
if (!isUserLoggedIn && response.data.entities.length >= 5) {
|
||||
dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'A limited number of log entries displayed. Sign in to view all log entries.'}})
|
||||
} else {
|
||||
dispatch({ type: 'SET_ALERT', payload: undefined})
|
||||
@@ -528,8 +528,8 @@ const Logbook: React.FC<unknown> = () => {
|
||||
}, [state.totalEntries, state.pagination?.pageSize])
|
||||
|
||||
useEffect(() => {
|
||||
console.log(state.pagination)
|
||||
}, [state.pagination])
|
||||
console.log(state.alert)
|
||||
}, [state.alert])
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -554,7 +554,7 @@ const Logbook: React.FC<unknown> = () => {
|
||||
onClose={() =>
|
||||
dispatch({ type: 'SET_ALERT', payload: undefined })
|
||||
}
|
||||
severity={'info'}
|
||||
severity={state.alert.severity}
|
||||
>
|
||||
{state.alert.message}
|
||||
</Alert>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@noahspan/flying",
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.4",
|
||||
"scripts": {
|
||||
"start": "node api/dist/main",
|
||||
"format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",
|
||||
|
||||
Reference in New Issue
Block a user