fixing all logs showing when user is unauthenticated (#127)

* fixing flights skip take order by

* fixing flights skip take order by

* fixing flights skip take order by

api/package.json

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

api/src/log/log.interceptor.ts

@@ -62,7 +62,7 @@ export class LogInterceptor implements NestInterceptor {
             const logs = publicData.slice(0, 5)
 
             return {
-              entities: publicData,
+              entities: logs,
               total: data.total,
               hasNextPage: false
             };
@@ -71,7 +71,6 @@ export class LogInterceptor implements NestInterceptor {
 
             return publicData
           }
-          
         }
       })
     );

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

@@ -19,6 +19,8 @@ describe('LogService', () => {
     createQueryBuilder: jest.fn().mockReturnThis(),
     innerJoinAndSelect: jest.fn().mockReturnThis(),
     orderBy: jest.fn().mockReturnThis(),
+    skip: jest.fn().mockReturnThis(),
+    take: jest.fn().mockReturnThis(),
     getManyAndCount: jest.fn()
   }
 
@@ -232,14 +234,14 @@ describe('LogService', () => {
     const count = 1
     const morePages = false
     
-    jest.spyOn(mockLogRepository, 'findAndCount').mockReturnValue([logs, count, morePages]);
+    jest.spyOn(mockQueryBuilder, 'getManyAndCount').mockReturnValue([logs, count, morePages]);
 
     const {entities, total, hasNextPage} = await service.findLogsWithCount();
 
     expect(entities).toEqual(logs);
     expect(count).toEqual(total);
     expect(hasNextPage).toEqual(morePages);
-    expect(mockLogRepository.findAndCount).toHaveBeenCalled();
+    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
   })
 
     it('findLogsWithTracks => should find log entries with tracks', async () => {
@@ -292,7 +294,7 @@ describe('LogService', () => {
     expect(entities).toEqual(logs);
     expect(count).toEqual(total);
     expect(hasNextPage).toEqual(morePages);
-    expect(mockLogRepository.findAndCount).toHaveBeenCalled();
+    expect(mockQueryBuilder.getManyAndCount).toHaveBeenCalled();
   })
 
   it('update => should update a log entry', async () => {

api/src/log/log.service.ts

@@ -25,11 +25,22 @@ export class LogService {
   }
 
   async findLogsWithCount(skip?: number, take?: number): Promise<Logs> {
-    const [entities, total] = await this.logRepository.findAndCount({ 
-      take, 
-      skip,
-      relations: ['pilot', 'tracks']
-    })
+    // 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,
@@ -43,7 +54,9 @@ export class LogService {
       .createQueryBuilder('logs')
       .innerJoinAndSelect('logs.tracks', 'track')
       .innerJoinAndSelect('logs.pilot', 'pilot')
-      .orderBy('date')
+      .orderBy('logs.date', 'DESC')
+      .skip(skip)
+      .take(take)
       .getManyAndCount();
 
     return {

client/package.json

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

client/src/components/logbook/Logbook.tsx

@@ -380,13 +380,13 @@ const Logbook: React.FC<unknown> = () => {
     setPageIndex
   } = table;
 
-  const getLogbookEntries = async (pageIndex?: number, pageSize?: number) => {
+  const getLogbookEntries = async (pageIndex: number, pageSize: number) => {
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 
       const response: AxiosResponse = await httpClient.get(`api/logs`, {
         params: {
-          skip: pageIndex,
+          skip: pageIndex * pageSize,
           take: pageSize
         }
       });
@@ -527,13 +527,17 @@ const Logbook: React.FC<unknown> = () => {
     dispatch({ type: 'SET_PAGES', payload: pages })
   }, [state.totalEntries, state.pagination?.pageSize])
 
+  useEffect(() => {
+    console.log(state.pagination)
+  }, [state.pagination])
+
   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-10 mt-5 mb-5'>
+        <div className='prose max-w-none col-span-6 mt-5 mb-5'>
           <h1>Logbook</h1>
         </div>
-        <div className='col-span-2 justify-self-end self-center'>
+        <div className='col-span-6 justify-self-end self-center'>
           {userRole === UserRole.WRITE &&
             <button className='btn btn-primary'
               onClick={() => onOpenCloseDrawer(FormMode.ADD)}
@@ -569,7 +573,7 @@ const Logbook: React.FC<unknown> = () => {
                   >
                     <option value={10}>10</option>
                     <option value={25}>25</option>
-                    <option value={3}>50</option>
+                    <option value={50}>50</option>
                     <option value={state.totalEntries}>All</option>
                   </select>
                 </label>

client/src/components/pilots/Pilots.tsx

@@ -17,11 +17,31 @@ 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 {
@@ -134,18 +154,7 @@ const Pilots: React.FC<unknown> = () => {
       },
       cell: (info: CellContext<Pilot, unknown>) => {
         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, 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>
+          <Actions id={info.row.original.id} />
         )
       }
     }
@@ -172,11 +181,11 @@ const Pilots: React.FC<unknown> = () => {
 
   return (
     <>
-    <div className='mr-10 ml-10 grid grid-cols-12'>
-      <div className='prose max-w-none col-span-10 mt-5 mb-5' >
+    <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' >
         <h1>Pilots</h1>
       </div>
-      <div className='col-span-2 justify-self-end self-center'>
+      <div className='col-span-6 justify-self-end self-center'>
         {!state.isLoading && userRole === UserRole.WRITE &&
           <button
             className='btn btn-primary'
@@ -259,9 +268,40 @@ const Pilots: React.FC<unknown> = () => {
           </table>
         </div>
       }
-      {/* {state.pilots.length > 0 && screenSize === ScreenSize.SM &&
-        <PilotCard pilots={state.pilots} onDelete={onDeletePilot} onOpenCloseForm={onOpenClosePilotForm} />
-      } */}
+      {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>
+      }
     </div>
       {state.isFormOpen && (
         <PilotForm

package.json

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