yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-11-04 12:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): notification badge & browser notifications (#6437)

Browse Source
This commit is contained in:
Chirag Madlani 2022-07-30 22:17:38 +05:30 committed by GitHub
parent dac17af9ca
commit c76f96571d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openmetadata-ui/src/main/resources/ui/src/App.test.js → openmetadata-ui/src/main/resources/ui/src/App.test.tsx
View File

@ -22,6 +22,10 @@ jest.mock('./router/AppRouter', () => {
return jest.fn().mockReturnValue(<p>AppRouter</p>); return jest.fn().mockReturnValue(<p>AppRouter</p>);
}); });
jest.mock('./components/app-bar/Appbar', () => {
return jest.fn().mockReturnValue(<p>AppBar</p>);
});
jest.mock('./authentication/auth-provider/AuthProvider', () => { jest.mock('./authentication/auth-provider/AuthProvider', () => {
return { return {
AuthProvider: jest AuthProvider: jest

2
openmetadata-ui/src/main/resources/ui/src/App.tsx
View File

@ -29,6 +29,7 @@ import { BrowserRouter as Router } from 'react-router-dom';
import { ToastContainer } from 'react-toastify'; import { ToastContainer } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.min.css'; import 'react-toastify/dist/ReactToastify.min.css';
import { AuthProvider } from './authentication/auth-provider/AuthProvider'; import { AuthProvider } from './authentication/auth-provider/AuthProvider';
import Appbar from './components/app-bar/Appbar';
import GlobalSearchProvider from './components/GlobalSearchProvider/GlobalSearchProvider'; import GlobalSearchProvider from './components/GlobalSearchProvider/GlobalSearchProvider';
import WebSocketProvider from './components/web-scoket/web-scoket.provider'; import WebSocketProvider from './components/web-scoket/web-scoket.provider';
import { toastOptions } from './constants/toast.constants'; import { toastOptions } from './constants/toast.constants';
@ -57,6 +58,7 @@ const App: FunctionComponent = () => {
<AuthProvider childComponentType={AppRouter}> <AuthProvider childComponentType={AppRouter}>
<WebSocketProvider> <WebSocketProvider>
<GlobalSearchProvider> <GlobalSearchProvider>
<Appbar />
<AppRouter /> <AppRouter />
</GlobalSearchProvider> </GlobalSearchProvider>
</WebSocketProvider> </WebSocketProvider>

2
openmetadata-ui/src/main/resources/ui/src/authentication/authenticators/OidcAuthenticator.tsx
View File

@ -24,7 +24,6 @@ import React, {
import { Callback, makeAuthenticator, makeUserManager } from 'react-oidc'; import { Callback, makeAuthenticator, makeUserManager } from 'react-oidc';
import { Redirect, Route, Switch } from 'react-router-dom'; import { Redirect, Route, Switch } from 'react-router-dom';
import AppState from '../../AppState'; import AppState from '../../AppState';
import Appbar from '../../components/app-bar/Appbar';
import Loader from '../../components/Loader/Loader'; import Loader from '../../components/Loader/Loader';
import { oidcTokenKey, ROUTES } from '../../constants/constants'; import { oidcTokenKey, ROUTES } from '../../constants/constants';
import SigninPage from '../../pages/login'; import SigninPage from '../../pages/login';
@ -113,7 +112,6 @@ const OidcAuthenticator = forwardRef<AuthenticatorRef, Props>(
return !loading ? ( return !loading ? (
<> <>
<Appbar />
<Switch> <Switch>
<Route exact path={ROUTES.HOME}> <Route exact path={ROUTES.HOME}>
{!isAuthDisabled && !isAuthenticated && !isSigningIn ? ( {!isAuthDisabled && !isAuthenticated && !isSigningIn ? (

1
openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx
View File

@ -289,6 +289,7 @@ const NavBar = ({
<Space size={24}> <Space size={24}>
<button className="focus:tw-no-underline hover:tw-underline tw-flex-shrink-0 "> <button className="focus:tw-no-underline hover:tw-underline tw-flex-shrink-0 ">
<Dropdown <Dropdown
destroyPopupOnHide
overlay={ overlay={
<NotificationBox <NotificationBox
hasMentionNotification={hasMentionNotification} hasMentionNotification={hasMentionNotification}

2
openmetadata-ui/src/main/resources/ui/src/router/AppRouter.tsx
View File

@ -17,7 +17,6 @@ import React, { useEffect, useState } from 'react';
import { Redirect, Route, Switch } from 'react-router-dom'; import { Redirect, Route, Switch } from 'react-router-dom';
import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
import { fetchSlackConfig } from '../axiosAPIs/miscAPI'; import { fetchSlackConfig } from '../axiosAPIs/miscAPI';
import Appbar from '../components/app-bar/Appbar';
import Loader from '../components/Loader/Loader'; import Loader from '../components/Loader/Loader';
import SlackChat from '../components/SlackChat/SlackChat'; import SlackChat from '../components/SlackChat/SlackChat';
import { ROUTES } from '../constants/constants'; import { ROUTES } from '../constants/constants';
@ -95,7 +94,6 @@ const AppRouter = () => {
</> </>
) : ( ) : (
<> <>
<Appbar />
{slackChat} {slackChat}
<Switch> <Switch>
<Route exact path={ROUTES.HOME}> <Route exact path={ROUTES.HOME}>