LinkedHubs visual update after review

plgd-dev · Apr 30, 2024 · ebdba8a · ebdba8a
1 parent bd23aed
commit ebdba8a
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/src/common/hooks/useWellKnownConfiguration.ts b/src/common/hooks/useWellKnownConfiguration.ts
@@ -60,6 +60,7 @@ export type WellKnownConfigType = {
         defaultDiscoveryTimeout?: string
     }
     id?: string
+    jwtOwnerClaim?: string
 } & BuildInformationType
 
 type useWellKnownConfigurationReturnType = [

diff --git a/src/common/services/api-utils.ts b/src/common/services/api-utils.ts
@@ -70,3 +70,14 @@ export const isYourId = (uuid: string, hubsData: any) => {
 }
 
 export const isOwnerId = (uuid: string, owner: string) => (checkIfValidUUID(uuid) && uuid === owner) || uuidv5(owner, uuidv5.URL) === uuid
+
+export const getOwnerId = (jwtOwnerClaim: string) => {
+    const accessToken = security.getAccessToken()
+
+    if (accessToken) {
+        const parsedData: any = jwtDecode(accessToken)
+        return get(parsedData, jwtOwnerClaim as string, '')
+    }
+
+    return ''
+}
diff --git a/src/components/Templates/FullPageWizard/Components.tsx b/src/components/Templates/FullPageWizard/Components.tsx
@@ -6,6 +6,7 @@ import IconQuestion from '../../Atomic/Icon/components/IconQuestion'
 import { convertSize } from '../../Atomic/Icon'
 import ShowAnimate from '../../Atomic/ShowAnimate'
 import IconSettings from '../../Atomic/Icon/components/IconSettings'
+import isFunction from 'lodash/isFunction'
 
 export type DescriptionProps = {
     children: string
@@ -31,11 +32,13 @@ export type GroupHeadlineProps = {
 export type ToggleConfigurationProps = {
     defaultShow?: boolean
     children: React.ReactNode | React.ReactNode[]
+    hideToggleLink?: boolean
     i18n: {
         hide: string
         show: string
     }
     margin?: boolean
+    onShowChange?: (show: boolean) => void
 }
 
 export const Description: FC<DescriptionProps> = (props) => <p css={[styles.description, props.large && styles.descriptionLarge]}>{props.children}</p>
@@ -61,17 +64,25 @@ export const GroupHeadline: FC<GroupHeadlineProps> = (props) => (
 )
 
 export const ToggleConfiguration: FC<ToggleConfigurationProps> = (props) => {
-    const { i18n, children, margin = true } = props
-    const [show, setShow] = useState(false)
+    const { defaultShow, i18n, children, hideToggleLink, margin = true, onShowChange } = props
+    const [show, setShow] = useState(defaultShow ?? false)
 
     return (
         <>
             <ShowAnimate show={show}>
                 <>{children}</>
             </ShowAnimate>
-            <div css={[styles.expander, margin && styles.expanderMargin]} onClick={() => setShow(!show)}>
-                <IconSettings /> {show ? i18n.hide : i18n.show}
-            </div>
+            {hideToggleLink === undefined && (
+                <div
+                    css={[styles.expander, margin && styles.expanderMargin]}
+                    onClick={() => {
+                        setShow(!show)
+                        isFunction(onShowChange) && onShowChange(!show)
+                    }}
+                >
+                    <IconSettings /> {show ? i18n.hide : i18n.show}
+                </div>
+            )}
         </>
     )
 }
diff --git a/src/components/Templates/FullPageWizard/StepButtons/StepButtons.tsx b/src/components/Templates/FullPageWizard/StepButtons/StepButtons.tsx
@@ -3,19 +3,23 @@ import isFunction from 'lodash/isFunction'
 
 import * as commonStyles from '../FullPageWizardCommon.styles'
 import * as styles from '../FullPageWizard.styles'
-import { Props } from './StepButtons.types'
+import { Props, defaultProps } from './StepButtons.types'
 import Spacer from '../../../Atomic/Spacer'
 import Button from '../../../Atomic/Button'
 import Tooltip from '../../../Atomic/Tooltip'
 
 const StepButtons: FC<Props> = (props) => {
-    const { disableNext, i18n, onClickBack, onClickNext } = props
+    const { disableNext, i18n, onClickBack, onClickNext, showRequiredMessage } = { ...defaultProps, ...props }
     const requiredMessageSplit = i18n.requiredMessage.split('(*)')
 
     return (
         <>
             <Spacer css={commonStyles.description} type='mt-10'>
-                {requiredMessageSplit[0]}(<span css={styles.requiredStar}>*</span>){requiredMessageSplit[1]}
+                {showRequiredMessage && (
+                    <span>
+                        {requiredMessageSplit[0]}(<span css={styles.requiredStar}>*</span>){requiredMessageSplit[1]}
+                    </span>
+                )}
             </Spacer>
             <Spacer css={commonStyles.buttons} type='mt-4'>
                 {isFunction(onClickBack) && (

diff --git a/src/components/Templates/FullPageWizard/StepButtons/StepButtons.types.ts b/src/components/Templates/FullPageWizard/StepButtons/StepButtons.types.ts
@@ -8,4 +8,9 @@ export type Props = {
     }
     onClickBack?: () => void
     onClickNext: () => void
+    showRequiredMessage?: boolean
+}
+
+export const defaultProps: Partial<Props> = {
+    showRequiredMessage: true,
 }