Use the environment Id from the topicDetails (#2603)

* Use the environment Id from the topicDetails Signed-off-by: Aindriu Lavelle <[email protected]> * add the default consumerGroupId as a constant Signed-off-by: Aindriu Lavelle <[email protected]> --------- Signed-off-by: Aindriu Lavelle <[email protected]>
Aiven-Open · Sep 4, 2024 · 731e43e · 731e43e
1 parent dfd38c9
commit 731e43e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/coral/src/app/features/topics/details/messages/TopicMessages.test.tsx b/coral/src/app/features/topics/details/messages/TopicMessages.test.tsx
@@ -22,7 +22,7 @@ const mockGetTopicMessagesNoContentResponse = {
 };
 
 function DummyParent() {
-  return <Outlet context={{ topicName: "test" }} />;
+  return <Outlet context={{ topicName: "test", environmentId: "2" }} />;
 }
 
 describe("TopicMessages", () => {

diff --git a/coral/src/app/features/topics/details/messages/TopicMessages.tsx b/coral/src/app/features/topics/details/messages/TopicMessages.tsx
@@ -22,6 +22,7 @@ import { getTopicMessages } from "src/domain/topic/topic-api";
 import {
   type NoContent,
   type TopicMessages as TopicMessagesType,
+  TOPIC_MESSAGE_DEFAULT_USER_GROUP_ID,
 } from "src/domain/topic/topic-types";
 
 function isNoContentResult(
@@ -31,7 +32,7 @@ function isNoContentResult(
 }
 
 function TopicMessages() {
-  const { topicName } = useTopicDetails();
+  const { topicName, environmentId } = useTopicDetails();
 
   const {
     validateFilters,
@@ -60,8 +61,8 @@ function TopicMessages() {
     queryFn: () =>
       getTopicMessages({
         topicName,
-        consumerGroupId: "notdefined",
-        envId: "2",
+        consumerGroupId: TOPIC_MESSAGE_DEFAULT_USER_GROUP_ID,
+        envId: environmentId,
         offsetId: defaultOffsetFilters.defaultOffset,
         selectedPartitionId: Number(partitionIdFilters.partitionId),
         selectedNumberOfOffsets: Number(customOffsetFilters.customOffset),

diff --git a/coral/src/domain/topic/index.ts b/coral/src/domain/topic/index.ts
@@ -23,6 +23,7 @@ import {
   TopicSchemaOverview,
   TopicTeam,
   TopicType,
+  TOPIC_MESSAGE_DEFAULT_USER_GROUP_ID,
 } from "src/domain/topic/topic-types";
 
 export {
@@ -36,6 +37,7 @@ export {
   getTopics,
   requestTopicPromotion,
   updateTopicDocumentation,
+  TOPIC_MESSAGE_DEFAULT_USER_GROUP_ID,
 };
 export type {
   DeleteTopicPayload,

diff --git a/coral/src/domain/topic/topic-types.ts b/coral/src/domain/topic/topic-types.ts
@@ -92,6 +92,8 @@ type TopicClaimPayload = ResolveIntersectionTypes<
 
 type TopicDetailsPerEnv = KlawApiModel<"TopicDetailsPerEnv">;
 
+const TOPIC_MESSAGE_DEFAULT_USER_GROUP_ID = "notdefined";
+
 export type {
   AclOverviewInfo,
   DeleteTopicPayload,
@@ -114,3 +116,5 @@ export type {
   TopicType,
   GetTopicsQueryParameter,
 };
+
+export { TOPIC_MESSAGE_DEFAULT_USER_GROUP_ID };