Skip to content

fix(ui): ESLint fixes #25726

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

Closed
wants to merge 7 commits into from
Closed

fix(ui): ESLint fixes #25726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c6fd2b
Implement eslint with prettier, react, react hooks, flow plugins
johallar Aug 5, 2025
eb24ac9
Remove prettier, restrict react linting to jsx files
johallar Aug 6, 2025
e8b6e76
Fix flow, move globals to own block
johallar Aug 6, 2025
e80ca20
Use recommended hooks config, restrict react to .jsx
johallar Aug 6, 2025
36ee408
Fix all auto-fixable eslint rules
johallar Aug 6, 2025
b44c8f4
Fix or ignore all non-auto fixable lint errors
johallar Aug 8, 2025
d53c648
Fix flow problems from adding annotations, remove declare statement
johallar Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
675 changes: 424 additions & 251 deletions presto-ui/src/components/ClusterHUD.jsx
View file
Open in desktop

Large diffs are not rendered by default.

689 changes: 388 additions & 301 deletions presto-ui/src/components/LivePlan.jsx
View file
Open in desktop

Large diffs are not rendered by default.

358 changes: 201 additions & 157 deletions presto-ui/src/components/PageTitle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,184 +15,228 @@
import React from "react";

type Props = {
titles: string[],
urls?: string[],
current?: number,
path?: string,
}
titles: string[],
urls?: string[],
current?: number,
path?: string,
};

type State = {
noConnection: boolean,
lightShown: boolean,
info: ?any,
lastSuccess: number,
modalShown: boolean,
errorText: ?string,
}
noConnection: boolean,
lightShown: boolean,
info: ?any,
lastSuccess: number,
modalShown: boolean,
errorText: ?string,
};

function ClusterResourceGroupNavBar({titles, urls, current = 0} : Props) {
const classNames = ['navbar-brand inactive', 'navbar-brand'];
const navBarItems = titles.map( (title, index) => {
const classNameIdx = (current === index || !urls?.length) ? 0 : 1;
return (
<td key={index}>
<span className={classNames[classNameIdx]}>
{ classNameIdx ? <a href={urls?.[index]}>{title}</a> : title}
</span>
</td>
);
});
function ClusterResourceGroupNavBar({ titles, urls, current = 0 }: Props) {
const classNames = ["navbar-brand inactive", "navbar-brand"];
const navBarItems = titles.map((title, index) => {
const classNameIdx = current === index || !urls?.length ? 0 : 1;
return (
<>{navBarItems}</>
<td key={index}>
<span className={classNames[classNameIdx]}>
{classNameIdx ? <a href={urls?.[index]}>{title}</a> : title}
</span>
</td>
);
});
return <>{navBarItems}</>;
}

function isOffline() {
return window.location.protocol === 'file:';
return window.location.protocol === "file:";
}

export class PageTitle extends React.Component<Props, State> {
timeoutId: TimeoutID;
timeoutId: TimeoutID;

constructor(props: Props) {
super(props);
this.state = {
noConnection: false,
lightShown: false,
info: null,
lastSuccess: Date.now(),
modalShown: false,
errorText: null,
};
}

refreshLoop: () => void = () => {
clearTimeout(this.timeoutId);
fetch("/v1/info")
.then(response => response.json())
.then(info => {
this.setState({
info: info,
noConnection: false,
lastSuccess: Date.now(),
modalShown: false,
});
//$FlowFixMe$ Bootstrap 5 plugin
$('#no-connection-modal').hide();
this.resetTimer();
})
.catch(error => {
this.setState({
noConnection: true,
lightShown: !this.state.lightShown,
errorText: error
});
this.resetTimer();
constructor(props: Props) {
super(props);
this.state = {
noConnection: false,
lightShown: false,
info: null,
lastSuccess: Date.now(),
modalShown: false,
errorText: null,
};
}

if (!this.state.modalShown && (error || (Date.now() - this.state.lastSuccess) > 30 * 1000)) {
//$FlowFixMe$ Bootstrap 5 plugin
$('#no-connection-modal').modal();
this.setState({modalShown: true});
}
refreshLoop: () => void = () => {
clearTimeout(this.timeoutId);
fetch("/v1/info")
.then((response) => response.json())
.then((info) => {
this.setState({
info: info,
noConnection: false,
lastSuccess: Date.now(),
modalShown: false,
});
}

resetTimer() {
clearTimeout(this.timeoutId);
this.timeoutId = setTimeout(this.refreshLoop.bind(this), 1000);
}
//$FlowFixMe$ Bootstrap 5 plugin
$("#no-connection-modal").hide();
this.resetTimer();
})
.catch((error) => {
this.setState({
noConnection: true,
lightShown: !this.state.lightShown,
errorText: error,
});
this.resetTimer();

componentDidMount() {
if ( isOffline() ) {
this.setState({
noConnection: true,
lightShown: true,
});
}
else {
this.refreshLoop();
if (
!this.state.modalShown &&
(error || Date.now() - this.state.lastSuccess > 30 * 1000)
) {
//$FlowFixMe$ Bootstrap 5 plugin
$("#no-connection-modal").modal();
this.setState({ modalShown: true });
}
});
};

resetTimer() {
clearTimeout(this.timeoutId);
this.timeoutId = setTimeout(this.refreshLoop.bind(this), 1000);
}

componentDidMount() {
if (isOffline()) {
this.setState({
noConnection: true,
lightShown: true,
});
} else {
this.refreshLoop();
}
}

renderStatusLight(): any {
if (this.state.noConnection) {
if (this.state.lightShown) {
return <span className="status-light status-light-red" id="status-indicator"/>;
}
else {
return <span className="status-light" id="status-indicator"/>
}
}
return <span className="status-light status-light-green" id="status-indicator"/>;
renderStatusLight(): any {
if (this.state.noConnection) {
if (this.state.lightShown) {
return (
<span
className="status-light status-light-red"
id="status-indicator"
/>
);
} else {
return <span className="status-light" id="status-indicator" />;
}
}
return (
<span className="status-light status-light-green" id="status-indicator" />
);
}

render(): any {
const info = this.state.info;
if (!isOffline() && !info) {
return null;
}
render(): any {
const info = this.state.info;
if (!isOffline() && !info) {
return null;
}

return (
<div>
<nav className="navbar navbar-expand-lg navbar-dark bg-dark">
<div className="container-fluid">
<div className="navbar-header">
<table>
<tbody>
<tr>
<td>
<a href="/ui/"><img src={`${this.props.path ? this.props.path : '.'}/assets/logo.png`}/></a>
</td>
<ClusterResourceGroupNavBar titles={this.props.titles} urls={this.props.urls} current={this.props.current} />
</tr>
</tbody>
</table>
</div>
<button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
<span className="navbar-toggler-icon"></span>
</button>
<div id="navbar" className="navbar-collapse collapse">
<ul className="nav navbar-nav navbar-right ms-auto">
<li>
<span className="navbar-cluster-info">
<span className="uppercase">Version</span><br/>
<span className="text" id="version-number">{isOffline() ? 'N/A' : info?.nodeVersion?.version}</span>
</span>
</li>
<li>
<span className="navbar-cluster-info">
<span className="uppercase">Environment</span><br/>
<span className="text" id="environment">{isOffline() ? 'N/A' : info?.environment}</span>
</span>
</li>
<li>
<span className="navbar-cluster-info">
<span className="uppercase">Uptime</span><br/>
<span data-bs-toggle="tooltip" data-bs-placement="bottom" title="Connection status">
{this.renderStatusLight()}
</span>
&nbsp;
<span className="text" id="uptime">{isOffline() ? 'Offline' : info?.uptime}</span>
</span>
</li>
</ul>
</div>
</div>
</nav>
<div id="no-connection-modal" className="modal" tabIndex="-1" role="dialog">
<div className="modal-dialog modal-sm" role="document">
<div className="modal-content">
<div className="row error-message">
<div className="col-12">
<br />
<h4>Unable to connect to server</h4>
<p>{this.state.errorText ? "Error: " + this.state.errorText : null}</p>
</div>
</div>
</div>
</div>
return (
<div>
<nav className="navbar navbar-expand-lg navbar-dark bg-dark">
<div className="container-fluid">
<div className="navbar-header">
<table>
<tbody>
<tr>
<td>
<a href="/ui/">
<img
src={`${this.props.path ? this.props.path : "."}/assets/logo.png`}
/>
</a>
</td>
<ClusterResourceGroupNavBar
titles={this.props.titles}
urls={this.props.urls}
current={this.props.current}
/>
</tr>
</tbody>
</table>
</div>
<button
className="navbar-toggler"
type="button"
data-bs-toggle="collapse"
data-bs-target="#navbar"
aria-controls="navbar"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span className="navbar-toggler-icon"></span>
</button>
<div id="navbar" className="navbar-collapse collapse">
<ul className="nav navbar-nav navbar-right ms-auto">
<li>
<span className="navbar-cluster-info">
<span className="uppercase">Version</span>
<br />
<span className="text" id="version-number">
{isOffline() ? "N/A" : info?.nodeVersion?.version}
</span>
</span>
</li>
<li>
<span className="navbar-cluster-info">
<span className="uppercase">Environment</span>
<br />
<span className="text" id="environment">
{isOffline() ? "N/A" : info?.environment}
</span>
</span>
</li>
<li>
<span className="navbar-cluster-info">
<span className="uppercase">Uptime</span>
<br />
<span
data-bs-toggle="tooltip"
data-bs-placement="bottom"
title="Connection status"
>
{this.renderStatusLight()}
</span>
&nbsp;
<span className="text" id="uptime">
{isOffline() ? "Offline" : info?.uptime}
</span>
</span>
</li>
</ul>
</div>
</div>
</nav>
<div
id="no-connection-modal"
className="modal"
tabIndex="-1"
role="dialog"
>
<div className="modal-dialog modal-sm" role="document">
<div className="modal-content">
<div className="row error-message">
<div className="col-12">
<br />
<h4>Unable to connect to server</h4>
<p>
{this.state.errorText
? "Error: " + this.state.errorText
: null}
</p>
</div>
</div>
</div>
);
}
</div>
</div>
</div>
);
}
}
Loading
Loading