Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Druid Doctor #8672

Merged
merged 9 commits into from Oct 23, 2019
Merged

Druid Doctor #8672

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7dacca
adding Druid doctor
vogievetsky Oct 14, 2019
d525221
better meesage
vogievetsky Oct 14, 2019
e311c09
feedback changes
vogievetsky Oct 14, 2019
efca654
add icons
vogievetsky Oct 14, 2019
557e375
feedback fixes
vogievetsky Oct 15, 2019
3e9bc11
spelling
vogievetsky Oct 15, 2019
a75dc5e
add file.encoding check
vogievetsky Oct 17, 2019
e329b6f
feedback changes
vogievetsky Oct 23, 2019
43c61f4
merge in master
vogievetsky Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
107 changes: 23 additions & 84 deletions web-console/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions web-console/package.json
View file
Open in desktop
Expand Up @@ -53,8 +53,8 @@
"start": "webpack-dev-server --hot --open"
},
"dependencies": {
"@blueprintjs/core": "^3.18.0",
"@blueprintjs/icons": "^3.10.0",
"@blueprintjs/core": "^3.19.1",
"@blueprintjs/icons": "^3.11.0",
"axios": "^0.19.0",
"brace": "^0.11.1",
"classnames": "^2.2.6",
Expand Down
9 changes: 9 additions & 0 deletions web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap
View file
Open in desktop
Expand Up @@ -168,6 +168,15 @@ exports[`header bar matches snapshot 1`] = `
captureDismiss={false}
content={
<Blueprint3.Menu>
<Blueprint3.MenuItem
disabled={false}
icon="pulse"
multiline={false}
onClick={[Function]}
popoverProps={Object {}}
shouldDismissPopover={true}
text="Druid Doctor"
/>
<Blueprint3.MenuItem
disabled={false}
icon="settings"
Expand Down
12 changes: 12 additions & 0 deletions web-console/src/components/header-bar/header-bar.tsx
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@ import React from 'react';

import { AboutDialog } from '../../dialogs/about-dialog/about-dialog';
import { CoordinatorDynamicConfigDialog } from '../../dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog';
import { DoctorDialog } from '../../dialogs/doctor-dialog/doctor-dialog';
import { OverlordDynamicConfigDialog } from '../../dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog';
import {
DRUID_ASF_SLACK,
Expand Down Expand Up @@ -63,6 +64,7 @@ export interface HeaderBarProps {

export interface HeaderBarState {
aboutDialogOpen: boolean;
doctorDialogOpen: boolean;
coordinatorDynamicConfigDialogOpen: boolean;
overlordDynamicConfigDialogOpen: boolean;
}
Expand All @@ -72,6 +74,7 @@ export class HeaderBar extends React.PureComponent<HeaderBarProps, HeaderBarStat
super(props);
this.state = {
aboutDialogOpen: false,
doctorDialogOpen: false,
coordinatorDynamicConfigDialogOpen: false,
overlordDynamicConfigDialogOpen: false,
};
Expand Down Expand Up @@ -132,6 +135,7 @@ export class HeaderBar extends React.PureComponent<HeaderBarProps, HeaderBarStat
const { active, hideLegacy } = this.props;
const {
aboutDialogOpen,
doctorDialogOpen,
coordinatorDynamicConfigDialogOpen,
overlordDynamicConfigDialogOpen,
} = this.state;
Expand Down Expand Up @@ -176,6 +180,11 @@ export class HeaderBar extends React.PureComponent<HeaderBarProps, HeaderBarStat

const configMenu = (
<Menu>
<MenuItem
icon={IconNames.PULSE}
text="Druid Doctor"
onClick={() => this.setState({ doctorDialogOpen: true })}
/>
<MenuItem
icon={IconNames.SETTINGS}
text="Coordinator dynamic config"
Expand Down Expand Up @@ -265,6 +274,9 @@ export class HeaderBar extends React.PureComponent<HeaderBarProps, HeaderBarStat
{aboutDialogOpen && (
<AboutDialog onClose={() => this.setState({ aboutDialogOpen: false })} />
)}
{doctorDialogOpen && (
<DoctorDialog onClose={() => this.setState({ doctorDialogOpen: false })} />
)}
{coordinatorDynamicConfigDialogOpen && (
<CoordinatorDynamicConfigDialog
onClose={() => this.setState({ coordinatorDynamicConfigDialogOpen: false })}
Expand Down
2 changes: 1 addition & 1 deletion web-console/src/dialogs/about-dialog/__snapshots__/about-dialog.spec.tsx.snap
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ exports[`about dialog matches snapshot 1`] = `
tabindex="0"
>
<div
class="bp3-dialog"
class="bp3-dialog about-dialog"
>
<div
class="bp3-dialog-header"
Expand Down
1 change: 1 addition & 0 deletions web-console/src/dialogs/about-dialog/about-dialog.tsx
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@ export class AboutDialog extends React.PureComponent<AboutDialogProps> {

return (
<Dialog
className="about-dialog"
icon={IconNames.GRAPH}
onClose={onClose}
title="Apache Druid"
Expand Down