fixing logbook skip take order by

.github/workflows/build_and_test.yaml

@@ -15,7 +15,7 @@ jobs:
     environment: ${{ inputs.environment_name }}
     steps:
       - name: Checkout
-        uses: https://gitea.com/actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           sparse-checkout: |
             api
@@ -45,8 +45,8 @@ jobs:
       - name: Build Client
         env:
           VITE_API_URL: ${{ vars.VITE_API_URL }}
-          VITE_BASE_URL: ${{ case(inputs.environment_name === 'test', vars.VITE_BASE_URL_TEST, vars.VITE_BASE_URL_PROD) }}
-          VITE_CLIENT_ID: ${{ case(inputs.environment_name === 'test', vars.VITE_CLIENT_ID_TEST, vars.VITE_CLIENT_ID_PROD) }}
+          VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
+          VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }}
           VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
           VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
         run: |

.github/workflows/changes.yaml

@@ -7,9 +7,6 @@ on:
       client:
         value: ${{ jobs.changes.outputs.client }}
 
-permissions:
-  contents: read
-
 jobs:
   changes:
     name: filter
@@ -18,13 +15,7 @@ jobs:
       api: ${{ steps.filter.outputs.api }}
       client: ${{ steps.filter.outputs.client }}
     steps:
-      - name: 'Setup Node'
-        uses: actions/setup-node@v6
-        with:
-          node-version: '22.x'
-
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       
       - uses: dorny/paths-filter@v3
         id: filter

.github/workflows/deploy.yaml

@@ -21,9 +21,11 @@ jobs:
     environment: ${{ inputs.environment_name }}
     steps:
       - name: Log in to Azure
-        uses: azure/login@v3
+        uses: azure/login@v2
         with:
-          creds: '{"clientId":"${{ vars.AZURE_CLIENT_ID }}","clientSecret":"${{ secrets.AZURE_CLIENT_SECRET }}","subscriptionId":"${{ secrets.AZURE_SUBSCRIPTION_ID }}","tenantId":"${{ vars.AZURE_TENANT_ID }}"}'
+          client-id: ${{ vars.AZURE_CLIENT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          tenant-id: ${{ vars.AZURE_TENANT_ID }}
 
       - name: Azure CLI script
         uses: azure/cli@v2

.github/workflows/main.yaml

@@ -6,14 +6,14 @@ on:
 
 jobs:
   changes:
-    uses: ./.gitea/workflows/changes.yaml
+    uses: ./.github/workflows/changes.yaml
 
   build:
     if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true' }}
     name: build
     needs:
       - changes
-    uses: ./.gitea/workflows/build_and_test.yaml
+    uses: ./.github/workflows/build_and_test.yaml
     with:
       environment_name: test
       version_number: ${{ github.run_id }}
@@ -24,7 +24,7 @@ jobs:
     needs: 
       - changes
       - build
-    uses: ./.gitea/workflows/deploy.yaml
+    uses: ./.github/workflows/deploy.yaml
     with:
       app_name: flying
       environment_name: test

.github/workflows/pull_request.yaml

@@ -5,14 +5,14 @@ on:
 
 jobs:
   changes:
-    uses: ./.gitea/workflows/changes.yaml
+    uses: ./.github/workflows/changes.yaml
 
   build:
-    if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true'}}
-    name: build-and-test
+    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}}
+    name: build
     needs:
       - changes
-    uses: ./.gitea/workflows/build_and_test.yaml
+    uses: ./.github/workflows/build_and_test.yaml
     with:
       environment_name: pull_request
       version_number: ${{ github.run_id }}

.github/workflows/tag.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     name: build
-    uses: ./.gitea/workflows/build_and_test.yaml
+    uses: ./.github/workflows/build_and_test.yaml
     with:
       environment_name: prod
       version_number: ${{ github.ref_name }}
@@ -17,7 +17,7 @@ jobs:
     name: deploy
     needs: 
       - build
-    uses: ./.gitea/workflows/deploy.yaml
+    uses: ./.github/workflows/deploy.yaml
     with:
       app_name: flying
       environment_name: prod

api/package.json

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

api/src/log/log.interceptor.ts

@@ -40,7 +40,7 @@ export class LogInterceptor implements NestInterceptor {
 
           if (jwtPayload[rolesKeyName].includes('Flying.Read')) {
             if (data.entities) {
-              const logs = data.entities.map((entity) => limitData(entity));
+              const logs = data.entities.map((entity) => limitData(data.entities));
 
               return {
                 entities: logs,
@@ -62,8 +62,8 @@ export class LogInterceptor implements NestInterceptor {
             const logs = publicData.slice(0, 5)
 
             return {
-              entities: logs,
-              total: logs.length,
+              entities: publicData,
+              total: data.total,
               hasNextPage: false
             };
           } else {
@@ -71,6 +71,7 @@ export class LogInterceptor implements NestInterceptor {
 
             return publicData
           }
+          
         }
       })
     );

client/package.json

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

client/src/components/logbook/Logbook.tsx

@@ -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.entities.length >= 5) {
+        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.'}})
         } 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.alert)
-  }, [state.alert])
+    console.log(state.pagination)
+  }, [state.pagination])
 
   return (
     <>
@@ -554,7 +554,7 @@ const Logbook: React.FC<unknown> = () => {
               onClose={() =>
                 dispatch({ type: 'SET_ALERT', payload: undefined })
               }
-              severity={state.alert.severity}
+              severity={'info'}
             >
               {state.alert.message}
             </Alert>

infrastructure/.gitignore

@@ -1,5 +1,4 @@
 # Terraform
 .terraform/*
 *.tfstate
-*.tfstate.*
-.DS_Store
+*.tfstate.*

package.json

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