Skip to content

Commit 2ded9d5

Browse files
committed
Lint-roll the JS sources
1 parent 541b5cd commit 2ded9d5

File tree

5 files changed

+57
-47
lines changed

5 files changed

+57
-47
lines changed

static/js/actions.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -439,20 +439,18 @@ export function computeFeatures(form) {
439439

440440

441441
export function uploadFeatureset(form, currentProject) {
442-
443-
function fileReaderPromise(form, fileName, binary = false){
442+
function fileReaderPromise(formFields, fileName, binary = false) {
444443
return new Promise(resolve => {
445-
var filereader = new FileReader();
444+
const filereader = new FileReader();
446445
if (binary) {
447-
filereader.readAsDataURL(form[fileName][0]);
446+
filereader.readAsDataURL(formFields[fileName][0]);
448447
} else {
449-
filereader.readAsText(form[fileName][0]);
448+
filereader.readAsText(formFields[fileName][0]);
450449
}
451450
filereader.onloadend = () => resolve({ body: filereader.result,
452-
name: form[fileName][0].name });
451+
name: formFields[fileName][0].name });
453452
});
454453
}
455-
456454
form['projectID'] = currentProject.id;
457455

458456
return dispatch =>
@@ -470,7 +468,7 @@ export function uploadFeatureset(form, currentProject) {
470468
headers: new Headers({
471469
'Content-Type': 'application/json'
472470
})
473-
})
471+
});
474472
})
475473
.then(response => response.json())
476474
.then((json) => {

static/js/components/Features.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ let FeaturesTab = (props) => {
5050
FeaturesTab.propTypes = {
5151
featurePlotURL: PropTypes.string.isRequired,
5252
computeFeatures: PropTypes.func.isRequired,
53+
uploadFeatures: PropTypes.func.isRequired,
5354
selectedProject: PropTypes.object
5455
};
5556
FeaturesTab.defaultProps = {
@@ -60,7 +61,8 @@ const ftMapDispatchToProps = (dispatch, ownProps) => (
6061
{
6162
computeFeatures: form => dispatch(Action.computeFeatures(form)),
6263
uploadFeatures: form => dispatch(
63-
Action.uploadFeatureset(form, ownProps.selectedProject))
64+
Action.uploadFeatureset(form, ownProps.selectedProject)
65+
)
6466
}
6567
);
6668

static/js/components/FeaturesetsTable.jsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { connect } from 'react-redux';
34

45
import { reformatDatetime } from '../utils';
@@ -44,15 +45,19 @@ const FeaturesetsTable = props => (
4445
</tr>
4546
{foldedContent}
4647
</FoldableRow>
47-
); })
48+
);
49+
})
4850
}
4951

5052
</table>
5153
</div>
5254
);
5355
FeaturesetsTable.propTypes = {
54-
featuresets: React.PropTypes.arrayOf(React.PropTypes.object),
55-
featurePlotURL: React.PropTypes.string
56+
featuresets: PropTypes.arrayOf(PropTypes.object).isRequired,
57+
featurePlotURL: PropTypes.string
58+
};
59+
FeaturesetsTable.defaultProps = {
60+
featurePlotURL: null
5661
};
5762

5863

static/js/components/FeaturizeForm.jsx

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { reduxForm } from 'redux-form';
34
import ReactTabs from 'react-tabs';
45

@@ -10,11 +11,7 @@ import { contains } from '../utils';
1011
import * as Action from '../actions';
1112

1213

13-
const Tab = ReactTabs.Tab;
14-
const Tabs = ReactTabs.Tabs;
15-
const TabList = ReactTabs.TabList;
16-
const TabPanel = ReactTabs.TabPanel;
17-
14+
const { Tab, Tabs, TabList, TabPanel } = { ...ReactTabs };
1815

1916
const FeaturizeForm = (props) => {
2017
const { fields, fields: { datasetID, featuresetName, customFeatsCode },
@@ -69,9 +66,13 @@ const FeaturizeForm = (props) => {
6966
<TabPanel>
7067
<a
7168
href="#"
72-
onClick={() => {
69+
onClick={
70+
() => {
7371
props.dispatch(Action.groupToggleCheckedFeatures(
74-
props.featuresByCategory[ctgy])); }}
72+
props.featuresByCategory[ctgy]
73+
));
74+
}
75+
}
7576
>
7677
Check/Uncheck All
7778
</a>
@@ -103,7 +104,8 @@ const FeaturizeForm = (props) => {
103104
<TabPanel>
104105
<TextareaInput
105106
label="Enter Python code defining custom features"
106-
rows="10" cols="50"
107+
rows="10"
108+
cols="50"
107109
{...customFeatsCode}
108110
/>
109111
</TabPanel>
@@ -113,19 +115,21 @@ const FeaturizeForm = (props) => {
113115
);
114116
};
115117
FeaturizeForm.propTypes = {
116-
fields: React.PropTypes.object.isRequired,
117-
datasets: React.PropTypes.arrayOf(React.PropTypes.object).isRequired,
118-
error: React.PropTypes.string,
119-
handleSubmit: React.PropTypes.func.isRequired,
120-
submitting: React.PropTypes.bool.isRequired,
121-
resetForm: React.PropTypes.func.isRequired,
122-
selectedProject: React.PropTypes.object,
123-
featuresByCategory: React.PropTypes.object,
124-
tagList: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
125-
featuresList: React.PropTypes.array,
126-
featureDescriptions: React.PropTypes.object
118+
fields: PropTypes.object.isRequired,
119+
datasets: PropTypes.arrayOf(PropTypes.object).isRequired,
120+
error: PropTypes.string,
121+
handleSubmit: PropTypes.func.isRequired,
122+
submitting: PropTypes.bool.isRequired,
123+
resetForm: PropTypes.func.isRequired,
124+
selectedProject: PropTypes.object.isRequired,
125+
featuresByCategory: PropTypes.object.isRequired,
126+
tagList: PropTypes.arrayOf(PropTypes.string).isRequired,
127+
featuresList: PropTypes.array.isRequired,
128+
featureDescriptions: PropTypes.object.isRequired
129+
};
130+
FeaturizeForm.defaultProps = {
131+
error: ""
127132
};
128-
129133

130134
const mapStateToProps = (state, ownProps) => {
131135
const featuresList = state.features.featsWithCheckedTags;
@@ -144,7 +148,8 @@ const mapStateToProps = (state, ownProps) => {
144148
featureDescriptions: state.features.descriptions,
145149
datasets: filteredDatasets,
146150
fields: featuresList.concat(
147-
['datasetID', 'featuresetName', 'customFeatsCode']),
151+
['datasetID', 'featuresetName', 'customFeatsCode']
152+
),
148153
initialValues: { ...initialValues,
149154
datasetID: zerothDataset ? zerothDataset.id.toString() : "",
150155
customFeatsCode: "" }

static/js/components/UploadFeaturesForm.jsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { reduxForm } from 'redux-form';
34

45
import { FormComponent, Form, TextInput, TextareaInput, SubmitButton,
@@ -9,8 +10,7 @@ import CesiumTooltip from './Tooltip';
910

1011
const UploadFeaturesForm = props => {
1112
const { fields, fields: { datasetID, featuresetName, dataFile },
12-
handleSubmit, submitting, resetForm, error, featuresList,
13-
featureDescriptions } = props;
13+
handleSubmit, submitting, resetForm, error } = props;
1414
const datasets = props.datasets.map(ds => (
1515
{ id: ds.id,
1616
label: ds.name }
@@ -47,23 +47,22 @@ const UploadFeaturesForm = props => {
4747
};
4848

4949
UploadFeaturesForm.propTypes = {
50-
fields: React.PropTypes.object.isRequired,
51-
datasets: React.PropTypes.arrayOf(React.PropTypes.object).isRequired,
52-
error: React.PropTypes.string,
53-
handleSubmit: React.PropTypes.func.isRequired,
54-
submitting: React.PropTypes.bool.isRequired,
55-
resetForm: React.PropTypes.func.isRequired,
56-
selectedProject: React.PropTypes.object
50+
fields: PropTypes.object.isRequired,
51+
datasets: PropTypes.arrayOf(PropTypes.object).isRequired,
52+
error: PropTypes.string,
53+
handleSubmit: PropTypes.func.isRequired,
54+
submitting: PropTypes.bool.isRequired,
55+
resetForm: PropTypes.func.isRequired,
56+
selectedProject: PropTypes.object.isRequired
57+
};
58+
UploadFeaturesForm.defaultProps = {
59+
error: ""
5760
};
58-
5961

6062
const mapStateToProps = (state, ownProps) => {
61-
6263
const initialValues = { };
63-
6464
const filteredDatasets = state.datasets.filter(dataset =>
6565
(dataset.project_id === ownProps.selectedProject.id));
66-
6766
return {
6867
datasets: filteredDatasets,
6968
fields: ['datasetID', 'featuresetName', 'dataFile'],
@@ -82,4 +81,5 @@ export default reduxForm(
8281
form: 'uploadFeatures',
8382
fields: [''],
8483
validate
85-
}, mapStateToProps)(UploadFeaturesForm);
84+
}, mapStateToProps
85+
)(UploadFeaturesForm);

0 commit comments

Comments
 (0)