diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab6bd4bade6e88904680e3f2c0f76c7410750037..c1dcdf87e2ccfcce6123cb51553b069514c66e1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,14 @@ linting:
- $CI_COMMIT_REF_NAME =~ /^dev-.*$/
- $CI_COMMIT_MESSAGE =~ /\[skip[ _-]tests?\]/i
+gui_linting:
+ stage: test
+ image: node
+ script:
+ - cd gui
+ - yarn
+ - yarn run eslint 'src/**/*.js'
+
tests:
stage: test
image: $TEST_IMAGE
diff --git a/gui/.eslintrc.js b/gui/.eslintrc.js
index 1bfdf0df43e365065d499e8b9db730b2b30c5409..3f242e1ad4cc2f6f22f2b96050be9f2c6a0a42a6 100644
--- a/gui/.eslintrc.js
+++ b/gui/.eslintrc.js
@@ -8,10 +8,16 @@ module.exports = {
}
},
"globals": {
- "fetch": false
+ "fetch": false,
+ "browser": true
},
"rules": {
"space-before-function-paren": ["error", "never"],
"camelcase": [0]
+ },
+ "settings": {
+ "react": {
+ "version": "detect"
+ }
}
}
\ No newline at end of file
diff --git a/gui/src/components/ApiDialogButton.js b/gui/src/components/ApiDialogButton.js
index 3747694cb619fd1fab6891b37aa6fedf0a2c3365..c7046d5375391fdb390fe780a8ce9fa6c5a9c007 100644
--- a/gui/src/components/ApiDialogButton.js
+++ b/gui/src/components/ApiDialogButton.js
@@ -91,10 +91,10 @@ class ApiDialogUnstyled extends React.Component {
<div className={classes.code}>
<div className={classes.json}>
<ReactJson
- src={data}
- enableClipboard={false}
- collapsed={2}
- displayObjectSize={false}
+ src={data}
+ enableClipboard={false}
+ collapsed={2}
+ displayObjectSize={false}
/>
</div>
</div>
@@ -154,10 +154,10 @@ class ApiDialogButtonUnstyled extends React.Component {
return (
<div className={classes.root}>
{component ? component({onClick: this.handleShowDialog}) : <Tooltip title="Show API code">
- <IconButton onClick={this.handleShowDialog}>
- <CodeIcon />
- </IconButton>
- </Tooltip>
+ <IconButton onClick={this.handleShowDialog}>
+ <CodeIcon />
+ </IconButton>
+ </Tooltip>
}
<ApiDialog
{...dialogProps} open={showDialog}
diff --git a/gui/src/components/App.js b/gui/src/components/App.js
index 7f7fe87a13a5d49a9d71d8d933b76030dbc19ec2..9c0e64351edfc932f424230215bd700a34fb2c91 100644
--- a/gui/src/components/App.js
+++ b/gui/src/components/App.js
@@ -56,7 +56,7 @@ function ReloadSnack() {
>
<SnackbarContent
style={{backgroundColor: amber[700]}}
- message={<span>There is a new NOMAD version. Please press your browser's reload (or even shift+reload) button.</span>}
+ message={<span>There is a new NOMAD version. Please press your browser's reload (or even shift+reload) button.</span>}
/>
</Snackbar>
}
diff --git a/gui/src/components/DownloadButton.js b/gui/src/components/DownloadButton.js
index 110c8c56efe77228ce0503c089a7f0ca49c14a76..5ced4ddb29680a8e48679a148d0ec46ed321b81d 100644
--- a/gui/src/components/DownloadButton.js
+++ b/gui/src/components/DownloadButton.js
@@ -39,7 +39,7 @@ class DownloadButton extends React.Component {
handleClick(event) {
event.stopPropagation()
- this.setState({ anchorEl: event.currentTarget });
+ this.setState({ anchorEl: event.currentTarget })
}
async handleSelect(choice) {
diff --git a/gui/src/components/FAQ.js b/gui/src/components/FAQ.js
index f2f1d545edf1c2651c7e881a8f8c2a35f0bde3fa..dc480d27177065f0b097dee978d6aa13e0d9706d 100644
--- a/gui/src/components/FAQ.js
+++ b/gui/src/components/FAQ.js
@@ -30,7 +30,7 @@ class FAQ extends React.Component {
### How can I be sure that my data will be cited properly?
- Sharing means a change of culture. Making data open access is comparable to a
+ Sharing means a change of culture. Making data open access is comparable to a
publication where references to other work are common practice ever since.
Likewise, using someone's data requires proper citation. We recommend the uploader
to provide references to their data (publications, websites) and the users to
@@ -43,7 +43,7 @@ class FAQ extends React.Component {
associated with your data might not change right away, but it will be updated
eventually.
- ### I'd like to install NOMAD on my local computers to be only used by my group
+ ### I'd like to install NOMAD on my local computers to be only used by my group
Local NOMAD deployments are not actively supported at the moment. However, all
[NOMAD software](https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-FAIR) is
diff --git a/gui/src/components/ReloadSnack.js b/gui/src/components/ReloadSnack.js
deleted file mode 100644
index 3f699fb2cb5f5fb5f3c5cb1258a7c6b7d658b247..0000000000000000000000000000000000000000
--- a/gui/src/components/ReloadSnack.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default function ReloadSnack() {
- return <Snackbar
- anchorOrigin={{
- vertical: 'bottom',
- horizontal: 'left',
- }}
- open
- message={<span id="message-id">There is a new version. Please press your browsers Reload (or even Shift+Reload) button.</span>}
-/>
-}
\ No newline at end of file
diff --git a/gui/src/components/api.js b/gui/src/components/api.js
index d1140b24568e43d9d6929ded989e217cd33a6e53..0d63cbace27b821b468eb0146fded04f15b04862 100644
--- a/gui/src/components/api.js
+++ b/gui/src/components/api.js
@@ -322,6 +322,8 @@ class Api {
}))
.catch(handleApiError)
.then(response => {
+ /* global Blob */
+ /* eslint no-undef: "error" */
if (response.data instanceof Blob) {
if (response.data.type.endsWith('empty')) {
return {
@@ -397,7 +399,9 @@ class Api {
// this helps to keep consistent values, e.g. in the metadata search view
if (response.statistics) {
const empty = {}
- Object.keys(response.statistics.total.all).forEach(metric => empty[metric] = 0)
+ Object.keys(response.statistics.total.all).forEach(metric => {
+ empty[metric] = 0
+ })
Object.keys(response.statistics)
.filter(key => !['total', 'authors', 'atoms'].includes(key))
.forEach(key => {
diff --git a/gui/src/components/dft/DFTSearchAggregations.js b/gui/src/components/dft/DFTSearchAggregations.js
index a281d29324c7206def154886153f43cad1573188..a2df5d11ed6bcda4a5f9ce264fdec9131b40e39f 100644
--- a/gui/src/components/dft/DFTSearchAggregations.js
+++ b/gui/src/components/dft/DFTSearchAggregations.js
@@ -5,7 +5,6 @@ import { Quantity } from '../search/QuantityHistogram'
import SearchContext from '../search/SearchContext'
import { withApi } from '../api'
-
class DFTSearchAggregations extends React.Component {
static propTypes = {
info: PropTypes.object
diff --git a/gui/src/components/domains.js b/gui/src/components/domains.js
index 8520a02891b92470f38662a2e51c0ff13cdcbaf3..f1ee5d2afa5e289c9e2710175be9c27a5feb1f4e 100644
--- a/gui/src/components/domains.js
+++ b/gui/src/components/domains.js
@@ -7,6 +7,8 @@ import EMSEntryOverview from './ems/EMSEntryOverview'
import EMSEntryCards from './ems/EMSEntryCards'
import DFTSearchByPropertyAggregations from './dft/DFTSearchByPropertyAggregations'
+/* eslint-disable react/display-name */
+
export const domains = ({
dft: {
name: 'DFT',
@@ -24,7 +26,7 @@ export const domains = ({
* onChange (callback to propagate searchValue changes).
*/
SearchAggregations: DFTSearchAggregations,
- /**
+ /**
* A component that is used to render the search aggregations by property.
*/
SearchByPropertyAggregations: DFTSearchByPropertyAggregations,
diff --git a/gui/src/components/entry/ArchiveEntryView.js b/gui/src/components/entry/ArchiveEntryView.js
index 738c5b1258b8170ed033c8020728f71c8889e2a5..72edf8a4ba6f22479325aa760ae3d93f2a9700dc 100644
--- a/gui/src/components/entry/ArchiveEntryView.js
+++ b/gui/src/components/entry/ArchiveEntryView.js
@@ -22,7 +22,6 @@ learn more about NOMAD's archive format [here](/metainfo).
`
class MetainfoDialogUnstyled extends React.PureComponent {
-
static propTypes = {
classes: PropTypes.object.isRequired,
history: PropTypes.object.isRequired,
@@ -45,7 +44,7 @@ class MetainfoDialogUnstyled extends React.PureComponent {
render() {
const {classes, metaInfoData, onClose} = this.props
- return <Dialog open className={classes.root}>
+ return <Dialog open className={classes.root}>
<DialogTitle>
{metaInfoData.name}
</DialogTitle>
@@ -142,7 +141,7 @@ class ArchiveEntryView extends React.Component {
updateMetaInfo() {
if (this.props.api && this.props.info && !this.state.metaInfo) {
- this.props.api.getMetaInfo(this.props.info.domains.find(domain => domain.name === 'dft').metainfo.all_package).then(metaInfo => { // TODO handle the domain specificity
+ this.props.api.getMetaInfo(this.props.info.domains.find(domain => domain.name === 'dft').metainfo.all_package).then(metaInfo => { // TODO handle the domain specificity
if (!this.unmounted) {
this.setState({metaInfo: metaInfo})
}
diff --git a/gui/src/components/entry/RawFiles.js b/gui/src/components/entry/RawFiles.js
index dbe8b40f5509ab31596defe92eccbd1cb60e83e5..d608684cf32333aa269f19c65a74148d064a9521 100644
--- a/gui/src/components/entry/RawFiles.js
+++ b/gui/src/components/entry/RawFiles.js
@@ -209,8 +209,8 @@ class RawFiles extends React.Component {
downloadUrl = `raw/calc/${uploadId}/${calcId}/*?strip=true`
} else if (selectedFiles.length > 0) {
// use a prefix to shorten the url
- const prefix = selectedFiles[0].substring(0, selectedFiles[0].lastIndexOf("/"))
- const files = selectedFiles.map(path => path.substring(path.lastIndexOf("/") + 1)).join(',')
+ const prefix = selectedFiles[0].substring(0, selectedFiles[0].lastIndexOf('/'))
+ const files = selectedFiles.map(path => path.substring(path.lastIndexOf('/') + 1)).join(',')
downloadUrl = `raw/${uploadId}?files=${encodeURIComponent(files)}&prefix=${prefix}&strip=true`
}
diff --git a/gui/src/components/metaInfoBrowser/MetainfoSearch.js b/gui/src/components/metaInfoBrowser/MetainfoSearch.js
index f602785015c998427cc9fdc30087f7c1cf320c1c..1327e6faf2f9f6bb190aaf75b4703e0ab22e4dc5 100644
--- a/gui/src/components/metaInfoBrowser/MetainfoSearch.js
+++ b/gui/src/components/metaInfoBrowser/MetainfoSearch.js
@@ -51,7 +51,7 @@ function getSuggestionValue(suggestion) {
const styles = theme => ({
container: {
- position: 'relative',
+ position: 'relative'
},
suggestionsContainerOpen: {
position: 'absolute',
diff --git a/gui/src/components/search/EntryList.js b/gui/src/components/search/EntryList.js
index 8f9e0025a1090bdd990435968805273c97613fe5..e642f29b24a5ed685b4b9fd65a86125a641ffea4 100644
--- a/gui/src/components/search/EntryList.js
+++ b/gui/src/components/search/EntryList.js
@@ -161,7 +161,8 @@ export class EntryListUnstyled extends React.Component {
}
}
- componentWillUpdate(prevProps) {
+ // TODO was this really intentional
+ UNSAFE_componentWillUpdate(prevProps) {
if (prevProps.data !== this.props.data) {
this.setState({selected: []})
}
diff --git a/gui/src/components/search/QuantityHistogram.js b/gui/src/components/search/QuantityHistogram.js
index b6e430da015273efb0a0dcc25a110c4330245f14..1eca28309a1366241ea6e452e9ad17962a061f39 100644
--- a/gui/src/components/search/QuantityHistogram.js
+++ b/gui/src/components/search/QuantityHistogram.js
@@ -35,7 +35,7 @@ const _mapping = {
'oscillator_strengths': 'Oscillator strengths',
'transition_dipole_moments': 'Transition dipole moments'}
-function map_key (name) {
+function mapKey(name) {
if (name in _mapping) {
return _mapping[name]
}
@@ -102,7 +102,7 @@ class QuantityHistogramUnstyled extends React.Component {
const data = Object.keys(this.props.data)
.map(key => ({
- name: map_key(key),
+ name: mapKey(key),
value: this.props.data[key][this.props.metric]
}))
@@ -247,7 +247,6 @@ class QuantityHistogramUnstyled extends React.Component {
export const QuantityHistogram = withStyles(QuantityHistogramUnstyled.styles)(QuantityHistogramUnstyled)
-
class QuantityUnstyled extends React.Component {
static propTypes = {
classes: PropTypes.object.isRequired,
diff --git a/gui/src/components/search/SearchBar.js b/gui/src/components/search/SearchBar.js
index de9dc145fa15c483f5349e0bfb28de491f0c4d06..d2b23554c3c7bb494213513a4671f3535b2cf855 100644
--- a/gui/src/components/search/SearchBar.js
+++ b/gui/src/components/search/SearchBar.js
@@ -1,6 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { withStyles } from '@material-ui/core/styles'
+/* eslint-disable-next-line */
import { domains } from '../domains' // TODO this causes a weird import bug
import ChipInput from 'material-ui-chip-input'
import Autosuggest from 'react-autosuggest'
diff --git a/gui/src/components/search/UploadsChart.js b/gui/src/components/search/UploadsChart.js
index ca8df54c47d7dd0b0233e81925a79275215de8f3..6cfe4a49017476c7ed2e7ed8f02b1080fbb191a9 100644
--- a/gui/src/components/search/UploadsChart.js
+++ b/gui/src/components/search/UploadsChart.js
@@ -98,7 +98,7 @@ class UploadsHistogramUnstyled extends React.Component {
}
]
- timeInterval = Object.assign({}, ...this.intervals.map(e => ( {[e.value]: e.number})))
+ timeInterval = Object.assign({}, ...this.intervals.map(e => ({[e.value]: e.number})))
componentDidMount() {
const from_time = new Date(this.startDate).getTime()
@@ -120,9 +120,7 @@ class UploadsHistogramUnstyled extends React.Component {
handleIntervalChange(newInterval) {
// TODO: add a refresh button so directly updating interval is not necessary
- this.state.interval = newInterval
- //this.setState({interval: newInterval})
- this.handleQueryChange()
+ this.setState({interval: newInterval}, () => this.handleQueryChange())
}
handleTimeChange(newTime, key, target) {
@@ -136,7 +134,7 @@ class UploadsHistogramUnstyled extends React.Component {
key === 'from_time' ? this.setState({from_time: date.getTime()}) : this.setState({until_time: date.getTime()})
}
if (target === 'picker' || target === 'all') {
- document.getElementById(key).value = date.toISOString().substring(0,10)
+ document.getElementById(key).value = date.toISOString().substring(0, 10)
}
}
@@ -145,21 +143,21 @@ class UploadsHistogramUnstyled extends React.Component {
if (selected === this.state.time) {
this.props.onChanged(null, null, null)
} else {
- const deltaT = this.timeInterval[this.state.interval]
+ const deltaT = this.timeInterval[this.state.interval]
this.handleTimeChange(selected, 'from_time', 'all')
this.handleTimeChange(selected + deltaT, 'until_time', 'all')
this.handleQueryChange()
}
}
- resolveDate (name) {
+ resolveDate(name) {
const date = new Date(parseInt(name, 10))
const year = date.toLocaleDateString(undefined, {year: 'numeric'})
const month = date.toLocaleDateString(undefined, {month: 'short'})
const day = date.toLocaleDateString(undefined, {day: 'numeric'})
const hour = date.toLocaleTimeString(undefined, {hour: 'numeric'})
const min = date.toLocaleTimeString(undefined, {minute: 'numeric'})
- const sec= date.toLocaleTimeString(undefined, {second: 'numeric'})
+ const sec = date.toLocaleTimeString(undefined, {second: 'numeric'})
const intervals = {
'1y': year,
@@ -173,54 +171,54 @@ class UploadsHistogramUnstyled extends React.Component {
return intervals[this.state.interval]
}
- hover (svg, bar) {
+ hover(svg, bar) {
const textOffset = 25
const tooltip = svg.append('g')
- .attr('class', 'tooltip')
- .style('display', 'none')
+ .attr('class', 'tooltip')
+ .style('display', 'none')
const hoverBox = tooltip.append('rect')
- .attr('width', 10)
- .attr('height', 20)
- .attr('fill', 'white')
- .style('opacity', 0.0)
+ .attr('width', 10)
+ .attr('height', 20)
+ .attr('fill', 'white')
+ .style('opacity', 0.0)
const text = tooltip.append('text')
- .attr('x', textOffset)
- .attr('dy', '1.2em')
- .style('text-anchor', 'start')
- .attr('font-size', '12px')
- //.attr('font-weight', 'bold')
+ .attr('x', textOffset)
+ .attr('dy', '1.2em')
+ .style('text-anchor', 'start')
+ .attr('font-size', '12px')
+ // .attr('font-weight', 'bold')
bar
- .on('mouseover', () => {
- tooltip.style('display', null)
- let { width } = text.node().getBBox()
- hoverBox.attr('width', `${ width + textOffset }px`)
- })
- .on('mouseout', () => tooltip.style('display', 'none'))
- .on('mousemove', function(d) {
- let xPosition = d3.mouse(this)[0] - 15
- let yPosition = d3.mouse(this)[1] - 25
-
- tooltip.attr('transform', `translate( ${ xPosition }, ${ yPosition })`)
- tooltip.attr('data-html', 'true')
- tooltip.select('text').text( new Date(d.time).toISOString() + ': ' + d.value )
- })
+ .on('mouseover', () => {
+ tooltip.style('display', null)
+ let { width } = text.node().getBBox()
+ hoverBox.attr('width', `${width + textOffset}px`)
+ })
+ .on('mouseout', () => tooltip.style('display', 'none'))
+ .on('mousemove', function(d) {
+ let xPosition = d3.mouse(this)[0] - 15
+ let yPosition = d3.mouse(this)[1] - 25
+
+ tooltip.attr('transform', `translate( ${xPosition}, ${yPosition})`)
+ tooltip.attr('data-html', 'true')
+ tooltip.select('text').text(new Date(d.time).toISOString() + ': ' + d.value)
+ })
}
- updateChart () {
+ updateChart() {
let data = []
- if (! this.props.data) {
+ if (!this.props.data) {
return
} else {
data = Object.keys(this.props.data).map(key => ({
time: parseInt(key, 10),
name: this.resolveDate(key),
value: this.props.data[key][this.props.metric]
- }))}
-
+ }))
+ }
data.sort((a, b) => d3.ascending(a.time, b.time))
if (data.length > 0) {
@@ -228,13 +226,13 @@ class UploadsHistogramUnstyled extends React.Component {
this.handleTimeChange(this.state.until_time, 'until_time', 'picker')
}
- const scalePower = this.state.scalePower
+ const scalePower = this.state.scalePower
const width = this.container.current.offsetWidth
const height = this.props.height
- const margin = Math.round(0.1*height)
+ const margin = Math.round(0.1 * height)
const x = scaleBand().rangeRound([margin, width]).padding(0.1)
- const y = scalePow().range([height-margin, margin]).exponent(scalePower)
+ const y = scalePow().range([height - margin, margin]).exponent(scalePower)
const max = d3.max(data, d => d.value) || 0
x.domain(data.map(d => d.name))
@@ -247,36 +245,36 @@ class UploadsHistogramUnstyled extends React.Component {
const xAxis = d3.axisBottom(x)
svg.select('.xaxis').remove()
svg.append('g')
- .attr('transform', `translate(0,${height-margin})`)
- .attr('class', 'xaxis')
- .call(xAxis)
+ .attr('transform', `translate(0,${height - margin})`)
+ .attr('class', 'xaxis')
+ .call(xAxis)
svg.select('.xlabel').remove()
svg.append('text')
- .attr('class', 'xlabel')
- .attr("x", width)
- .attr("y", height-4)
- .attr('dy', ".35em")
- .attr('font-size', '12px')
- .style('text-anchor', 'end')
+ .attr('class', 'xlabel')
+ .attr('x', width)
+ .attr('y', height - 4)
+ .attr('dy', '.35em')
+ .attr('font-size', '12px')
+ .style('text-anchor', 'end')
const yAxis = d3.axisLeft(y)
svg.select('.yaxis').remove()
svg.append('g')
- .attr('transform', `translate(${margin}, 0)`)
- .attr('class', 'yaxis')
- .call(yAxis)
+ .attr('transform', `translate(${margin}, 0)`)
+ .attr('class', 'yaxis')
+ .call(yAxis)
const {label, shortLabel} = this.props.metricsDefinitions[this.props.metric]
svg.select('.ylabel').remove()
svg.append('text')
- .attr('class','ylabel')
- .attr('x', 0)
- .attr('y', 0)
- .attr('dy', "1em")
- .attr('text-anchor', 'start')
- .attr('font-size', '12px')
- .text(`${shortLabel ? shortLabel : label}`)
+ .attr('class', 'ylabel')
+ .attr('x', 0)
+ .attr('y', 0)
+ .attr('dy', '1em')
+ .attr('text-anchor', 'start')
+ .attr('font-size', '12px')
+ .text(`${shortLabel || label}`)
let withData = svg
.selectAll('.bar').remove().exit()
@@ -300,9 +298,9 @@ class UploadsHistogramUnstyled extends React.Component {
svg.select('.tooltip').remove()
svg.call(this.hover, item)
-}
+ }
- render () {
+ render() {
return (
<div>
<Grid container justify='space-around' spacing={24}>
@@ -314,10 +312,10 @@ class UploadsHistogramUnstyled extends React.Component {
onChange={(event) => this.setState({scalePower: event.target.value})}
label= 'scale'
> {this.scales.map(item => (
- <MenuItem
- value={item.value}
- key={item.label}> {item.label}
- </MenuItem>))}
+ <MenuItem
+ value={item.value}
+ key={item.label}> {item.label}
+ </MenuItem>))}
</Select>
</Grid>
<Grid item xs={3}>
@@ -327,17 +325,17 @@ class UploadsHistogramUnstyled extends React.Component {
type="date"
onChange={(event) => this.handleTimeChange(event.target.value, 'from_time', 'state')}
InputLabelProps={{
- shrink: true,
+ shrink: true
}}
/>
</Grid>
<Grid item xs={3}>
<Select
- id='interval'
- value={this.state.interval}
- onChange={(event) => this.handleIntervalChange(event.target.value)}
- label= 'interval'
- > {this.intervals.map(item => (
+ id='interval'
+ value={this.state.interval}
+ onChange={(event) => this.handleIntervalChange(event.target.value)}
+ label= 'interval'
+ > {this.intervals.map(item => (
<MenuItem value={item.value} key={item.value}>
{item.label}
</MenuItem>))}
@@ -350,7 +348,7 @@ class UploadsHistogramUnstyled extends React.Component {
type="date"
onChange={(event) => this.handleTimeChange(event.target.value, 'until_time', 'state')}
InputLabelProps={{
- shrink: true,
+ shrink: true
}}
/>
</Grid>
@@ -366,7 +364,6 @@ class UploadsHistogramUnstyled extends React.Component {
export const UploadsHistogram = withStyles(UploadsHistogramUnstyled.styles)(UploadsHistogramUnstyled)
class UploadersListUnstyled extends React.Component {
-
static propTypes = {
classes: PropTypes.object.isRequired
}
@@ -379,18 +376,18 @@ class UploadersListUnstyled extends React.Component {
static contextType = SearchContext.type
- render () {
+ render() {
const {state: {usedMetric}} = this.context
return (
- <Grid>
- <Quantity quantity="uploader" title="Top Uploaders" scale={1} metric={usedMetric} />
- </Grid>
+ <Grid>
+ <Quantity quantity="uploader" title="Top Uploaders" scale={1} metric={usedMetric} />
+ </Grid>
)
}
}
-export const UploadersList = withStyles(UploadersListUnstyled.styles)(UploadersListUnstyled)
+export const UploadersList = withStyles(UploadersListUnstyled.styles)(UploadersListUnstyled)
class UploadsChart extends React.Component {
static propTypes = {
@@ -407,7 +404,7 @@ class UploadsChart extends React.Component {
render() {
const {classes, metricsDefinitions, ...props} = this.props
- const {state: {response, usedMetric, query, }, setQuery} = this.context
+ const {state: {response, usedMetric, query}, setQuery} = this.context
return (
<Grid container spacing={24}>
@@ -427,8 +424,8 @@ class UploadsChart extends React.Component {
<UploadersList />
</Grid>
</Grid>
- )
+ )
}
}
-export default compose(withApi(false, false), withStyles(UploadsChart.styles))(UploadsChart)
\ No newline at end of file
+export default compose(withApi(false, false), withStyles(UploadsChart.styles))(UploadsChart)
diff --git a/gui/src/components/uploads/ConfirmDialog.js b/gui/src/components/uploads/ConfirmDialog.js
index f1a4013de232054117bb4323d8556fe49059822a..c9ac5fc15344bc02d749c032f193f3b7086b8119 100644
--- a/gui/src/components/uploads/ConfirmDialog.js
+++ b/gui/src/components/uploads/ConfirmDialog.js
@@ -18,7 +18,7 @@ class ConfirmDialog extends React.Component {
}
render() {
- const { onConfirm, onClose, open, title, content,confirmLabel } = this.props
+ const { onConfirm, onClose, open, title, content, confirmLabel } = this.props
return (
<div>
<Dialog
diff --git a/gui/src/components/uploads/Upload.js b/gui/src/components/uploads/Upload.js
index d09c4f51c49df632ed0a963fa27b2d0e72672023..c6ec61daa73901d4dbef1a87ad47b433669f1940 100644
--- a/gui/src/components/uploads/Upload.js
+++ b/gui/src/components/uploads/Upload.js
@@ -107,7 +107,8 @@ class Upload extends React.Component {
upload: PropTypes.object.isRequired,
onDoesNotExist: PropTypes.func,
open: PropTypes.bool,
- history: PropTypes.object.isRequired
+ history: PropTypes.object.isRequired,
+ domain: PropTypes.object
}
static styles = theme => ({
diff --git a/gui/src/components/uploads/UploadPage.js b/gui/src/components/uploads/UploadPage.js
index a998847cd60142ab85948a639255fb223537a1d3..c309154243f7a6435152acaf4fdecefffcb137dc 100644
--- a/gui/src/components/uploads/UploadPage.js
+++ b/gui/src/components/uploads/UploadPage.js
@@ -193,7 +193,7 @@ class UploadPage extends React.Component {
}
update(newPage) {
- const { data: { pagination: { page, per_page }}} = this.state
+ const {data: {pagination: {page, per_page}}} = this.state
this.props.api.getUploads('all', newPage || page, per_page)
.then(uploads => {
this.setState({
@@ -226,8 +226,8 @@ class UploadPage extends React.Component {
}
renderUploads(openUpload) {
- const { classes } = this.props
- const { data: { results, pagination: { total, per_page, page }}, uploading } = this.state
+ const {classes} = this.props
+ const {data: {results, pagination: {total, per_page, page}}, uploading} = this.state
const renderUpload = upload => <Upload
open={openUpload === upload.upload_id}
diff --git a/gui/src/utils.js b/gui/src/utils.js
index 5d8368caeb62efec3ceb30906db4d3002a0c4875..1db23fc3422589a29bee777e537e4f19908b3bd3 100644
--- a/gui/src/utils.js
+++ b/gui/src/utils.js
@@ -6,17 +6,17 @@ export const isEquivalent = (a, b) => {
// If number of properties is different,
// objects are not equivalent
if (aProps.length !== bProps.length) {
- return false;
+ return false
}
for (var i = 0; i < aProps.length; i++) {
- var propName = aProps[i]
+ var propName = aProps[i]
- // If values of same property are not equal,
- // objects are not equivalent
- if (a[propName] !== b[propName]) {
- return false
- }
+ // If values of same property are not equal,
+ // objects are not equivalent
+ if (a[propName] !== b[propName]) {
+ return false
+ }
}
// If we made it this far, objects
@@ -29,4 +29,4 @@ export const capitalize = (s) => {
return ''
}
return s.charAt(0).toUpperCase() + s.slice(1)
-}
\ No newline at end of file
+}