From 73c9e50eebc33bd02351dd7c279e841c02674cf3 Mon Sep 17 00:00:00 2001 From: Mirjam Aulbach Date: Thu, 5 Oct 2023 15:32:04 +0200 Subject: [PATCH] Use getEnvs endpoint instead of deleted one. Signed-off-by: Mirjam Aulbach --- .../TopicSchemaRequest.test.tsx | 30 +++++++++---------- .../schema-request/TopicSchemaRequest.tsx | 6 ++-- .../app/pages/topics/schema-request.test.tsx | 10 +++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/coral/src/app/features/topics/schema-request/TopicSchemaRequest.test.tsx b/coral/src/app/features/topics/schema-request/TopicSchemaRequest.test.tsx index f16ef712d9..4fdf045031 100644 --- a/coral/src/app/features/topics/schema-request/TopicSchemaRequest.test.tsx +++ b/coral/src/app/features/topics/schema-request/TopicSchemaRequest.test.tsx @@ -8,7 +8,7 @@ import { } from "@testing-library/react/pure"; import userEvent from "@testing-library/user-event"; import { TopicSchemaRequest } from "src/app/features/topics/schema-request/TopicSchemaRequest"; -import { getEnvironmentsForSchemaRequest } 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 { requestSchemaCreation } from "src/domain/schema-request"; @@ -19,9 +19,9 @@ jest.mock("src/domain/schema-request/schema-request-api.ts"); jest.mock("src/domain/environment/environment-api.ts"); jest.mock("src/domain/topic/topic-api.ts"); -const mockGetSchemaRegistryEnvironments = - getEnvironmentsForSchemaRequest as jest.MockedFunction< - typeof getEnvironmentsForSchemaRequest +const mockgetAllEnvironmentsForTopicAndAcl = + getAllEnvironmentsForTopicAndAcl as jest.MockedFunction< + typeof getAllEnvironmentsForTopicAndAcl >; const mockCreateSchemaRequest = requestSchemaCreation as jest.MockedFunction< typeof requestSchemaCreation @@ -75,7 +75,7 @@ describe("TopicSchemaRequest", () => { describe("checks if topicName passed from url is part of topics user can request schemas for", () => { beforeEach(() => { - mockGetSchemaRegistryEnvironments.mockResolvedValue( + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue( mockedGetSchemaRegistryEnvironments ); mockCreateSchemaRequest.mockImplementation(jest.fn()); @@ -145,7 +145,7 @@ describe("TopicSchemaRequest", () => { }); it("does not redirect user if env ID query is part of list of environments", async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue([ + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue([ ...mockedGetSchemaRegistryEnvironments, ]); @@ -184,7 +184,7 @@ describe("TopicSchemaRequest", () => { }); it("does not redirect user if env name query is part of list of environments", async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue([ + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue([ ...mockedGetSchemaRegistryEnvironments, ]); @@ -223,7 +223,7 @@ describe("TopicSchemaRequest", () => { }); it("redirects user if env id query does not exist in list of environments", async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue([ + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue([ ...mockedGetSchemaRegistryEnvironments, ]); @@ -244,7 +244,7 @@ describe("TopicSchemaRequest", () => { }); it("redirects user if env name query does not exist in list of environments", async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue([ + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue([ ...mockedGetSchemaRegistryEnvironments, ]); @@ -270,7 +270,7 @@ describe("TopicSchemaRequest", () => { // eslint-disable-next-line @typescript-eslint/ban-ts-comment //@ts-ignore useQuerySpy.mockReturnValue({ data: [], isLoading: true }); - mockGetSchemaRegistryEnvironments.mockResolvedValue([]); + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]); mockCreateSchemaRequest.mockImplementation(jest.fn()); mockGetTopicNames.mockResolvedValue([testTopicName]); @@ -308,7 +308,7 @@ describe("TopicSchemaRequest", () => { describe("renders all necessary elements", () => { beforeAll(async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue( + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue( mockedGetSchemaRegistryEnvironments ); mockCreateSchemaRequest.mockImplementation(jest.fn()); @@ -441,7 +441,7 @@ describe("TopicSchemaRequest", () => { describe("shows errors when user does not fill out correctly", () => { beforeEach(async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue( + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue( mockedGetSchemaRegistryEnvironments ); mockCreateSchemaRequest.mockImplementation(jest.fn()); @@ -519,7 +519,7 @@ describe("TopicSchemaRequest", () => { describe("enables user to cancel the form input", () => { beforeEach(async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue( + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue( mockedGetSchemaRegistryEnvironments ); mockCreateSchemaRequest.mockImplementation(jest.fn()); @@ -635,7 +635,7 @@ describe("TopicSchemaRequest", () => { beforeEach(async () => { console.error = jest.fn(); - mockGetSchemaRegistryEnvironments.mockResolvedValue( + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue( mockedGetSchemaRegistryEnvironments ); mockCreateSchemaRequest.mockRejectedValue({ @@ -740,7 +740,7 @@ describe("TopicSchemaRequest", () => { describe("enables user to send a schema request", () => { beforeEach(async () => { - mockGetSchemaRegistryEnvironments.mockResolvedValue( + mockgetAllEnvironmentsForTopicAndAcl.mockResolvedValue( mockedGetSchemaRegistryEnvironments ); mockCreateSchemaRequest.mockResolvedValue({ diff --git a/coral/src/app/features/topics/schema-request/TopicSchemaRequest.tsx b/coral/src/app/features/topics/schema-request/TopicSchemaRequest.tsx index 2ffc436652..331703f330 100644 --- a/coral/src/app/features/topics/schema-request/TopicSchemaRequest.tsx +++ b/coral/src/app/features/topics/schema-request/TopicSchemaRequest.tsx @@ -17,7 +17,7 @@ import { } from "src/app/features/topics/schema-request/form-schemas/topic-schema-request-form"; import { Environment, - getEnvironmentsForSchemaRequest, + getAllEnvironmentsForTopicAndAcl, } from "src/domain/environment"; import { requestSchemaCreation } from "src/domain/schema-request"; import { TopicNames, getTopicNames } from "src/domain/topic"; @@ -86,8 +86,8 @@ function TopicSchemaRequest(props: TopicSchemaRequestProps) { Environment[], Error >({ - queryKey: ["schemaRegistryEnvironments"], - queryFn: () => getEnvironmentsForSchemaRequest(), + queryKey: ["getEnvs"], + queryFn: () => getAllEnvironmentsForTopicAndAcl(), onSuccess: (environments) => { if (presetEnvironment) { const validEnv = environments.find( diff --git a/coral/src/app/pages/topics/schema-request.test.tsx b/coral/src/app/pages/topics/schema-request.test.tsx index 806ca15eca..f0381f75df 100644 --- a/coral/src/app/pages/topics/schema-request.test.tsx +++ b/coral/src/app/pages/topics/schema-request.test.tsx @@ -5,7 +5,7 @@ import { getQueryClientForTests } from "src/services/test-utils/query-client-tes import { render } from "@testing-library/react"; import { QueryClientProvider } from "@tanstack/react-query"; import { MemoryRouter, Routes, Route } from "react-router-dom"; -import { getEnvironmentsForSchemaRequest } from "src/domain/environment"; +import { getAllEnvironmentsForTopicAndAcl } from "src/domain/environment"; import { requestSchemaCreation } from "src/domain/schema-request"; import { getTopicNames } from "src/domain/topic"; @@ -13,9 +13,9 @@ jest.mock("src/domain/schema-request/schema-request-api.ts"); jest.mock("src/domain/environment/environment-api.ts"); jest.mock("src/domain/topic/topic-api.ts"); -const mockGetSchemaRegistryEnvironments = - getEnvironmentsForSchemaRequest as jest.MockedFunction< - typeof getEnvironmentsForSchemaRequest +const mockGetAllEnvironmentsForTopicAndAcl = + getAllEnvironmentsForTopicAndAcl as jest.MockedFunction< + typeof getAllEnvironmentsForTopicAndAcl >; const mockCreateSchemaRequest = requestSchemaCreation as jest.MockedFunction< typeof requestSchemaCreation @@ -29,7 +29,7 @@ describe("SchemaRequest", () => { const topicName = "my-awesome-topic"; beforeAll(() => { - mockGetSchemaRegistryEnvironments.mockResolvedValue([]); + mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]); mockCreateSchemaRequest.mockImplementation(jest.fn()); mockGetTopicNames.mockResolvedValue([topicName]); // @TODO if we decide to go with this kind of dynamic routes,