yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-07-25 18:30:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Turned-off welcome message when a new user signs up (#1644)

Browse Source
This commit is contained in:
darth-coder00 2021-12-09 19:14:49 +05:30 committed by GitHub
parent f63da0f430
commit cefac87d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openmetadata-ui/src/main/resources/ui/src/auth-provider/AuthProvider.tsx
View File

@ -15,7 +15,6 @@ import { AxiosResponse } from 'axios';
import { CookieStorage } from 'cookie-storage'; import { CookieStorage } from 'cookie-storage';
import { isEmpty, isNil } from 'lodash'; import { isEmpty, isNil } from 'lodash';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import { NewUser } from 'Models';
import { UserManager, WebStorageStateStore } from 'oidc-client'; import { UserManager, WebStorageStateStore } from 'oidc-client';
import React, { import React, {
ComponentType, ComponentType,
@ -36,7 +35,6 @@ import axiosClient from '../axiosAPIs';
import { fetchAuthorizerConfig } from '../axiosAPIs/miscAPI'; import { fetchAuthorizerConfig } from '../axiosAPIs/miscAPI';
import { getLoggedInUser, getUserByName } from '../axiosAPIs/userAPI'; import { getLoggedInUser, getUserByName } from '../axiosAPIs/userAPI';
import Loader from '../components/Loader/Loader'; import Loader from '../components/Loader/Loader';
import { FirstTimeUserModal } from '../components/Modals/FirstTimeUserModal/FirstTimeUserModal';
import { COOKIE_VERSION } from '../components/Modals/WhatsNewModal/whatsNewData'; import { COOKIE_VERSION } from '../components/Modals/WhatsNewModal/whatsNewData';
import { oidcTokenKey, ROUTES } from '../constants/constants'; import { oidcTokenKey, ROUTES } from '../constants/constants';
import { ClientErrors } from '../enums/axios.enum'; import { ClientErrors } from '../enums/axios.enum';
@ -72,13 +70,9 @@ const AuthProvider: FunctionComponent<AuthProviderProps> = ({
const location = useLocation(); const location = useLocation();
const history = useHistory(); const history = useHistory();
const showToast = useToastContext(); const showToast = useToastContext();
const { const { isFirstTimeUser, isSignedIn, isSigningIn, isSignedOut } = useAuth(
isAuthenticatedRoute, location.pathname
isFirstTimeUser, );
isSignedIn,
isSigningIn,
isSignedOut,
} = useAuth(location.pathname);
const oidcUserToken = cookieStorage.getItem(oidcTokenKey); const oidcUserToken = cookieStorage.getItem(oidcTokenKey);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@ -187,14 +181,14 @@ const AuthProvider: FunctionComponent<AuthProviderProps> = ({
}); });
}; };
const handleFirstTourModal = (skip: boolean) => { // const handleFirstTourModal = (skip: boolean) => {
appState.newUser = {} as NewUser; // appState.newUser = {} as NewUser;
if (skip) { // if (skip) {
history.push(ROUTES.HOME); // history.push(ROUTES.HOME);
} else { // } else {
// TODO: Route to tour page // // TODO: Route to tour page
} // }
}; // };
useEffect(() => { useEffect(() => {
fetchAuthConfig(); fetchAuthConfig();
@ -276,12 +270,13 @@ const AuthProvider: FunctionComponent<AuthProviderProps> = ({
<AppWithAuth /> <AppWithAuth />
)} )}
</Switch> </Switch>
{isAuthenticatedRoute && isFirstTimeUser ? ( {/* TODO: Uncomment below lines to show Welcome modal on Sign-up */}
{/* {isAuthenticatedRoute && isFirstTimeUser ? (
<FirstTimeUserModal <FirstTimeUserModal
onCancel={() => handleFirstTourModal(true)} onCancel={() => handleFirstTourModal(true)}
onSave={() => handleFirstTourModal(false)} onSave={() => handleFirstTourModal(false)}
/> />
) : null} ) : null} */}
</> </>
) : null} ) : null}
</> </>

7
openmetadata-ui/src/main/resources/ui/src/components/app-bar/Appbar.tsx
View File

@ -62,9 +62,7 @@ const Appbar: React.FC = (): JSX.Element => {
const searchQuery = match?.params?.searchQuery; const searchQuery = match?.params?.searchQuery;
const [searchValue, setSearchValue] = useState(searchQuery); const [searchValue, setSearchValue] = useState(searchQuery);
const [isOpen, setIsOpen] = useState<boolean>(true); const [isOpen, setIsOpen] = useState<boolean>(true);
const [isFeatureModalOpen, setIsFeatureModalOpen] = useState<boolean>(() => { const [isFeatureModalOpen, setIsFeatureModalOpen] = useState<boolean>(false);
return !isFirstTimeUser && cookieStorage.getItem(COOKIE_VERSION) !== 'true';
});
const [version, setVersion] = useState<string>(''); const [version, setVersion] = useState<string>('');
@ -143,7 +141,8 @@ const Appbar: React.FC = (): JSX.Element => {
useEffect(() => { useEffect(() => {
setIsFeatureModalOpen( setIsFeatureModalOpen(
!isFirstTimeUser && cookieStorage.getItem(COOKIE_VERSION) !== 'true' // TODO: Add !isFirstTimeUser to condition if showing Welcome Modal
cookieStorage.getItem(COOKIE_VERSION) !== 'true'
); );
}, [isFirstTimeUser]); }, [isFirstTimeUser]);