Skip to content

Commit

Permalink
Migrate to react-v15.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tlrobinson committed Apr 8, 2017
1 parent 80f4b6d commit cda64a7
Show file tree
Hide file tree
Showing 406 changed files with 833 additions and 415 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"rules": {
"strict": [2, "never"],
"no-undef": 2,
"no-unused-vars": [1, {"vars": "all", "args": "none", "varsIgnorePattern": "^(React|PropTypes|Component)$"}],
"no-unused-vars": [1, {"vars": "all", "args": "none", "varsIgnorePattern": "^(React|Component)$"}],
"import/no-commonjs": 1,
"quotes": 0,
"camelcase": 0,
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/metabase/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* @flow weak */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import Navbar from "metabase/nav/containers/Navbar.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import ModalContent from "metabase/components/ModalContent.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import cx from "classnames";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
import DatabaseDetailsForm from "metabase/components/DatabaseDetailsForm.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ModalContent from "metabase/components/ModalContent.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import MetabaseSettings from "metabase/lib/settings";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";
import { Link } from "react-router";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import cx from "classnames";
import { formDomOnlyProps } from "metabase/lib/redux";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

export default class FormLabel extends Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import cx from "classnames";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import Icon from "metabase/components/Icon.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import ReactDOM from "react-dom";

import ActionButton from "metabase/components/ActionButton.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import GuiQueryEditor from "metabase/query_builder/components/GuiQueryEditor.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Input from "metabase/components/Input.jsx";
import Select from "metabase/components/Select.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ColumnItem from "./ColumnItem.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import SaveStatus from "metabase/components/SaveStatus.jsx";
import Toggle from "metabase/components/Toggle.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

export default class MetadataSchema extends Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Icon from "metabase/components/Icon.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import MetricsList from "./MetricsList.jsx";
import ColumnsList from "./ColumnsList.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ProgressBar from "metabase/components/ProgressBar.jsx";
import Icon from "metabase/components/Icon.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import MetadataTableList from "./MetadataTableList.jsx";
import MetadataSchemaList from "./MetadataSchemaList.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ObjectActionSelect from "../ObjectActionSelect.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import MetricItem from "./MetricItem.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ObjectActionSelect from "../ObjectActionSelect.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import SegmentItem from "./SegmentItem.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import RevisionDiff from "./RevisionDiff.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import TextDiff from "./TextDiff.jsx";
import QueryDiff from "./QueryDiff.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Revision from "./Revision.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*eslint-env node */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { diffWords } from 'diff';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import _ from "underscore";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";
import { push } from "react-router-redux";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import FormLabel from "../components/FormLabel.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import RevisionHistory from "../components/revisions/RevisionHistory.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";
import { push } from "react-router-redux";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import FormLabel from "../components/FormLabel.jsx";
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/metabase/admin/people/components/AddRow.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import cx from "classnames";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import ReactDOM from "react-dom";

import FormField from "metabase/components/form/FormField.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import CheckBox from "metabase/components/CheckBox.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import _ from "underscore";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Icon from "metabase/components/Icon.jsx";
import MetabaseSettings from "metabase/lib/settings";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import cx from "classnames";

import Icon from "metabase/components/Icon.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { LeftNavPane, LeftNavPaneItem } from "metabase/components/LeftNavPane.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";
import _ from "underscore";
import { connect } from "react-redux";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-disable react/display-name */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { Grid, ScrollSync } from 'react-virtualized'
import 'react-virtualized/styles.css';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { inflect } from "metabase/lib/formatting";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
import Confirm from "metabase/components/Confirm.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-disable react/display-name */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { Link } from "react-router";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import PermissionsEditor from "../components/PermissionsEditor.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux"

import PermissionsApp from "./PermissionsApp.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import PermissionsEditor from "../components/PermissionsEditor.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { withRouter } from "react-router";
import { connect } from "react-redux"
import { push } from "react-router-redux";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import PermissionsEditor from "../components/PermissionsEditor.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import PermissionsEditor from "../components/PermissionsEditor.jsx";
Expand Down
Loading

0 comments on commit cda64a7

Please sign in to comment.