Enable react/prop-types. (#3977)

mozilla-services · Feb 2, 2018 · 2c96506 · 2c96506
1 parent 40b380b
commit 2c96506
Show file tree

Hide file tree

Showing 16 changed files with 204 additions and 2 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -21,7 +21,6 @@ plugins:
 root: true
 
 rules:
-  react/prop-types: off # TODO: change to "error"
   consistent-return: off # TODO: remove, and default to mozilla/recommended of "error"
   no-console: [error, {allow: [debug, error, info, trace, warn]}]
   no-var: off # TODO: change to "error"

diff --git a/server/src/footer-view.js b/server/src/footer-view.js
@@ -1,5 +1,6 @@
 const React = require("react");
 const { Localized } = require("fluent-react/compat");
+const PropTypes = require("prop-types");
 
 exports.Footer = class Footer extends React.Component {
   render() {
@@ -29,3 +30,7 @@ exports.Footer = class Footer extends React.Component {
     );
   }
 };
+
+exports.Footer.propTypes = {
+  authenticated: PropTypes.bool
+};
diff --git a/server/src/oembed-view.js b/server/src/oembed-view.js
@@ -1,5 +1,6 @@
 const React = require("react");
 const ReactDOMServer = require("react-dom/server");
+const PropTypes = require("prop-types");
 
 class OEmbed extends React.Component {
   render() {
@@ -17,3 +18,7 @@ exports.renderString = function(args) {
   let oembed = OEmbedFactory(args);
   return ReactDOMServer.renderToStaticMarkup(oembed);
 };
+
+OEmbed.propTypes = {
+  shot: PropTypes.object
+};
diff --git a/server/src/pages/creating/view.js b/server/src/pages/creating/view.js
@@ -1,5 +1,6 @@
 const reactruntime = require("../../reactruntime");
 const React = require("react");
+const PropTypes = require("prop-types");
 const { Localized } = require("fluent-react/compat");
 
 class Head extends React.Component {
@@ -15,6 +16,10 @@ class Head extends React.Component {
 
 }
 
+Head.propTypes = {
+  staticLink: PropTypes.func
+};
+
 class Body extends React.Component {
   render() {
     return (

diff --git a/server/src/pages/homepage/view.js b/server/src/pages/homepage/view.js
@@ -1,4 +1,5 @@
 const React = require("react");
+const PropTypes = require("prop-types");
 const reactruntime = require("../../reactruntime");
 const classnames = require("classnames");
 const sendEvent = require("../../browser-send-event.js");
@@ -39,6 +40,12 @@ class Head extends React.Component {
 
 }
 
+Head.propTypes = {
+  backend: PropTypes.string,
+  staticLink: PropTypes.func,
+  title: PropTypes.string
+};
+
 class Body extends React.Component {
   onClickMyShots() {
     sendEvent("goto-myshots", "homepage", {useBeacon: true});
@@ -188,5 +195,11 @@ class Body extends React.Component {
 
 }
 
+Body.propTypes = {
+  firefoxVersion: PropTypes.string,
+  isFirefox: PropTypes.bool,
+  showMyShots: PropTypes.bool
+};
+
 exports.HeadFactory = React.createFactory(Head);
 exports.BodyFactory = React.createFactory(Body);
diff --git a/server/src/pages/leave-screenshots/view.js b/server/src/pages/leave-screenshots/view.js
@@ -1,6 +1,7 @@
 const sendEvent = require("../../browser-send-event.js");
 const reactruntime = require("../../reactruntime");
 const React = require("react");
+const PropTypes = require("prop-types");
 const { Localized } = require("fluent-react/compat");
 
 class Head extends React.Component {
@@ -16,6 +17,10 @@ class Head extends React.Component {
 
 }
 
+Head.propTypes = {
+  staticLink: PropTypes.func
+};
+
 class Body extends React.Component {
 
   render() {
@@ -83,5 +88,12 @@ class Body extends React.Component {
 
 }
 
+Body.propTypes = {
+  complete: PropTypes.bool,
+  csrfToken: PropTypes.string,
+  staticLink: PropTypes.func
+};
+
+
 exports.HeadFactory = React.createFactory(Head);
 exports.BodyFactory = React.createFactory(Body);
diff --git a/server/src/pages/metrics/view.js b/server/src/pages/metrics/view.js
@@ -1,5 +1,6 @@
 const reactruntime = require("../../reactruntime");
 const React = require("react");
+const PropTypes = require("prop-types");
 const { Localized } = require("fluent-react/compat");
 
 class Head extends React.Component {
@@ -15,6 +16,10 @@ class Head extends React.Component {
 
 }
 
+Head.propTypes = {
+  staticLink: PropTypes.func
+};
+
 class Body extends React.Component {
   render() {
     let created = new Date(this.props.data.shotsCreatedByDay.created);
@@ -44,6 +49,10 @@ class Body extends React.Component {
 
 }
 
+Body.propTypes = {
+  data: PropTypes.object
+};
+
 class GenericTable extends React.Component {
   render() {
     let time = this.props.data.timeToExecute;
@@ -102,5 +111,9 @@ class GenericTable extends React.Component {
 
 }
 
+GenericTable.propTypes = {
+  data: PropTypes.object
+};
+
 exports.HeadFactory = React.createFactory(Head);
 exports.BodyFactory = React.createFactory(Body);
diff --git a/server/src/pages/not-found/view.js b/server/src/pages/not-found/view.js
@@ -2,6 +2,7 @@ const reactruntime = require("../../reactruntime");
 const { Footer } = require("../../footer-view.js");
 const { Localized } = require("fluent-react/compat");
 const React = require("react");
+const PropTypes = require("prop-types");
 
 class Head extends React.Component {
   render() {
@@ -13,6 +14,10 @@ class Head extends React.Component {
   }
 }
 
+Head.propTypes = {
+  staticLink: PropTypes.func
+};
+
 class Body extends React.Component {
   constructor(props) {
     super(props);
@@ -46,5 +51,10 @@ class Body extends React.Component {
   }
 }
 
+Body.propTypes = {
+  defaultSearch: PropTypes.string,
+  staticLink: PropTypes.func
+};
+
 exports.HeadFactory = React.createFactory(Head);
 exports.BodyFactory = React.createFactory(Body);
diff --git a/server/src/pages/settings/view.js b/server/src/pages/settings/view.js
@@ -2,6 +2,7 @@
 const reactruntime = require("../../reactruntime");
 const sendEvent = require("../../browser-send-event.js");
 const React = require("react");
+const PropTypes = require("prop-types");
 
 class Head extends React.Component {
 
@@ -16,6 +17,10 @@ class Head extends React.Component {
 
 }
 
+Head.propTypes = {
+  staticLink: PropTypes.func
+};
+
 class Body extends React.Component {
   render() {
     return (
@@ -86,5 +91,10 @@ class Body extends React.Component {
   }
 }
 
+Body.propTypes = {
+  accountInfo: PropTypes.object,
+  staticLink: PropTypes.func
+};
+
 exports.HeadFactory = React.createFactory(Head);
 exports.BodyFactory = React.createFactory(Body);
diff --git a/server/src/pages/shot/editor.js b/server/src/pages/shot/editor.js
@@ -1,4 +1,5 @@
 const React = require("react");
+const PropTypes = require("prop-types");
 const { Localized } = require("fluent-react/compat");
 const sendEvent = require("../../browser-send-event.js");
 
@@ -543,6 +544,13 @@ exports.Editor = class Editor extends React.Component {
   }
 }
 
+exports.Editor.propTypes = {
+  clip: PropTypes.object,
+  onCancelEdit: PropTypes.func,
+  onClickSave: PropTypes.func,
+  pngToJpegCutoff: PropTypes.number
+};
+
 class ColorPicker extends React.Component {
 
   constructor(props) {
@@ -591,3 +599,7 @@ class ColorPicker extends React.Component {
     this.setState({pickerActive});
   }
 }
+
+ColorPicker.propTypes = {
+  setColor: PropTypes.func
+};
diff --git a/server/src/pages/shot/time-diff.js b/server/src/pages/shot/time-diff.js
@@ -1,5 +1,6 @@
 const React = require("react");
 const { Localized } = require("fluent-react/compat");
+const PropTypes = require("prop-types");
 
 exports.TimeDiff = class TimeDiff extends React.Component {
   constructor(props) {
@@ -66,3 +67,7 @@ exports.TimeDiff = class TimeDiff extends React.Component {
     return d.toLocaleString();
   }
 };
+
+exports.TimeDiff.propTypes = {
+  date: PropTypes.number
+}
diff --git a/server/src/pages/shot/view.js b/server/src/pages/shot/view.js
@@ -1,5 +1,6 @@
 /* globals controller */
 const React = require("react");
+const PropTypes = require("prop-types");
 const { Localized } = require("fluent-react/compat");
 const { Footer } = require("../../footer-view");
 const sendEvent = require("../../browser-send-event.js");
@@ -79,6 +80,9 @@ class Clip extends React.Component {
   }
 }
 
+Clip.propTypes = {
+  clip: PropTypes.object
+};
 
 class Head extends React.Component {
   render() {
@@ -160,6 +164,12 @@ class Head extends React.Component {
   }
 }
 
+Head.propTypes = {
+  expireTime: PropTypes.number,
+  shot: PropTypes.object,
+  staticLink: PropTypes.func
+};
+
 class Body extends React.Component {
   constructor(props) {
     super(props);
@@ -527,6 +537,28 @@ class Body extends React.Component {
 
 }
 
+Body.propTypes = {
+  abTests: PropTypes.object,
+  backend: PropTypes.string,
+  blockType: PropTypes.string,
+  controller: PropTypes.object,
+  defaultExpiration: PropTypes.number,
+  downloadUrl: PropTypes.string,
+  enableAnnotations: PropTypes.bool,
+  expireTime: PropTypes.number,
+  id: PropTypes.string,
+  isExtInstalled: PropTypes.bool,
+  isMobile: PropTypes.bool,
+  isOwner: PropTypes.bool,
+  loginFailed: PropTypes.bool,
+  pngToJpegCutoff: PropTypes.number,
+  retentionTime: PropTypes.number,
+  showSurveyLink: PropTypes.bool,
+  shot: PropTypes.object,
+  staticLink: PropTypes.func,
+  userAgent: PropTypes.string
+};
+
 class ExpireWidget extends React.Component {
 
   constructor(props) {
@@ -610,6 +642,13 @@ class ExpireWidget extends React.Component {
   }
 }
 
+ExpireWidget.propTypes = {
+  expireTime: PropTypes.number,
+  onChanging: PropTypes.func,
+  onSaveExpire: PropTypes.func,
+  simple: PropTypes.bool
+};
+
 class EditableTitle extends React.Component {
 
   constructor(props) {
@@ -671,6 +710,11 @@ class EditableTitle extends React.Component {
 
 }
 
+EditableTitle.propTypes = {
+  isOwner: PropTypes.bool,
+  title: PropTypes.string
+};
+
 class LoginFailedWarning extends React.Component {
   render() {
     return <Localized id="errorThirdPartyCookiesEnabled">

diff --git a/server/src/pages/shotindex/model.js b/server/src/pages/shotindex/model.js
@@ -8,7 +8,7 @@ exports.createModel = function(req) {
   }
   let serverModel = {
     title,
-    hasDeviceId: req.deviceId || null,
+    hasDeviceId: req.deviceId !== undefined,
     defaultSearch: query || null
   };
   serverModel.shotsPerPage = req.shotsPerPage;