From 01d380b3e9d6d629a0ee90a45f223bf2127d43d4 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 14 Jun 2022 12:38:23 -0700 Subject: [PATCH] Fixed validation message --- ui/src/app/core/user/UserContext.js | 8 +++++++- ui/src/app/metadata/wizard/MetadataSourceWizard.js | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ui/src/app/core/user/UserContext.js b/ui/src/app/core/user/UserContext.js index f2438a9ef..ddd1897ef 100644 --- a/ui/src/app/core/user/UserContext.js +++ b/ui/src/app/core/user/UserContext.js @@ -26,7 +26,7 @@ function UserProvider({ children }) { const [user, setUser] = React.useState({}); - const providerValue = React.useMemo(() => ({ user, loading }), [user, loading]); + const providerValue = React.useMemo(() => ({ user, loading, loadUser }), [user, loading, loadUser]); return ( {children} @@ -43,6 +43,11 @@ function useCurrentUserLoading() { return loading; } +function useCurrentUserLoader() { + const { loadUser } = React.useContext(UserContext); + return loadUser; +} + function useIsAdmin() { const user = useCurrentUser(); return user.role === 'ROLE_ADMIN'; @@ -100,6 +105,7 @@ export { useIsAdminOrInGroup, useCanEnable, useCurrentUserLoading, + useCurrentUserLoader, useUserGroupRegexValidator, useUserGroup, useUserGroupNames diff --git a/ui/src/app/metadata/wizard/MetadataSourceWizard.js b/ui/src/app/metadata/wizard/MetadataSourceWizard.js index 66e75e32b..7c0b15337 100644 --- a/ui/src/app/metadata/wizard/MetadataSourceWizard.js +++ b/ui/src/app/metadata/wizard/MetadataSourceWizard.js @@ -16,13 +16,20 @@ import { useMetadataSources } from '../hooks/api'; import Translate from '../../i18n/components/translate'; import { checkChanges } from '../hooks/utility'; -import { useUserGroup } from '../../core/user/UserContext'; +import { useCurrentUserLoader, useUserGroup } from '../../core/user/UserContext'; export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) { const group = useUserGroup(); + const userLoader = useCurrentUserLoader(); + + /*eslint-disable react-hooks/exhaustive-deps*/ + React.useEffect(() => { + userLoader(); + }, []); + const { data } = useMetadataSources({ cachePolicy: 'no-cache' }, []);