Issue mozilla#2807: Reorganize subcomponents & tests used only by Exp…

…erimentPage
lmorchard · Sep 28, 2017 · 0235395 · 0235395
1 parent bc723e0
commit 0235395
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 378 deletions.
diff --git a/...app/components/ExperimentDisableDialog.js → ...ExperimentPage/ExperimentDisableDialog.js b/...app/components/ExperimentDisableDialog.js → ...ExperimentPage/ExperimentDisableDialog.js
@@ -2,8 +2,8 @@
 import { Localized } from 'fluent-react/compat';
 import React from 'react';
 
-import Copter from './Copter';
-import { buildSurveyURL } from '../lib/utils';
+import Copter from '../../components/Copter';
+import { buildSurveyURL } from '../../lib/utils';
 
 type ExperimentDisableDialogProps = {
   experiment: Object,

diff --git a/...src/app/components/ExperimentEolDialog.js → ...ers/ExperimentPage/ExperimentEolDialog.js b/...src/app/components/ExperimentEolDialog.js → ...ers/ExperimentPage/ExperimentEolDialog.js
diff --git a/...components/ExperimentPreFeedbackDialog.js → ...rimentPage/ExperimentPreFeedbackDialog.js b/...components/ExperimentPreFeedbackDialog.js → ...rimentPage/ExperimentPreFeedbackDialog.js
diff --git a/...rc/app/components/ExperimentTourDialog.js → ...rs/ExperimentPage/ExperimentTourDialog.js b/...rc/app/components/ExperimentTourDialog.js → ...rs/ExperimentPage/ExperimentTourDialog.js
@@ -4,7 +4,7 @@ import classnames from 'classnames';
 import { Localized } from 'fluent-react/compat';
 import React from 'react';
 
-import { experimentL10nId } from '../lib/utils';
+import { experimentL10nId } from '../../lib/utils';
 
 type ExperimentTourDialogProps = {
   experiment: Object,

diff --git a/frontend/src/app/containers/ExperimentPage/TestpilotPromo.js b/frontend/src/app/containers/ExperimentPage/TestpilotPromo.js
@@ -16,8 +16,8 @@ export default class TestpilotPromo extends React.Component {
   render() {
     const { hasAddon, graduated, experiment } = this.props;
 
-    const { title } = experiment;
-    if (hasAddon === null || hasAddon || graduated || experiment.web_url) {
+    const { title, web_url } = experiment;
+    if (hasAddon === null || hasAddon || graduated || web_url) {
       return null;
     }
     return (

diff --git a/frontend/src/app/containers/ExperimentPage/index.js b/frontend/src/app/containers/ExperimentPage/index.js
@@ -10,19 +10,19 @@ import { buildSurveyURL, experimentL10nId, formatDate } from '../../lib/utils';
 import NotFoundPage from '../NotFoundPage';
 
 import EmailDialog from '../../components/EmailDialog';
-import ExperimentDisableDialog from '../../components/ExperimentDisableDialog';
-import ExperimentEolDialog from '../../components/ExperimentEolDialog';
-import ExperimentTourDialog from '../../components/ExperimentTourDialog';
 import LocalizedHtml from '../../components/LocalizedHtml';
 import ExperimentCardList from '../../components/ExperimentCardList';
-import ExperimentPreFeedbackDialog from '../../components/ExperimentPreFeedbackDialog';
 import View from '../../components/View';
 import Warning from '../../components/Warning';
 
 import ExperimentPlatforms from '../../components/ExperimentPlatforms';
 import Banner from '../../components/Banner';
 import LayoutWrapper from '../../components/LayoutWrapper';
 
+import ExperimentPreFeedbackDialog from './ExperimentPreFeedbackDialog';
+import ExperimentDisableDialog from './ExperimentDisableDialog';
+import ExperimentEolDialog from './ExperimentEolDialog';
+import ExperimentTourDialog from './ExperimentTourDialog';
 import IncompatibleAddons from './IncompatibleAddons';
 import TestpilotPromo from './TestpilotPromo';