refactor(coral): Use new property hasOpenRequestOnEnyEnv for Claim …

…Banners (#1811) * Update ClaimBanner Signed-off-by: Mirjam Aulbach <[email protected]> * Use new property when using ClaimBanner Signed-off-by: Mirjam Aulbach <[email protected]> --------- Signed-off-by: Mirjam Aulbach <[email protected]>
Aiven-Open · Oct 5, 2023 · 8acd3fc · 8acd3fc
1 parent 6c9a7c1
commit 8acd3fc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/coral/src/app/features/components/ClaimBanner.test.tsx b/coral/src/app/features/components/ClaimBanner.test.tsx
@@ -12,7 +12,7 @@ const testProps = {
   claimEntity: mockClaimEntity,
   isError: false,
   hasOpenClaimRequest: false,
-  hasOpenRequest: false,
+  hasOpenRequestOnAnyEnv: false,
   entityOwner: "teamname",
 };
 
@@ -70,7 +70,7 @@ describe("ClaimBanner", () => {
           <ClaimBanner
             {...testProps}
             entityType={"topic"}
-            hasOpenRequest={true}
+            hasOpenRequestOnAnyEnv={true}
           />
         );
       });
@@ -92,7 +92,7 @@ describe("ClaimBanner", () => {
           <ClaimBanner
             {...testProps}
             entityType={"connector"}
-            hasOpenRequest={true}
+            hasOpenRequestOnAnyEnv={true}
           />
         );
       });
@@ -115,7 +115,7 @@ describe("ClaimBanner", () => {
             {...testProps}
             entityType={"topic"}
             hasOpenClaimRequest={true}
-            hasOpenRequest={true}
+            hasOpenRequestOnAnyEnv={true}
           />,
           {
             memoryRouter: true,
@@ -151,7 +151,7 @@ describe("ClaimBanner", () => {
             {...testProps}
             entityType={"connector"}
             hasOpenClaimRequest={true}
-            hasOpenRequest={true}
+            hasOpenRequestOnAnyEnv={true}
           />,
           {
             memoryRouter: true,

diff --git a/coral/src/app/features/components/ClaimBanner.tsx b/coral/src/app/features/components/ClaimBanner.tsx
@@ -5,7 +5,7 @@ import illustration from "src/app/images/topic-details-banner-Illustration.svg";
 interface ClaimBannerProps {
   entityType: "topic" | "connector";
   entityName: string;
-  hasOpenRequest: boolean;
+  hasOpenRequestOnAnyEnv: boolean;
   hasOpenClaimRequest: boolean;
   claimEntity: () => void;
   isError: boolean;
@@ -17,14 +17,14 @@ const ClaimBanner = ({
   entityType,
   entityName,
   hasOpenClaimRequest,
-  hasOpenRequest,
+  hasOpenRequestOnAnyEnv,
   claimEntity,
   isError,
   errorMessage,
   entityOwner,
 }: ClaimBannerProps) => {
-  // if there is an open claim request, hasOpenRequest is true, too
-  if (hasOpenRequest && !hasOpenClaimRequest) {
+  // if there is an open claim request, hasOpenRequestOnAnyEnv is true, too
+  if (hasOpenRequestOnAnyEnv && !hasOpenClaimRequest) {
     // We do not render an InternalLinkButton to the Requests page for this state...
     // .. because a user cannot see the requests opened by members of other teams
     return (

diff --git a/coral/src/app/features/connectors/details/ConnectorDetails.tsx b/coral/src/app/features/connectors/details/ConnectorDetails.tsx
@@ -187,7 +187,9 @@ function ConnectorDetails(props: ConnectorOverviewProps) {
                 connectorData?.connectorInfo.hasOpenClaimRequest
               }
               entityOwner={connectorData.connectorInfo.teamName}
-              hasOpenRequest={connectorData?.connectorInfo.hasOpenRequest}
+              hasOpenRequestOnAnyEnv={
+                connectorData?.connectorInfo.hasOpenRequestOnAnyEnv
+              }
               claimEntity={() => setShowClaimModal(true)}
               isError={isErrorCreateClaimConnectorRequest}
               errorMessage={claimErrorMessage}

diff --git a/coral/src/app/features/topics/details/TopicDetails.tsx b/coral/src/app/features/topics/details/TopicDetails.tsx
@@ -178,7 +178,9 @@ function TopicDetails(props: TopicOverviewProps) {
               entityName={topicName}
               hasOpenClaimRequest={topicData?.topicInfo.hasOpenClaimRequest}
               entityOwner={topicData.topicInfo.teamname}
-              hasOpenRequest={topicData?.topicInfo.hasOpenRequest}
+              hasOpenRequestOnAnyEnv={
+                topicData?.topicInfo.hasOpenRequestOnAnyEnv
+              }
               claimEntity={() => setShowClaimModal(true)}
               isError={createClaimTopicRequestIsError}
               errorMessage={claimErrorMessage}