Update schema request with kafka env (#1846)

* Update schema request with kafka env Signed-off-by: muralibasani <[email protected]> * Remove unused component Signed-off-by: Mirjam Aulbach <[email protected]> * Remove deleted endpoint. Signed-off-by: Mirjam Aulbach <[email protected]> * Use getEnvs endpoint instead of deleted one. Signed-off-by: Mirjam Aulbach <[email protected]> * Filter getEnvs response for schema request Signed-off-by: Mirjam Aulbach <[email protected]> * Remove api call from environment-api Signed-off-by: Mirjam Aulbach <[email protected]> * Update EnvironmentFilter and components using it. Signed-off-by: Mirjam Aulbach <[email protected]> * Update schema request with kafka env Signed-off-by: muralibasani <[email protected]> * Remove unused component Signed-off-by: Mirjam Aulbach <[email protected]> * Remove deleted endpoint. Signed-off-by: Mirjam Aulbach <[email protected]> * Use getEnvs endpoint instead of deleted one. Signed-off-by: Mirjam Aulbach <[email protected]> * Filter getEnvs response for schema request Signed-off-by: Mirjam Aulbach <[email protected]> * Remove api call from environment-api Signed-off-by: Mirjam Aulbach <[email protected]> * Update EnvironmentFilter and components using it. Signed-off-by: Mirjam Aulbach <[email protected]> --------- Signed-off-by: muralibasani <[email protected]> Signed-off-by: Mirjam Aulbach <[email protected]> Co-authored-by: muralibasani <[email protected]> Co-authored-by: Mirjam Aulbach <[email protected]> Co-authored-by: aindriu-aiven <[email protected]>
Aiven-Open · Oct 13, 2023 · ba75970 · ba75970
1 parent c5407b7
commit ba75970
Show file tree

Hide file tree

Showing 35 changed files with 388 additions and 467 deletions.
diff --git a/coral/src/app/features/approvals/acls/AclApprovals.tsx b/coral/src/app/features/approvals/acls/AclApprovals.tsx
@@ -240,7 +240,7 @@ function AclApprovals() {
         filters={[
           <EnvironmentFilter
             key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+            environmentsFor={"TOPIC_AND_ACL"}
           />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,

diff --git a/coral/src/app/features/approvals/connectors/ConnectorApprovals.tsx b/coral/src/app/features/approvals/connectors/ConnectorApprovals.tsx
@@ -264,7 +264,7 @@ function ConnectorApprovals() {
         filters={[
           <EnvironmentFilter
             key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForConnector"}
+            environmentsFor={"CONNECTOR"}
           />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,

diff --git a/coral/src/app/features/approvals/schemas/SchemaApprovals.test.tsx b/coral/src/app/features/approvals/schemas/SchemaApprovals.test.tsx
@@ -2,7 +2,7 @@ import { cleanup, screen, waitFor, within } from "@testing-library/react";
 import { waitForElementToBeRemoved } from "@testing-library/react/pure";
 import userEvent from "@testing-library/user-event";
 import SchemaApprovals from "src/app/features/approvals/schemas/SchemaApprovals";
-import { getAllEnvironmentsForSchema } from "src/domain/environment";
+import { getAllEnvironmentsForTopicAndAcl } from "src/domain/environment";
 import { createMockEnvironmentDTO } from "src/domain/environment/environment-test-helper";
 import { transformEnvironmentApiResponse } from "src/domain/environment/environment-transformer";
 import {
@@ -19,9 +19,9 @@ import { customRender } from "src/services/test-utils/render-with-wrappers";
 jest.mock("src/domain/schema-request/schema-request-api.ts");
 jest.mock("src/domain/environment/environment-api.ts");
 
-const mockGetSchemaRegistryEnvironments =
-  getAllEnvironmentsForSchema as jest.MockedFunction<
-    typeof getAllEnvironmentsForSchema
+const mockGetAllEnvironmentsForTopicAndAcl =
+  getAllEnvironmentsForTopicAndAcl as jest.MockedFunction<
+    typeof getAllEnvironmentsForTopicAndAcl
   >;
 
 const mockGetSchemaRequestsForApprover =
@@ -37,8 +37,9 @@ const mockApproveSchemaRequest = approveSchemaRequest as jest.MockedFunction<
 >;
 
 const mockedEnvironments = [
-  { name: "DEV", id: "1" },
-  { name: "TST", id: "2" },
+  { name: "DEV", id: "1", associatedEnv: { name: "DEV_SCH", id: "111" } },
+  { name: "TST", id: "2", associatedEnv: { name: "TST_SCH", id: "222" } },
+  { name: "RANDOM", id: "3" },
 ];
 
 const mockedEnvironmentResponse = transformEnvironmentApiResponse([
@@ -133,7 +134,7 @@ describe("SchemaApprovals", () => {
         totalPages: 1,
         currentPage: 1,
       });
-      mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]);
     });
 
     afterEach(() => {
@@ -177,7 +178,7 @@ describe("SchemaApprovals", () => {
 
   describe("renders all necessary elements", () => {
     beforeAll(async () => {
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue(
@@ -239,7 +240,7 @@ describe("SchemaApprovals", () => {
         totalPages: 1,
         currentPage: 1,
       });
-      mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]);
     });
 
     afterEach(() => {
@@ -345,7 +346,7 @@ describe("SchemaApprovals", () => {
         entries: [],
       });
 
-      mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]);
 
       customRender(<SchemaApprovals />, {
         queryClient: true,
@@ -386,7 +387,7 @@ describe("SchemaApprovals", () => {
 
   describe("shows a detail modal for schema request", () => {
     beforeEach(async () => {
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue(
@@ -506,7 +507,7 @@ describe("SchemaApprovals", () => {
 
   describe("handles filtering entries in the table", () => {
     beforeEach(async () => {
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue({
@@ -577,13 +578,19 @@ describe("SchemaApprovals", () => {
         name: "Filter by Environment",
       });
       const environmentOption = screen.getByRole("option", {
-        name: mockedEnvironments[0].name,
+        // we're defining the test data, so it is not undefined
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        //@ts-ignore
+        name: mockedEnvironments[0].associatedEnv.name,
       });
       await userEvent.selectOptions(environmentFilter, environmentOption);
 
       expect(mockGetSchemaRequestsForApprover).toHaveBeenNthCalledWith(2, {
         ...defaultApiParams,
-        env: mockedEnvironments[0].id,
+        // we're defining the test data, so it is not undefined
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        //@ts-ignore
+        env: mockedEnvironments[0].associatedEnv.id,
       });
     });
 
@@ -614,7 +621,7 @@ describe("SchemaApprovals", () => {
       console.error = jest.fn();
 
       console.error = jest.fn();
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue(
@@ -712,7 +719,7 @@ describe("SchemaApprovals", () => {
       console.error = jest.fn();
 
       console.error = jest.fn();
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue(
@@ -837,7 +844,7 @@ describe("SchemaApprovals", () => {
       console.error = jest.fn();
 
       console.error = jest.fn();
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue(
@@ -1007,7 +1014,7 @@ describe("SchemaApprovals", () => {
       console.error = jest.fn();
 
       console.error = jest.fn();
-      mockGetSchemaRegistryEnvironments.mockResolvedValue(
+      mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
         mockedEnvironmentResponse
       );
       mockGetSchemaRequestsForApprover.mockResolvedValue(

diff --git a/coral/src/app/features/approvals/schemas/SchemaApprovals.tsx b/coral/src/app/features/approvals/schemas/SchemaApprovals.tsx
@@ -261,10 +261,7 @@ function SchemaApprovals() {
       {errorQuickActions && <Alert type="error">{errorQuickActions}</Alert>}
       <TableLayout
         filters={[
-          <EnvironmentFilter
-            key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForSchema"}
-          />,
+          <EnvironmentFilter key={"environment"} environmentsFor={"SCHEMA"} />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,
           <SearchTopicFilter key={"topic"} />,

diff --git a/coral/src/app/features/approvals/schemas/components/SelectSchemaRegEnvironment.test.tsx b/coral/src/app/features/approvals/schemas/components/SelectSchemaRegEnvironment.test.tsx
diff --git a/coral/src/app/features/approvals/schemas/components/SelectSchemaRegEnvironment.tsx b/coral/src/app/features/approvals/schemas/components/SelectSchemaRegEnvironment.tsx
diff --git a/coral/src/app/features/approvals/topics/TopicApprovals.tsx b/coral/src/app/features/approvals/topics/TopicApprovals.tsx
@@ -284,7 +284,7 @@ function TopicApprovals() {
         filters={[
           <EnvironmentFilter
             key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+            environmentsFor={"TOPIC_AND_ACL"}
           />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,