-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #977 from sandialabs/timeseries-loading-page-impro…
…vements improved the loading ui
- Loading branch information
Showing
12 changed files
with
354 additions
and
266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,33 @@ | ||
| import React from "react"; | ||
|
|
||
| const ControlsButton = (props) => { | ||
| return props.hidden ? null : ( | ||
| <button | ||
| className={`${props.button_style} ${props.class}`} | ||
| id={props.id} | ||
| type='button' title={props.title} | ||
| disabled={props.disabled} | ||
| onClick={props.click} | ||
| data-toggle={props.data_toggle} | ||
| data-target={props.data_target}> | ||
| {props.icon && | ||
| <span className={'fa ' + props.icon} aria-hidden='true'/> | ||
| } | ||
| {props.label} | ||
| </button> | ||
| ); | ||
| // wait until all the jquery stuff is loaded | ||
| $( document ).ready(function( $ ) { | ||
| // enable the tooltip | ||
| $('[data-toggle="tooltip"]').tooltip() | ||
| }) | ||
| return props.hidden ? null : ( | ||
| <button | ||
| className={`${props.button_style} ${props.class}`} | ||
| id={props.id} | ||
| type="button" | ||
| title={props.title} | ||
| disabled={props.disabled} | ||
| onClick={props.click} | ||
| data-toggle={props.data_toggle} | ||
| data-target={props.data_target} | ||
| > | ||
| {props.icon && <span className={"fa " + props.icon} aria-hidden="true" />} | ||
| {props.label} | ||
| <i | ||
| style={{ paddingLeft: "5px" }} | ||
| className="fa fa-info-circle" | ||
| data-toggle="tooltip" | ||
| data-placement="bottom" | ||
| title="Connect to HPC" | ||
| /> | ||
| </button> | ||
| ); | ||
| }; | ||
|
|
||
| export default ControlsButton | ||
| export default ControlsButton; |
27 changes: 27 additions & 0 deletions
27
web-server/plugins/slycat-timeseries-model/plugin-components/InfoBar.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| "use strict"; | ||
| import * as React from "react"; | ||
| import { getFormattedDateTime } from "./utils.ts"; | ||
| import { InfoBarProps } from "./types.ts"; | ||
|
|
||
| /** | ||
| * react pure component used to create a the info bar | ||
| * | ||
| * @export | ||
| * @extends {React.Component<InfoBarProps>} | ||
| */ | ||
| const InfoBar: React.FunctionComponent<InfoBarProps> = (props) => ( | ||
| <div className="row justify-content-center"> | ||
| <div className="col-3">Updated {getFormattedDateTime()}</div> | ||
| <div className="col-2"> | ||
| Job id: <b>{props.jid}</b> | ||
| </div> | ||
| <div className="col-4"> | ||
| Remote host: <b>{props.hostname}</b> | ||
| </div> | ||
| <div className="col-2"> | ||
| Session: <b>{props.sessionExists ? "true" : "false"}</b> | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
||
| export default InfoBar; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.