Skip to content

Commit b8f03b9

Browse files
committed
UI: Raw Event Viewer
Signed-off-by: tito1212 <vladyslav.sedenko@getindata.com>
1 parent 03f60cf commit b8f03b9

17 files changed

Lines changed: 418 additions & 41 deletions

File tree

web/package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
"node": ">12.22.7"
1818
},
1919
"dependencies": {
20+
"@date-io/moment": "^1.3.13",
2021
"@fortawesome/fontawesome-svg-core": "^1.2.32",
2122
"@fortawesome/free-solid-svg-icons": "^5.14.0",
2223
"@fortawesome/react-fontawesome": "^0.1.12",
2324
"@material-ui/core": "^4.12.3",
2425
"@material-ui/icons": "^4.11.2",
2526
"@material-ui/lab": "^4.0.0-alpha.56",
27+
"@material-ui/pickers": "^3.3.10",
2628
"@material-ui/styles": "^4.11.4",
2729
"@types/react-router-dom": "^5.1.2",
2830
"@types/react-syntax-highlighter": "^13.5.2",
@@ -53,6 +55,7 @@
5355
"react": "^16.8.0",
5456
"react-dom": "^16.8.0",
5557
"react-helmet-async": "^1.3.0",
58+
"react-inlinesvg": "^3.0.1",
5659
"react-redux": "^6.0.1",
5760
"react-router-dom": "^5.1.2",
5861
"react-syntax-highlighter": "^15.4.4",

web/setupProxy.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const path = __dirname + '/dist'
1010

1111
app.use('/', express.static(path))
1212
app.use('/datasets', express.static(path))
13+
app.use('/events', express.static(path))
1314
app.use('/lineage/:type/:namespace/:name', express.static(path))
1415
app.use(proxy('/api/v1', apiOptions))
1516

web/src/components/App.tsx

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { Box, Container, CssBaseline } from '@material-ui/core'
44
import { ConnectedRouter, routerMiddleware } from 'connected-react-router'
55
import { Helmet, HelmetProvider } from 'react-helmet-async'
6+
import { MuiPickersUtilsProvider } from '@material-ui/pickers'
67
import { MuiThemeProvider } from '@material-ui/core/styles'
78
import { Provider } from 'react-redux'
89
import { Route, Switch } from 'react-router-dom'
@@ -12,9 +13,11 @@ import { createBrowserHistory } from 'history'
1213
import { theme } from '../helpers/theme'
1314
import BottomBar from './bottom-bar/BottomBar'
1415
import Datasets from '../routes/datasets/Datasets'
16+
import Events from '../routes/events/Events'
1517
import Header from './header/Header'
1618
import Jobs from '../routes/jobs/Jobs'
1719
import Lineage from './lineage/Lineage'
20+
import MomentUtils from '@date-io/moment'
1821
import React, { ReactElement } from 'react'
1922
import Sidenav from './sidenav/Sidenav'
2023
import Toast from './Toast'
@@ -45,29 +48,34 @@ const App = (): ReactElement => {
4548
<HelmetProvider>
4649
<ConnectedRouter history={history}>
4750
<MuiThemeProvider theme={theme}>
48-
<Helmet>
49-
<title>{TITLE}</title>
50-
</Helmet>
51-
<CssBaseline />
52-
<Box ml={12}>
53-
<Sidenav />
54-
<Container maxWidth={'lg'} disableGutters={true}>
55-
<Header />
56-
</Container>
57-
<Switch>
58-
<Route path={'/'} exact>
59-
<Jobs />
60-
</Route>
61-
<Route path={'/datasets'} exact>
62-
<Datasets />
63-
</Route>
64-
<Route path={'/lineage/:nodeType/:namespace/:nodeName'}>
65-
<Lineage />
66-
<BottomBar />
67-
</Route>
68-
</Switch>
69-
<Toast />
70-
</Box>
51+
<MuiPickersUtilsProvider utils={MomentUtils}>
52+
<Helmet>
53+
<title>{TITLE}</title>
54+
</Helmet>
55+
<CssBaseline />
56+
<Box ml={12}>
57+
<Sidenav />
58+
<Container maxWidth={'lg'} disableGutters={true}>
59+
<Header />
60+
</Container>
61+
<Switch>
62+
<Route path={'/'} exact>
63+
<Jobs />
64+
</Route>
65+
<Route path={'/datasets'} exact>
66+
<Datasets />
67+
</Route>
68+
<Route path={'/events'} exact>
69+
<Events />
70+
</Route>
71+
<Route path={'/lineage/:nodeType/:namespace/:nodeName'}>
72+
<Lineage />
73+
<BottomBar />
74+
</Route>
75+
</Switch>
76+
<Toast />
77+
</Box>
78+
</MuiPickersUtilsProvider>
7179
</MuiThemeProvider>
7280
</ConnectedRouter>
7381
</HelmetProvider>

web/src/components/core/code/MqJson.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ import SyntaxHighlighter from 'react-syntax-highlighter'
88

99
interface OwnProps {
1010
code: object
11+
showLineNumbers?: boolean
12+
wrapLongLines?: boolean
1113
}
1214

13-
const MqJson: React.FC<OwnProps> = ({ code }) => {
15+
const MqJson: React.FC<OwnProps> = ({ code, wrapLongLines = false, showLineNumbers = false }) => {
1416
return (
1517
<SyntaxHighlighter
1618
language='json'
1719
style={ocean}
20+
wrapLongLines={wrapLongLines}
21+
showLineNumbers={showLineNumbers}
1822
customStyle={{
1923
backgroundColor: alpha(theme.palette.common.white, 0.1),
2024
borderLeft: `2px dashed ${THEME_EXTRA.typography.subdued}`,

web/src/components/core/icon-button/MqIconButton.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import withStyles, { WithStyles } from '@material-ui/core/styles/withStyles'
1313
const styles = (theme: Theme) =>
1414
createStyles({
1515
root: {
16-
padding: theme.spacing(4),
1716
width: theme.spacing(8),
1817
height: theme.spacing(8),
1918
borderRadius: theme.spacing(2),

web/src/components/sidenav/Sidenav.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22

33
import React from 'react'
4+
import SVG from 'react-inlinesvg'
45

56
import createStyles from '@material-ui/core/styles/createStyles'
67
import withStyles, { WithStyles } from '@material-ui/core/styles/withStyles'
@@ -70,6 +71,19 @@ class Sidenav extends React.Component<SidenavProps> {
7071
<FontAwesomeIcon icon={faDatabase} size={'2x'} />
7172
</MqIconButton>
7273
</RouterLink>
74+
<RouterLink to={'/events'} className={classes.link}>
75+
<MqIconButton
76+
id={'eventsButton'}
77+
title={'EVENTS'}
78+
active={this.props.location.pathname === '/events'}
79+
>
80+
<SVG
81+
src="../../img/iconSearchArrow.svg"
82+
width={'30px'}
83+
/>
84+
</MqIconButton>
85+
</RouterLink>
86+
7387
{/* todo remove this link for now until direct linking available */}
7488
{/*<RouterLink to={'/lineage'} className={classes.link}>*/}
7589
{/* <MqIconButton*/}

web/src/img/iconSearchArrow.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)