Pagination types feat/pagination-meta

packages/cli/src/lib/commands/hub.ts

@@ -34,7 +34,7 @@ export const hub: CommandDefinition = (program) => {
             .action(async (id: string) => {
                 const space = sessionConfig.lastSpaceId;
                 const managerClient = getMiddlewareClient().getManagerClient(space);
-                const hosts = await managerClient.getHosts();
+                const hosts = (await managerClient.getHosts()).data;
                 const host = hosts.find((h: any) => h.id === id);
 
                 if (!host) {

packages/cli/src/lib/helpers/various.ts

@@ -5,7 +5,7 @@ import { getMiddlewareClient } from "../platform";
 export async function getInfo() {
     const { lastSpaceId: space, lastHubId: id } = sessionConfig.get();
     const managerClient = getMiddlewareClient().getManagerClient(space);
-    const hosts = await managerClient.getHosts();
+    const hosts = (await managerClient.getHosts()).data;
     const host = hosts.find((h: any) => h.id === id);
 
     return { managerClient, host, hosts };

packages/cli/src/lib/platform/common.ts

@@ -64,7 +64,7 @@ export const setPlatformDefaults = async () => {
         const selectedManager = managers[0];
 
         const managerClient = middlewareClient.getManagerClient(selectedManager.id);
-        const hosts = await managerClient.getHosts();
+        const hosts = (await managerClient.getHosts()).data;
 
         if (!hosts.length) return false;
 

packages/manager-api-client/src/manager-client.ts

@@ -23,7 +23,7 @@ export class ManagerClient implements ClientProvider {
     }
 
     async getHosts() {
-        return this.client.get<MRestAPI.GetHostInfoResponse[]>("list");
+        return this.client.get<MRestAPI.GetListResponse>("list");
     }
 
     async getVersion(): Promise<MRestAPI.GetVersionResponse> {

packages/runner/src/runner.ts

@@ -442,7 +442,7 @@ export class Runner<X extends AppConfig> implements IComponent {
             this.emitter,
             runner,
             hostApiClient as HostClient,
-            managerApiClient as ManagerClient,
+            managerApiClient,
             this.instanceId
         );
         this._context.logger.pipe(this.logger);

packages/types/src/manager-api-client/manager-client.ts

@@ -1,6 +1,6 @@
 /// <reference lib="dom" />
 
-import { MRestAPI } from "..";
+import * as MRestAPI from "../rest-api-manager";
 
 import * as STHRestAPI from "../rest-api-sth";
 import { PublicSTHConfiguration } from "../sth-configuration";
@@ -13,14 +13,14 @@ export declare class ManagerClient {
     constructor(apiBase: string, utils: ClientUtils | undefined);
 
     getHostClient(id: string, hostApiBase: string): import("../api-client/host-client").HostClient;
-    getHosts(): Promise<MRestAPI.GetHostInfoResponse[]>;
+    getHosts(): Promise<MRestAPI.GetListResponse>;
     getVersion(): Promise<STHRestAPI.GetVersionResponse>;
     sendNamedData<T>(topic: string, stream: Parameters<HttpClient["sendStream"]>[1], requestInit?: RequestInit, contentType?: string, end?: boolean): Promise<T>;
     getNamedData(topic: string, requestInit?: RequestInit): ReturnType<HttpClient["getStream"]>;
     getLogStream(requestInit?: RequestInit): ReturnType<HttpClient["getStream"]>;
     getAuditStream(requestInit?: RequestInit): ReturnType<HttpClient["getStream"]>;
     getConfig(): Promise<PublicSTHConfiguration>;
-    getSequences(sequenceId: string): Promise<MRestAPI.GetSequencesResponse>;
+    getSequences(): Promise<MRestAPI.GetSequencesResponse>;
     getInstances(): Promise<MRestAPI.GetInstancesResponse>;
     getTopics(): Promise<MRestAPI.GetTopicsResponse>;
 }

packages/types/src/rest-api-manager/common.ts

@@ -22,3 +22,9 @@ export type HealthCheckInfo = {
         [key: string]: boolean;
     };
 }
+
+export type Pagination = {
+    pagination: {
+        total: number
+    }
+}

packages/types/src/rest-api-manager/get-instances.ts

@@ -1,3 +1,4 @@
 import { GetInstanceResponse } from "../rest-api-sth";
+import { Pagination } from "./common";
 
-export type GetInstancesResponse = GetInstanceResponse[];
+export type GetInstancesResponse = Pagination & { data: GetInstanceResponse[]};

packages/types/src/rest-api-manager/get-list.ts

@@ -1,15 +1,17 @@
-import { ConnectedSTHInfoDetails } from "./common";
+import { ConnectedSTHInfoDetails, Pagination } from "./common";
 
-export type GetListResponse = {
-      id: string,
-      info: ConnectedSTHInfoDetails,
-      healthy: boolean,
-      selfHosted: boolean,
-      isConnectionActive: boolean,
-      description?: string,
-      tags?: string[],
-      disconnectReason?: string,
-      topics : string[],
-      sequences: string[],
-      instances: string[],
-}[]
+export type GetListResponse = Pagination & {
+      data: {
+            id: string,
+            info: ConnectedSTHInfoDetails,
+            healthy: boolean,
+            selfHosted: boolean,
+            isConnectionActive: boolean,
+            description?: string,
+            tags?: string[],
+            disconnectReason?: string,
+            topics : string[],
+            sequences: string[],
+            instances: string[],
+      }[]
+}

packages/types/src/rest-api-manager/get-sequences.ts

@@ -1,3 +1,4 @@
+import { Pagination } from "./common";
 import { GetSequenceResponse } from "./get-sequence";
 
-export type GetSequencesResponse = GetSequenceResponse[];
+export type GetSequencesResponse = Pagination & { data: GetSequenceResponse[]}