yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-31 02:29:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed signup user count, post-login Loader and welcome modal changes (#201)

Browse Source
This commit is contained in:
darth-coder00 2021-08-16 13:59:08 +05:30 committed by GitHub
parent 42946f0e3d
commit 0dbbc9644b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
catalog-rest-service/src/main/resources/ui/src/auth-provider/AuthProvider.tsx
View File

@ -38,19 +38,10 @@ import {
import appState from '../AppState';
import axiosClient from '../axiosAPIs';
import { fetchAuthorizerConfig } from '../axiosAPIs/miscAPI';
import {
getLoggedInUser,
getTeams,
getUserByName,
getUsers,
} from '../axiosAPIs/userAPI';
import { getLoggedInUser, getUserByName } from '../axiosAPIs/userAPI';
import Loader from '../components/Loader/Loader';
import { FirstTimeUserModal } from '../components/Modals/FirstTimeUserModal/FirstTimeUserModal';
import {
API_RES_MAX_SIZE,
oidcTokenKey,
ROUTES,
TIMEOUT,
} from '../constants/constants';
import { oidcTokenKey, ROUTES } from '../constants/constants';
import { ClientErrors } from '../enums/axios.enum';
import { useAuth } from '../hooks/authHooks';
import useToastContext from '../hooks/useToastContext';
@ -61,6 +52,7 @@ import {
getOidcExpiry,
getUserManagerConfig,
} from '../utils/AuthProvider.util';
import { fetchAllUsers } from '../utils/UsedDataUtils';
import { AuthProviderProps, OidcUser } from './AuthProvider.interface';
const cookieStorage = new CookieStorage();
@ -111,25 +103,6 @@ const AuthProvider: FunctionComponent<AuthProviderProps> = ({
history.push(ROUTES.HOME);
};
// Moving this code here from App.tsx
const getAllUsersList = (): void => {
getUsers('', API_RES_MAX_SIZE).then((res) => {
appState.users = res.data.data;
});
};
const getAllTeams = (): void => {
getTeams().then((res) => {
appState.userTeams = res.data.data;
});
};
const fetchAllUsers = () => {
getAllUsersList();
getAllTeams();
setInterval(getAllUsersList, TIMEOUT.USER_LIST);
};
const fetchUserByEmail = (user: OidcUser) => {
getUserByName(getNameFromEmail(user.profile.email), userAPIQueryFields)
.then((res: AxiosResponse) => {
@ -280,6 +253,7 @@ const AuthProvider: FunctionComponent<AuthProviderProps> = ({
<Route
path={ROUTES.CALLBACK}
render={() => (
<>
<Callback
userManager={userManager}
onSuccess={(user) => {
@ -289,6 +263,8 @@ const AuthProvider: FunctionComponent<AuthProviderProps> = ({
fetchUserByEmail(user as OidcUser);
}}
/>
<Loader />
</>
)}
/>
{isSignedOut ? <Redirect to={ROUTES.SIGNIN} /> : null}

27
catalog-rest-service/src/main/resources/ui/src/components/Modals/FirstTimeUserModal/FirstTimeUserModal.tsx
View File

@ -1,6 +1,7 @@
import classNames from 'classnames';
import React, { FunctionComponent, useState } from 'react';
import BGConfetti from '../../../assets/img/confetti-bg.jpeg';
import SVGIcons, { Icons } from '../../../utils/SvgUtils';
import { Button } from '../../buttons/Button/Button';
type Props = {
@ -9,9 +10,9 @@ type Props = {
};
const description = [
'OpenMetadata is a Centralized Metadata Store.',
'Discover all your data assets in a single place, collaborate with your co-workers.',
'Understand your data assets and contribute to make it richer.',
'A single place to Discover, Collaborate, and Get your data right',
'Based on Open metadata standards',
'Understand your data and collaborate with your team',
];
export const FirstTimeUserModal: FunctionComponent<Props> = ({
@ -40,12 +41,28 @@ export const FirstTimeUserModal: FunctionComponent<Props> = ({
<div className="tw-modal-backdrop tw-opacity-80" />
<div
className="tw-modal-container tw-modal-confetti tw-max-w-xl tw-max-h-90vh"
style={{ backgroundImage: `url(${BGConfetti})` }}>
style={{ backgroundImage: active === 0 ? `url(${BGConfetti})` : '' }}>
<div className="tw-modal-header tw-border-0 tw-justify-center tw-pt-8 tw-pb-0">
<p className="tw-modal-title tw-text-h4 tw-font-semibold tw-text-primary-active tw-mt-32">
<div className="tw-flex tw-flex-col tw-justify-center tw-items-center tw-mt-14">
{active === 0 ? (
// TODO: Replace it with Party popper icon
<SVGIcons
alt="OpenMetadata Logo"
icon={Icons.LOGO_SMALL}
width="50"
/>
) : (
<SVGIcons
alt="OpenMetadata Logo"
icon={Icons.LOGO_SMALL}
width="50"
/>
)}
<p className="tw-modal-title tw-text-h4 tw-font-semibold tw-text-primary-active tw-mt-3">
Welcome to OpenMetadata
</p>
</div>
</div>
<div className="tw-modal-body tw-relative tw-h-40 tw-justify-start tw-items-center">
{description.map((d, i) => (
<p

2
catalog-rest-service/src/main/resources/ui/src/pages/signup/index.tsx
View File

@ -27,6 +27,7 @@ import DropDown from '../../components/dropdown/DropDown';
import { imageTypes, ROUTES } from '../../constants/constants';
import { getNameFromEmail } from '../../utils/AuthProvider.util';
import SVGIcons, { Icons } from '../../utils/SvgUtils';
import { fetchAllUsers } from '../../utils/UsedDataUtils';
type Team = {
id: string;
displayName: string;
@ -78,6 +79,7 @@ const Signup = () => {
if (res.data) {
setLoading(false);
appState.userDetails = res.data;
fetchAllUsers();
history.push(ROUTES.HOME);
} else {
setLoading(false);

22
catalog-rest-service/src/main/resources/ui/src/utils/UsedDataUtils.ts Normal file
View File

@ -0,0 +1,22 @@
import AppState from '../AppState';
import { getTeams, getUsers } from '../axiosAPIs/userAPI';
import { API_RES_MAX_SIZE, TIMEOUT } from '../constants/constants';
// Moving this code here from App.tsx
const getAllUsersList = (): void => {
getUsers('', API_RES_MAX_SIZE).then((res) => {
AppState.users = res.data.data;
});
};
const getAllTeams = (): void => {
getTeams().then((res) => {
AppState.userTeams = res.data.data;
});
};
export const fetchAllUsers = () => {
getAllUsersList();
getAllTeams();
setInterval(getAllUsersList, TIMEOUT.USER_LIST);
};