Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@chgibb
chgibb committed Sep 9, 2019
1 parent 22e482e commit fd9defc
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 82 deletions.
3 changes: 2 additions & 1 deletion src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderAppBar.tsx
View file
Expand Up @@ -78,7 +78,8 @@ export function GenomeBuilderAppBar(this: CircularGenomeBuilderView, props: { fi
edge="start"
color="primary"
classes={{colorPrimary: white}}
onClick={()=>{
onClick={()=>
{
this.setState({
editContigsOverlayOpen : true
});
Expand Down
6 changes: 4 additions & 2 deletions src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx
View file
Expand Up @@ -2,9 +2,10 @@ import * as React from "react";

import {CircularGenomeBuilderView} from "../circularGenomeBuilderView";
import {CircularFigure} from "../../../circularFigure/circularFigure";

import {EditFigureNameOverlay} from "./overlays/editFigureName";
import {FigureSelectOverlay} from "./overlays/figureSelectOverlay";
import { EditContigsOverlay } from './overlays/editContigsOverlay';
import {EditContigsOverlay} from "./overlays/editContigsOverlay";

export function GenomeBuilderOverlays(this: CircularGenomeBuilderView, props: { figure: CircularFigure | undefined }): JSX.Element
{
Expand Down Expand Up @@ -34,7 +35,8 @@ export function GenomeBuilderOverlays(this: CircularGenomeBuilderView, props: {
<EditContigsOverlay
figure={figure}
open={this.state.editContigsOverlayOpen}
onClose={() => {
onClose={() =>
{
this.setState({
editContigsOverlayOpen : false
});
Expand Down
107 changes: 54 additions & 53 deletions src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx
View file
@@ -1,12 +1,12 @@
import * as React from "react";
import { CircularFigure, Contig } from '../../../../circularFigure/circularFigure';
import { Typography } from '../../../../components/typography';
import { GridWrapper } from '../../../../containers/gridWrapper';
import { Grid } from '../../../../components/grid';
import { IconButton } from '../../../../components/iconButton';
import { blue } from '../../../../styles/colours';
import { ChevronLeft } from '../../../../components/icons/chevronLeft';
import { OutlinedInput } from '../../../../components/outlinedInput';

import {CircularFigure, Contig} from "../../../../circularFigure/circularFigure";
import {GridWrapper} from "../../../../containers/gridWrapper";
import {Grid} from "../../../../components/grid";
import {IconButton} from "../../../../components/iconButton";
import {blue} from "../../../../styles/colours";
import {ChevronLeft} from "../../../../components/icons/chevronLeft";
import {OutlinedInput} from "../../../../components/outlinedInput";

export interface EditContigOverlayProps
{
Expand All @@ -22,57 +22,58 @@ export function EditContigOverlay(props : EditContigOverlayProps) : JSX.Element
<div>
<GridWrapper>
<div style={{marginLeft: "2vh"}}>
<Grid container spacing={4} justify="flex-start">
<IconButton
edge="start"
color="primary"
classes={{colorPrimary: blue}}
onClick={props.onClose}
>
<ChevronLeft />
</IconButton>
</Grid>
<Grid container spacing={4} justify="flex-start">
<IconButton
edge="start"
color="primary"
classes={{colorPrimary: blue}}
onClick={props.onClose}
>
<ChevronLeft />
</IconButton>
</Grid>
</div>
</GridWrapper>
<GridWrapper>
<div style={{marginRight: "1vh", marginLeft: "1vh", marginBottom: "1vh",marginTop: "1vh"}}>
<Grid container spacing={4} justify="center">
<Grid item>
<OutlinedInput
label={props.contig.alias}
inputProps={{
onChange: (event) => {
<div style={{marginRight: "1vh", marginLeft: "1vh", marginBottom: "1vh",marginTop: "1vh"}}>
<Grid container spacing={4} justify="center">
<Grid item>
<OutlinedInput
label={props.contig.alias}
inputProps={{
onChange: () =>
{

}
}}
/>
</Grid>
}
}}
/>
</Grid>
</div>
</GridWrapper>
<GridWrapper>
<div style={{marginRight: "1vh", marginLeft: "1vh", marginBottom: "1vh", marginTop: "1vh"}}>
<Grid container spacing={4} justify="center">
<Grid item>
<Button
label="Cancel"
onClick={props.onClose}
type="retreat"
/>
</Grid>
<Grid item>
<Button
label="Save"
onClick={() =>
{
props.onSave(enteredValue);
}}
type="advance"
/>
</Grid>
</Grid>
</div>
</GridWrapper>
<GridWrapper>
<div style={{marginRight: "1vh", marginLeft: "1vh", marginBottom: "1vh", marginTop: "1vh"}}>
<Grid container spacing={4} justify="center">
<Grid item>
<Button
label="Cancel"
onClick={props.onClose}
type="retreat"
/>
</Grid>
<Grid item>
<Button
label="Save"
onClick={() =>
{
props.onSave(enteredValue);
}}
type="advance"
/>
</Grid>
</div>
</GridWrapper>
</Grid>
</div>
</GridWrapper>
</div>
);
}
58 changes: 32 additions & 26 deletions src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigsOverlay.tsx
View file
@@ -1,18 +1,19 @@
import * as React from "react";

import { CircularFigure } from '../../../../circularFigure/circularFigure';
import { Overlay } from './overlay';
import { GridWrapper } from '../../../../containers/gridWrapper';
import { Grid } from '../../../../components/grid';
import { Typography } from '../../../../components/typography';
import { TreeView } from '../../../../components/treeView';
import { ChevronRight } from '../../../../components/icons/chevronRight';
import { ExpandMore } from '../../../../components/icons/expandMore';
import { blue } from '../../../../styles/colours';
import { TreeItem } from '../../../../components/treeItem';
import { AddBox } from '../../../../components/icons/addBox';
import { getReferenceFromUuid } from '../../../../../uniquelyAddressable';
import { EditContigOverlay } from "./editContigOverlay";
import {CircularFigure} from "../../../../circularFigure/circularFigure";
import {GridWrapper} from "../../../../containers/gridWrapper";
import {Grid} from "../../../../components/grid";
import {Typography} from "../../../../components/typography";
import {TreeView} from "../../../../components/treeView";
import {ChevronRight} from "../../../../components/icons/chevronRight";
import {ExpandMore} from "../../../../components/icons/expandMore";
import {blue} from "../../../../styles/colours";
import {TreeItem} from "../../../../components/treeItem";
import {AddBox} from "../../../../components/icons/addBox";
import {getReferenceFromUuid} from "../../../../../uniquelyAddressable";

import {Overlay} from "./overlay";
import {EditContigOverlay} from "./editContigOverlay";

export interface EditContigsOverlayProps {
onClose: () => void;
Expand All @@ -26,15 +27,17 @@ export interface EditContigsOverlayState {
}
export class EditContigsOverlay extends React.Component<EditContigsOverlayProps, EditContigsOverlayState>
{
public constructor(props: EditContigsOverlayProps) {
public constructor(props: EditContigsOverlayProps)
{
super(props);

this.state = {
selectedContigUuid: "",
allowMovingSelectContig : false
};
}
public render(): JSX.Element {
public render(): JSX.Element
{
const contig = getReferenceFromUuid(this.props.figure.contigs, this.state.selectedContigUuid);

return (
Expand All @@ -47,7 +50,8 @@ export class EditContigsOverlay extends React.Component<EditContigsOverlayProps,
<div>
{
contig ? <EditContigOverlay
onClose={() => {
onClose={() =>
{
this.setState({
selectedContigUuid: ""
});
Expand All @@ -58,7 +62,7 @@ export class EditContigsOverlay extends React.Component<EditContigsOverlayProps,
/> :
<React.Fragment>
<GridWrapper>
<div style={{ marginRight: "1vh", marginLeft: "1vh", marginBottom: "1vh" }}>
<div style={{marginRight: "1vh", marginLeft: "1vh", marginBottom: "1vh"}}>
<Grid container spacing={4} justify="center">
<Grid item>
<Typography variant="h5">Edit Contigs</Typography>
Expand All @@ -67,21 +71,23 @@ export class EditContigsOverlay extends React.Component<EditContigsOverlayProps,
</div>
</GridWrapper>
<GridWrapper>
<div style={{ marginLeft: "1vh", marginBottom: "1vh" }}>
<div style={{marginLeft: "1vh", marginBottom: "1vh"}}>
<Grid container direction="row" spacing={1} justify="center">
<Grid item>
<TreeView
defaultExpandIcon={<ChevronRight color="primary" classes={{ colorPrimary: blue }} />}
defaultCollapseIcon={<ExpandMore color="primary" classes={{ colorPrimary: blue }} />}
defaultExpandIcon={<ChevronRight color="primary" classes={{colorPrimary: blue}} />}
defaultCollapseIcon={<ExpandMore color="primary" classes={{colorPrimary: blue}} />}
>
<TreeItem nodeId={'0'} label="Reference Contigs">
<TreeItem nodeId={"0"} label="Reference Contigs">
{
this.props.figure.contigs.map((contig, i) => {
this.props.figure.contigs.map((contig, i) =>
{
return (
<TreeItem
nodeId={`0-${i}`}
label={contig.name}
onClick={() => {
onClick={() =>
{
this.setState({
selectedContigUuid: contig.uuid
});
Expand All @@ -91,14 +97,14 @@ export class EditContigsOverlay extends React.Component<EditContigsOverlayProps,
})
}
</TreeItem>
<TreeItem nodeId={'1'} label="Custom Contigs">
<TreeItem nodeId={"1"} label="Custom Contigs">
<TreeItem
nodeId={`1-new`}
nodeId={"1-new"}
label="Create New Custom Contig"
icon={
<AddBox
color="primary"
classes={{ colorPrimary: blue }}
classes={{colorPrimary: blue}}
/>
}
/>
Expand Down

0 comments on commit fd9defc

Please sign in to comment.