chore(gql/catalog): updating the return types from the catalog api

plugins/catalog-graphql/src/graphql/module.ts

@@ -50,15 +50,7 @@ export async function createModule(
     },
     CatalogQuery: {
       list: async () => {
-        const catalogEntries = await catalogClient.list();
-        return catalogEntries.map(entity => ({
-          ...entity,
-          metadata: {
-            ...entity.metadata,
-            annotations: entity.metadata.annotations ?? {},
-            labels: entity.metadata.labels ?? {},
-          },
-        }));
+        return await catalogClient.list();
       },
     },
     EntityMetadata: {

plugins/catalog-graphql/src/service/client.ts

@@ -23,6 +23,8 @@ export interface ReaderEntityMeta extends EntityMeta {
   etag: string;
   generation: number;
   namespace: string;
+  annotations: Record<string, string>;
+  labels: Record<string, string>;
 }
 export interface ReaderEntity extends Entity {
   metadata: JsonObject & ReaderEntityMeta;