fix(app subscription): fix api error and validation (#244)

eclipse-tractusx · Aug 31, 2023 · a7e6caa · a7e6caa
1 parent ef04ad7
commit a7e6caa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/pages/AppSubscription/ActivateSubscriptionOverlay/index.tsx b/src/components/pages/AppSubscription/ActivateSubscriptionOverlay/index.tsx
@@ -32,7 +32,7 @@ import {
 } from '@catena-x/portal-shared-components'
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline'
 import { useTranslation, Trans } from 'react-i18next'
-import { isURL } from 'types/Patterns'
+import { isKeycloakURL } from 'types/Patterns'
 import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined'
 import {
   SubscriptionActivationResponse,
@@ -86,7 +86,7 @@ const ActivateSubscriptionOverlay = ({
   const addInputURL = (value: string) => {
     setInputURL(value)
     setURLErrorMessage(
-      !isURL(value.trim())
+      !isKeycloakURL(value.trim())
         ? t('content.appSubscription.pleaseEnterValidURL')
         : ''
     )

diff --git a/src/components/shared/templates/Subscription/SubscriptionElements.tsx b/src/components/shared/templates/Subscription/SubscriptionElements.tsx
@@ -266,7 +266,7 @@ export default function SubscriptionElements({
           }}
         />
       )}
-      {viewDetails && (
+      {viewDetails.appId && (
         <AppSubscriptionDetailOverlay
           openDialog={viewDetails.appId ? true : false}
           appId={viewDetails.appId}

diff --git a/src/types/Patterns.ts b/src/types/Patterns.ts
@@ -91,6 +91,8 @@ export const isMail = (expr: string) => Patterns.MAIL.test(expr)
 export const isBPN = (expr: string) => Patterns.BPN.test(expr)
 export const isDomain = (expr: string) => Patterns.DOMAIN.test(expr)
 export const isURL = (expr: string) => Patterns.URL.test(expr)
+export const isKeycloakURL = (expr: string) =>
+  isURL(expr) && !expr.includes('#')
 export const isUUID = (expr: string) => Patterns.UUID.test(expr)
 export const isCompanyName = (expr: string) => Patterns.COMPANY_NAME.test(expr)
 export const isFirstName = (expr: string) => Patterns.firstName.test(expr)