Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update schema request with kafka env #1846

Merged
merged 19 commits into from
Oct 13, 2023
Merged

Update schema request with kafka env #1846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ab95611
Update schema request with kafka env
Oct 5, 2023
cd3a1d9
Remove unused component
programmiri Oct 5, 2023
8ae8bca
Remove deleted endpoint.
programmiri Oct 5, 2023
73c9e50
Use getEnvs endpoint instead of deleted one.
programmiri Oct 5, 2023
042ca27
Merge branch 'main' of github.com:aiven/klaw into issue1593
Oct 5, 2023
51caeed
Filter getEnvs response for schema request
programmiri Oct 6, 2023
5c57cd2
Remove api call from environment-api
programmiri Oct 10, 2023
84ee4ed
Update EnvironmentFilter and components using it.
programmiri Oct 10, 2023
2c7120f
Merge branch 'main' of github.com:aiven/klaw into issue1593
Oct 11, 2023
108e9d5
Update schema request with kafka env
Oct 5, 2023
a597292
Remove unused component
programmiri Oct 5, 2023
a99e05f
Remove deleted endpoint.
programmiri Oct 5, 2023
a025b25
Use getEnvs endpoint instead of deleted one.
programmiri Oct 5, 2023
e720416
Filter getEnvs response for schema request
programmiri Oct 6, 2023
cd8401a
Remove api call from environment-api
programmiri Oct 10, 2023
66707b2
Update EnvironmentFilter and components using it.
programmiri Oct 10, 2023
818e3b8
Merge branch 'main' into issue1593
aindriu-aiven Oct 13, 2023
db9738a
Merge branch 'main' of github.com:aiven/klaw into issue1593
Oct 13, 2023
522f15a
Merge branch 'issue1593' of github.com:aiven/klaw into issue1593
Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coral/src/app/features/approvals/acls/AclApprovals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ function AclApprovals() {
filters={[
<EnvironmentFilter
key={"environment"}
environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
environmentsFor={"TOPIC_AND_ACL"}
/>,
<StatusFilter key={"status"} />,
<RequestTypeFilter key={"requestType"} />,
Expand Down
2 changes: 1 addition & 1 deletion coral/src/app/features/approvals/connectors/ConnectorApprovals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ function ConnectorApprovals() {
filters={[
<EnvironmentFilter
key={"environment"}
environmentEndpoint={"getAllEnvironmentsForConnector"}
environmentsFor={"CONNECTOR"}
/>,
<StatusFilter key={"status"} />,
<RequestTypeFilter key={"requestType"} />,
Expand Down
43 changes: 25 additions & 18 deletions coral/src/app/features/approvals/schemas/SchemaApprovals.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 =
Expand All @@ -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([
Expand Down Expand Up @@ -133,7 +134,7 @@ describe("SchemaApprovals", () => {
totalPages: 1,
currentPage: 1,
});
mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]);
});

afterEach(() => {
Expand Down Expand Up @@ -177,7 +178,7 @@ describe("SchemaApprovals", () => {

describe("renders all necessary elements", () => {
beforeAll(async () => {
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue(
Expand Down Expand Up @@ -239,7 +240,7 @@ describe("SchemaApprovals", () => {
totalPages: 1,
currentPage: 1,
});
mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]);
});

afterEach(() => {
Expand Down Expand Up @@ -345,7 +346,7 @@ describe("SchemaApprovals", () => {
entries: [],
});

mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue([]);

customRender(<SchemaApprovals />, {
queryClient: true,
Expand Down Expand Up @@ -386,7 +387,7 @@ describe("SchemaApprovals", () => {

describe("shows a detail modal for schema request", () => {
beforeEach(async () => {
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue(
Expand Down Expand Up @@ -506,7 +507,7 @@ describe("SchemaApprovals", () => {

describe("handles filtering entries in the table", () => {
beforeEach(async () => {
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue({
Expand Down Expand Up @@ -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,
});
});

Expand Down Expand Up @@ -614,7 +621,7 @@ describe("SchemaApprovals", () => {
console.error = jest.fn();

console.error = jest.fn();
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue(
Expand Down Expand Up @@ -712,7 +719,7 @@ describe("SchemaApprovals", () => {
console.error = jest.fn();

console.error = jest.fn();
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue(
Expand Down Expand Up @@ -837,7 +844,7 @@ describe("SchemaApprovals", () => {
console.error = jest.fn();

console.error = jest.fn();
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue(
Expand Down Expand Up @@ -1007,7 +1014,7 @@ describe("SchemaApprovals", () => {
console.error = jest.fn();

console.error = jest.fn();
mockGetSchemaRegistryEnvironments.mockResolvedValue(
mockGetAllEnvironmentsForTopicAndAcl.mockResolvedValue(
mockedEnvironmentResponse
);
mockGetSchemaRequestsForApprover.mockResolvedValue(
Expand Down
5 changes: 1 addition & 4 deletions coral/src/app/features/approvals/schemas/SchemaApprovals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"} />,
Expand Down
130 changes: 0 additions & 130 deletions coral/src/app/features/approvals/schemas/components/SelectSchemaRegEnvironment.test.tsx
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions coral/src/app/features/approvals/schemas/components/SelectSchemaRegEnvironment.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion coral/src/app/features/approvals/topics/TopicApprovals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ function TopicApprovals() {
filters={[
<EnvironmentFilter
key={"environment"}
environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
environmentsFor={"TOPIC_AND_ACL"}
/>,
<StatusFilter key={"status"} />,
<RequestTypeFilter key={"requestType"} />,
Expand Down
Loading
Loading