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.

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

Initial Task Indicator #906

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/guiTests/6viewAlignCoverage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {openCircularGenomeBuilderWindow} from "./req/circularGenomeBuilder/openC
import {toggleFiguresOverlay} from "./req/circularGenomeBuilder/toggleFiguresOverlay";
import {createHPV16Figure} from "./req/circularGenomeBuilder/createHPV16Figure";
import {closeToolBar} from "./req/closeToolBar";
import { expandHPV16FigureList } from './req/circularGenomeBuilder/expandHPV16FigureList';
import {expandHPV16FigureList} from "./req/circularGenomeBuilder/expandHPV16FigureList";

async function runTest() : Promise<void>
{
Expand Down
1 change: 1 addition & 0 deletions src/req/renderer/components/badge.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Badge : typeof import("@material-ui/core/Badge").default = require("@material-ui/core/Badge").default;
1 change: 1 addition & 0 deletions src/req/renderer/components/linearProgress.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const LinearProgress : typeof import("@material-ui/core/LinearProgress").default = require("@material-ui/core/LinearProgress").default;
6 changes: 6 additions & 0 deletions src/req/renderer/views/toolBarView/styles/taskBadge.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import {style} from "typestyle";

export const taskBadge = style({
color: "black",
backgroundColor: "white"
});
30 changes: 25 additions & 5 deletions src/req/renderer/views/toolBarView/toolBarView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ import {Fastq} from "../../../fastq";
import {Fasta} from "../../../fasta";
import {AlignData} from "../../../alignData";
import {PHATView} from "../../phatView";
import {Badge} from "../../components/badge";
import {LinearProgress} from "../../components/linearProgress";

import {ToolBarTab, ToolBarTabs} from "./containers/toolBarTabs/toolBarTabs";
import {tabInfo} from "./tabInfo";
import {OutputViewWebView} from "./views/outputViewWebView";
import {InputViewWebView} from "./views/inputViewWebView";
import {QCViewWebView} from "./views/QCViewWebView";
import {AlignViewWebView} from "./views/alignViewWebView";
import {taskBadge} from "./styles/taskBadge";
import {CircularGenomeBuilderWebView} from "./views/circularGenomeBuilderWebView";


Expand Down Expand Up @@ -165,11 +168,28 @@ export class ToolBarView extends React.Component<ToolBarViewProps,ToolBarViewSta
</Grid>
</Grid>
</GridWrapper>
<div style={{height: "2vh"}}>
<Typography
style={{color:"white"}}
>{this.props.runningOpText}</Typography>
</div>
<GridWrapper>
<React.Fragment>
<Grid container spacing={4} justify="flex-start">
<Grid item />
<Grid item>
<Badge badgeContent={this.props.operations ? this.props.operations.length : 0} showZero color="error" classes={{colorError:taskBadge}}>
<div
style={{width:"1vh"}}></div>
</Badge>
</Grid>
<Grid item>

<Typography style={{color: "white"}}>
{this.props.runningOpText ? this.props.runningOpText : "No Running Tasks"}
</Typography>
</Grid>
</Grid>
<div hidden={this.props.operations === undefined || this.props.operations.length == 0}>
<LinearProgress variant="indeterminate" color="secondary"/>
</div>
</React.Fragment>
</GridWrapper>
<ToolBarTabs
onTabDelete={(tab : ToolBarTab<ToolBarViewProps>,i : number) =>
{
Expand Down