TEMP state

Signed-off-by: Mirjam Aulbach <[email protected]>

coral/src/app/features/approvals/acls/AclApprovals.tsx

@@ -242,7 +242,7 @@ function AclApprovals() {
         filters={[
           <EnvironmentFilter
             key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+            environmentsFor={"TOPIC_AND_ACL"}
           />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,

coral/src/app/features/approvals/connectors/ConnectorApprovals.tsx

@@ -266,7 +266,7 @@ function ConnectorApprovals() {
         filters={[
           <EnvironmentFilter
             key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForConnector"}
+            environmentsFor={"CONNECTOR"}
           />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,

coral/src/app/features/approvals/schemas/SchemaApprovals.tsx

@@ -263,10 +263,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"} />,

coral/src/app/features/approvals/topics/TopicApprovals.tsx

@@ -286,7 +286,7 @@ function TopicApprovals() {
         filters={[
           <EnvironmentFilter
             key={"environment"}
-            environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+            environmentsFor={"TOPIC_AND_ACL"}
           />,
           <StatusFilter key={"status"} />,
           <RequestTypeFilter key={"requestType"} />,

coral/src/app/features/components/filters/EnvironmentFilter.test.tsx

@@ -5,7 +5,6 @@ import EnvironmentFilter from "src/app/features/components/filters/EnvironmentFi
 import { withFiltersContext } from "src/app/features/components/filters/useFiltersContext";
 import {
   getAllEnvironmentsForTopicAndAcl,
-  getAllEnvironmentsForSchema,
   getAllEnvironmentsForConnector,
 } from "src/domain/environment";
 import { createEnvironment } from "src/domain/environment/environment-test-helper";
@@ -18,11 +17,6 @@ const mockGetEnvironments =
     typeof getAllEnvironmentsForTopicAndAcl
   >;
 
-const mockGetSchemaRegistryEnvironments =
-  getAllEnvironmentsForSchema as jest.MockedFunction<
-    typeof getAllEnvironmentsForSchema
-  >;
-
 const mockGetSyncConnectorsEnvironments =
   getAllEnvironmentsForConnector as jest.MockedFunction<
     typeof getAllEnvironmentsForConnector
@@ -42,18 +36,13 @@ const mockEnvironments = [
 const filterLabel = "Filter by Environment";
 
 const WrappedEnvironmentFilter = withFiltersContext({
-  element: (
-    <EnvironmentFilter
-      environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
-    />
-  ),
+  element: <EnvironmentFilter environmentsFor={"TOPIC_AND_ACL"} />,
 });
 
 describe("EnvironmentFilter.tsx", () => {
   describe("uses a given endpoint to fetch environments", () => {
     beforeEach(() => {
       mockGetEnvironments.mockResolvedValue([]);
-      mockGetSchemaRegistryEnvironments.mockResolvedValue([]);
       mockGetSyncConnectorsEnvironments.mockResolvedValue([]);
     });
     afterEach(() => {
@@ -74,11 +63,7 @@ describe("EnvironmentFilter.tsx", () => {
 
     it("fetches from the getAllEnvironmentsForSchema endpoint", () => {
       const WrappedEnvironmentFilter = withFiltersContext({
-        element: (
-          <EnvironmentFilter
-            environmentEndpoint={"getAllEnvironmentsForSchema"}
-          />
-        ),
+        element: <EnvironmentFilter environmentsFor={"SCHEMA"} />,
       });
       customRender(<WrappedEnvironmentFilter />, {
         memoryRouter: true,
@@ -92,11 +77,7 @@ describe("EnvironmentFilter.tsx", () => {
 
     it("fetches from the getAllEnvironmentsForConnector endpoint", () => {
       const WrappedEnvironmentFilter = withFiltersContext({
-        element: (
-          <EnvironmentFilter
-            environmentEndpoint={"getAllEnvironmentsForConnector"}
-          />
-        ),
+        element: <EnvironmentFilter environmentsFor={"CONNECTOR"} />,
       });
       customRender(<WrappedEnvironmentFilter />, {
         memoryRouter: true,

coral/src/app/features/components/filters/EnvironmentFilter.tsx

@@ -4,35 +4,70 @@ import { useFiltersContext } from "src/app/features/components/filters/useFilter
 import {
   Environment,
   getAllEnvironmentsForTopicAndAcl,
-  getAllEnvironmentsForSchema,
   getAllEnvironmentsForConnector,
 } from "src/domain/environment";
 import { HTTPError } from "src/services/api";
 
-type EnvironmentEndpoint =
-  | "getAllEnvironmentsForTopicAndAcl"
-  | "getAllEnvironmentsForSchema"
-  | "getAllEnvironmentsForConnector";
+type EnvironmentFor = "TOPIC_AND_ACL" | "SCHEMA" | "CONNECTOR";
 interface EnvironmentFilterProps {
-  isSchemaRegistryEnvironments?: boolean;
-  environmentEndpoint: EnvironmentEndpoint;
+  environmentsFor: EnvironmentFor;
 }
 
 const environmentEndpointMap: {
-  [key in EnvironmentEndpoint]: () => Promise<Environment[]>;
+  [key in EnvironmentFor]: {
+    apiEndpoint: () => Promise<Environment[]>;
+    // we use the api function name as query usually, so we
+    // want to keep that pattern here, too.
+    queryFn: string;
+  };
 } = {
-  getAllEnvironmentsForTopicAndAcl: getAllEnvironmentsForTopicAndAcl,
-  getAllEnvironmentsForSchema: getAllEnvironmentsForSchema,
-  getAllEnvironmentsForConnector: getAllEnvironmentsForConnector,
+  TOPIC_AND_ACL: {
+    apiEndpoint: getAllEnvironmentsForTopicAndAcl,
+    queryFn: "getAllEnvironmentsForTopicAndAcl",
+  },
+  SCHEMA: {
+    apiEndpoint: getAllEnvironmentsForTopicAndAcl,
+    queryFn: "getAllEnvironmentsForTopicAndAcl",
+  },
+  CONNECTOR: {
+    apiEndpoint: getAllEnvironmentsForConnector,
+    queryFn: "getAllEnvironmentsForConnector",
+  },
 };
 
-function EnvironmentFilter({ environmentEndpoint }: EnvironmentFilterProps) {
+function filterEnvironmentsForSchema(
+  environments: Environment[]
+): Environment[] {
+  return environments
+    .map((env) => {
+      if (env.associatedEnv) {
+        return {
+          ...env,
+          id: env.associatedEnv.id,
+          name: env.associatedEnv.name,
+        };
+      }
+    })
+    .filter((entry) => entry !== undefined) as Environment[];
+}
+
+function EnvironmentFilter({ environmentsFor }: EnvironmentFilterProps) {
   const { environment, setFilterValue } = useFiltersContext();
 
   const { data: environments } = useQuery<Environment[], HTTPError>(
-    [environmentEndpoint],
+    [environmentEndpointMap[environmentsFor].queryFn],
     {
-      queryFn: environmentEndpointMap[environmentEndpoint],
+      queryFn: environmentEndpointMap[environmentsFor].apiEndpoint,
+      select: (environments) => {
+        if (environmentsFor === "SCHEMA") {
+          const filtered = filterEnvironmentsForSchema(environments);
+          console.log("filtered", filtered);
+          return filtered;
+        } else {
+          console.log("else");
+          return environments;
+        }
+      },
     }
   );
 

coral/src/app/features/connectors/browse/BrowseConnectors.tsx

@@ -54,10 +54,7 @@ function BrowseConnectors() {
     <TableLayout
       filters={[
         <TeamFilter key={"team"} />,
-        <EnvironmentFilter
-          key={"environment"}
-          environmentEndpoint={"getAllEnvironmentsForConnector"}
-        />,
+        <EnvironmentFilter key={"environment"} environmentsFor={"CONNECTOR"} />,
         <SearchConnectorFilter key="connector-name" />,
       ]}
       table={

coral/src/app/features/requests/acls/AclRequests.tsx

@@ -170,7 +170,7 @@ function AclRequests() {
         filters={[
           <EnvironmentFilter
             key="environment"
-            environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+            environmentsFor={"TOPIC_AND_ACL"}
           />,
           <AclTypeFilter key="aclType" />,
           <StatusFilter key="status" />,

coral/src/app/features/requests/connectors/ConnectorRequests.tsx

@@ -150,10 +150,7 @@ function ConnectorRequests() {
       {errorQuickActions && <Alert type="error">{errorQuickActions}</Alert>}
       <TableLayout
         filters={[
-          <EnvironmentFilter
-            key="environment"
-            environmentEndpoint="getAllEnvironmentsForConnector"
-          />,
+          <EnvironmentFilter key="environment" environmentsFor="CONNECTOR" />,
           <StatusFilter key="request-status" />,
           <RequestTypeFilter key={"request-type"} />,
           <SearchConnectorFilter key="connector" />,

coral/src/app/features/requests/schemas/SchemaRequests.tsx

@@ -160,10 +160,7 @@ function SchemaRequests() {
       {errorQuickActions && <Alert type="error">{errorQuickActions}</Alert>}
       <TableLayout
         filters={[
-          <EnvironmentFilter
-            key={"environments"}
-            environmentEndpoint={"getAllEnvironmentsForSchema"}
-          />,
+          <EnvironmentFilter key={"environments"} environmentsFor={"SCHEMA"} />,
           <StatusFilter key={"request-status"} />,
           <RequestTypeFilter key={"request-type"} />,
           <SearchTopicFilter key={"topic"} />,

coral/src/app/features/requests/topics/TopicRequests.tsx

@@ -152,7 +152,7 @@ function TopicRequests() {
         filters={[
           <EnvironmentFilter
             key="environments"
-            environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+            environmentsFor={"TOPIC_AND_ACL"}
           />,
           <StatusFilter key="request-status" />,
           <RequestTypeFilter key={"request-type"} />,

coral/src/app/features/topics/browse/BrowseTopics.tsx

@@ -57,7 +57,7 @@ function BrowseTopics() {
         <TeamFilter key="team" />,
         <EnvironmentFilter
           key="environment"
-          environmentEndpoint={"getAllEnvironmentsForTopicAndAcl"}
+          environmentsFor={"TOPIC_AND_ACL"}
         />,
         <SearchTopicFilter key={"search"} />,
       ]}

coral/src/domain/environment/environment-api.ts

@@ -27,6 +27,16 @@ const getAllEnvironmentsForTopicAndAcl = async (): Promise<Environment[]> => {
   return transformEnvironmentApiResponse(apiResponse);
 };
 
+const getEnvironmentsForSchema = async (): Promise<Environment[]> => {
+  const apiResponse = await api.get<KlawApiResponse<"getEnvs">>(
+    API_PATHS.getEnvs
+  );
+
+  const filteredEnvs = apiResponse.filter((env) => env.associatedEnv);
+  console.log(filteredEnvs);
+  return transformEnvironmentApiResponse(apiResponse);
+};
+
 const getPaginatedEnvironmentsForTopicAndAcl = async (
   params: KlawApiRequestQueryParameters<"getKafkaEnvsPaginated">
 ): Promise<EnvironmentPaginatedApiResponse> => {
@@ -51,14 +61,6 @@ const getEnvironmentsForTopicRequest = async (): Promise<Environment[]> => {
   return transformEnvironmentApiResponse(apiResponse);
 };
 
-const getAllEnvironmentsForSchema = async (): Promise<Environment[]> => {
-  const apiResponse = await api.get<KlawApiResponse<"getSchemaRegEnvs">>(
-    API_PATHS.getSchemaRegEnvs
-  );
-
-  return transformEnvironmentApiResponse(apiResponse);
-};
-
 const getPaginatedEnvironmentsForSchema = async (
   params: KlawApiRequestQueryParameters<"getSchemaRegEnvsPaginated">
 ): Promise<EnvironmentPaginatedApiResponse> => {
@@ -112,9 +114,9 @@ export {
   getAllEnvironmentsForTopicAndAcl,
   getPaginatedEnvironmentsForTopicAndAcl,
   getEnvironmentsForTopicRequest,
-  getAllEnvironmentsForSchema,
   getPaginatedEnvironmentsForSchema,
   getAllEnvironmentsForConnector,
   getPaginatedEnvironmentsForConnector,
   getUpdateEnvStatus,
+  getEnvironmentsForSchema,
 };

coral/src/domain/environment/index.ts

@@ -1,6 +1,5 @@
 import {
   getAllEnvironmentsForConnector,
-  getAllEnvironmentsForSchema,
   getAllEnvironmentsForTopicAndAcl,
   getEnvironmentsForTopicRequest,
   getPaginatedEnvironmentsForConnector,
@@ -18,7 +17,6 @@ import {
 export {
   ALL_ENVIRONMENTS_VALUE,
   getAllEnvironmentsForConnector,
-  getAllEnvironmentsForSchema,
   getAllEnvironmentsForTopicAndAcl,
   getEnvironmentsForTopicRequest,
   getPaginatedEnvironmentsForConnector,