Rename hasNext -> hasNextPage

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

plugins/catalog-backend/src/catalog/DatabaseEntitiesCatalog.test.ts

@@ -65,7 +65,7 @@ describe('DatabaseEntitiesCatalog', () => {
 
       db.entities.mockResolvedValue({
         entities: [],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       db.addEntities.mockResolvedValue([
         { entity: { ...entity, metadata: { ...entity.metadata, uid: 'u' } } },
@@ -102,7 +102,7 @@ describe('DatabaseEntitiesCatalog', () => {
       };
       db.entities.mockResolvedValue({
         entities: [],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       db.addEntities.mockResolvedValue([
         { entity: { ...entity, metadata: { ...entity.metadata, uid: 'u' } } },
@@ -157,7 +157,7 @@ describe('DatabaseEntitiesCatalog', () => {
       };
       db.entities.mockResolvedValue({
         entities: [{ entity: dbEntity }],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       db.addEntities.mockResolvedValue([
         { entity: { ...entity, metadata: { ...entity.metadata, uid: 'u' } } },
@@ -211,7 +211,7 @@ describe('DatabaseEntitiesCatalog', () => {
 
       db.entities.mockResolvedValue({
         entities: [existing],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       db.entityByUid.mockResolvedValue(existing);
       db.updateEntity.mockResolvedValue({ entity });
@@ -289,7 +289,7 @@ describe('DatabaseEntitiesCatalog', () => {
 
       db.entities.mockResolvedValue({
         entities: [existing],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       db.entityByName.mockResolvedValue(existing);
       db.updateEntity.mockResolvedValue(existing);
@@ -355,7 +355,7 @@ describe('DatabaseEntitiesCatalog', () => {
 
       db.entities.mockResolvedValue({
         entities: [{ entity }],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       db.entityByUid.mockResolvedValue({ entity });
       db.updateEntity.mockResolvedValue({ entity });

plugins/catalog-backend/src/catalog/types.ts

@@ -23,10 +23,10 @@ import { EntityFilter, EntityPagination } from '../database/types';
 
 export type PageInfo =
   | {
-      hasNext: false;
+      hasNextPage: false;
     }
   | {
-      hasNext: true;
+      hasNextPage: true;
       endCursor: string;
     };
 

plugins/catalog-backend/src/database/CommonDatabase.ts

@@ -259,11 +259,11 @@ export class CommonDatabase implements Database {
 
     let pageInfo: DbPageInfo;
     if (limit === undefined || rows.length <= limit) {
-      pageInfo = { hasNext: false };
+      pageInfo = { hasNextPage: false };
     } else {
       rows = rows.slice(0, -1);
       pageInfo = {
-        hasNext: true,
+        hasNextPage: true,
         endCursor: stringifyPagination({
           limit,
           offset: (offset ?? 0) + limit,

plugins/catalog-backend/src/database/types.ts

@@ -48,10 +48,10 @@ export type DbEntitiesResponse = {
 
 export type DbPageInfo =
   | {
-      hasNext: false;
+      hasNextPage: false;
     }
   | {
-      hasNext: true;
+      hasNextPage: true;
       endCursor: string;
     };
 

plugins/catalog-backend/src/ingestion/HigherOrderOperations.test.ts

@@ -362,7 +362,7 @@ describe('HigherOrderOperations', () => {
       });
       entitiesCatalog.entities.mockResolvedValue({
         entities: [],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       entitiesCatalog.batchAddOrUpdateEntities.mockResolvedValue([]);
 

plugins/catalog-backend/src/service/CatalogBuilder.test.ts

@@ -63,7 +63,7 @@ describe('CatalogBuilder', () => {
     const built = await builder.build();
     await expect(built.entitiesCatalog.entities()).resolves.toEqual({
       entities: [],
-      pageInfo: { hasNext: false },
+      pageInfo: { hasNextPage: false },
     });
     await expect(built.locationsCatalog.locations()).resolves.toEqual([
       expect.objectContaining({

plugins/catalog-backend/src/service/router.test.ts

@@ -71,7 +71,7 @@ describe('createRouter', () => {
 
       entitiesCatalog.entities.mockResolvedValueOnce({
         entities: [entities[0]],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
 
       const response = await request(app).get('/entities');
@@ -83,7 +83,7 @@ describe('createRouter', () => {
     it('parses single and multiple request parameters and passes them down', async () => {
       entitiesCatalog.entities.mockResolvedValueOnce({
         entities: [],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
       const response = await request(app).get(
         '/entities?filter=a=1,a=2,b=3&filter=c=4',
@@ -118,7 +118,7 @@ describe('createRouter', () => {
       };
       entitiesCatalog.entities.mockResolvedValue({
         entities: [entity],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
 
       const response = await request(app).get('/entities/by-uid/zzz');
@@ -134,7 +134,7 @@ describe('createRouter', () => {
     it('responds with a 404 for missing entities', async () => {
       entitiesCatalog.entities.mockResolvedValue({
         entities: [],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
 
       const response = await request(app).get('/entities/by-uid/zzz');
@@ -160,7 +160,7 @@ describe('createRouter', () => {
       };
       entitiesCatalog.entities.mockResolvedValue({
         entities: [entity],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
 
       const response = await request(app).get('/entities/by-name/k/ns/n');
@@ -180,7 +180,7 @@ describe('createRouter', () => {
     it('responds with a 404 for missing entities', async () => {
       entitiesCatalog.entities.mockResolvedValue({
         entities: [],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
 
       const response = await request(app).get('/entities/by-name/b/d/c');
@@ -225,7 +225,7 @@ describe('createRouter', () => {
       ]);
       entitiesCatalog.entities.mockResolvedValue({
         entities: [entity],
-        pageInfo: { hasNext: false },
+        pageInfo: { hasNextPage: false },
       });
 
       const response = await request(app)

plugins/catalog-backend/src/service/router.ts

@@ -66,7 +66,7 @@ export async function createRouter(
         });
 
         // Add a Link header to the next page
-        if (pageInfo.hasNext) {
+        if (pageInfo.hasNextPage) {
           const url = new URL(`http://ignored${req.url}`);
           url.searchParams.delete('offset');
           url.searchParams.set('after', pageInfo.endCursor);