Merge branch 'ghostery-browser-intro-hub' into setup-number-ping-param

ghostery · wlycdgr · Jan 29, 2021 · Jan 26, 2021 · Jan 26, 2021 · Jan 27, 2021
commit 20530058b1a0c57e17941041eba6d9090b7faa22
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -8,19 +8,23 @@
 # CMP / Metrics / WebRequest
 /src/classes/ABTest.js @wlycdgr
 /src/classes/CMP.js @christophertino
-/src/classes/EventHandlers.js @christophertino
-/src/classes/Metrics.js @wlycdgr
-/src/classes/PolicySmartBlock.js @christophertino
 /src/classes/Conf.js @christophertino
 /src/classes/ConfData.js @christophertino
+/src/classes/Debuggers.js @wlycdgr
+/src/classes/EventHandlers.js @christophertino
+/src/classes/Metrics.js @wlycdgr
 /src/classes/PanelData.js @wlycdgr
+/src/classes/PolicySmartBlock.js @christophertino
 
 # Background
 /src/background.js @christophertino
 
 # The Ghostery Hub
 /app/hub/ @benstrumeyer
 
+# Dawn Hub
+/app/dawn-hub @wlycdgr
+
 # Shared Components
 /app/shared-components @wlycdgr
 

diff --git a/...ery-browser-hub/Views/AppView/AppView.jsx → app/dawn-hub/Views/AppView/AppView.jsx b/...ery-browser-hub/Views/AppView/AppView.jsx → app/dawn-hub/Views/AppView/AppView.jsx
@@ -1,5 +1,5 @@
 /**
- * Ghostery Hub App View
+ * Dawn Hub App View
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/
@@ -16,9 +16,9 @@ import PropTypes from 'prop-types';
 import { ToastMessage } from '../../../shared-components';
 
 /**
- * A functional React component that implements the App View for the Ghostery Browser Hub
+ * A functional React component that lies at the root of the component hierarchy for the Dawn Hub
  * @extends Component
- * @memberof GhosteryBrowserHubViews
+ * @memberof DawnHubViews
  */
 const AppView = (props) => {
 	const { toast, children } = props;

diff --git a/...ostery-browser-hub/Views/AppView/index.js → app/dawn-hub/Views/AppView/index.js b/...ostery-browser-hub/Views/AppView/index.js → app/dawn-hub/Views/AppView/index.js
@@ -1,5 +1,5 @@
 /**
- * Point of entry index.js file for Ghostery Browser Hub App View
+ * Point of entry index.js file for Dawn Hub App View
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/

diff --git a/app/dawn-hub/Views/OnboardingView/OnboardingConstants.js b/app/dawn-hub/Views/OnboardingView/OnboardingConstants.js
@@ -0,0 +1,21 @@
+/**
+ * Constants for Dawn Hub
+ * These constants map the onboarding step numbers to more memorable names
+ *
+ * Ghostery Browser Extension
+ * https://www.ghostery.com/
+ *
+ * Copyright 2021 Ghostery, Inc. All rights reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0
+ */
+
+export const ONBOARDING = 'onboarding';
+export const WELCOME = '0';
+export const LOGIN = '1';
+export const BLOCK_SETTINGS = '2';
+export const CHOOSE_DEFAULT_SEARCH = '3';
+export const CHOOSE_PLAN = '4';
+export const SUCCESS = '5';
diff --git a/...b/Views/OnboardingView/OnboardingView.jsx → ...b/Views/OnboardingView/OnboardingView.jsx b/...b/Views/OnboardingView/OnboardingView.jsx → ...b/Views/OnboardingView/OnboardingView.jsx
@@ -1,5 +1,5 @@
 /**
- * Ghostery Browser Hub Onboarding View Component
+ * Dawn Hub root onboarding flow component
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/
@@ -26,9 +26,9 @@ import {
 } from './OnboardingConstants';
 
 /**
- * A Functional React component for rendering the Onboarding View
- * @return {JSX} JSX for rendering the Onboarding View of the Ghostery Browser Hub app
- * @memberof GhosteryBrowserHubViews
+ * A Functional React component for rendering the Dawn Hub onboarding flow
+ * @return {JSX} JSX for rendering the Dawn Hub onboarding flow
+ * @memberof DawnHubViews
  */
 const OnboardingView = (props) => {
 	const { sendMountActions, steps } = props;

diff --git a/.../Views/OnboardingView/OnboardingView.scss → .../Views/OnboardingView/OnboardingView.scss b/.../Views/OnboardingView/OnboardingView.scss → .../Views/OnboardingView/OnboardingView.scss
diff --git a/...nboardingView/OnboardingViewContainer.jsx → ...nboardingView/OnboardingViewContainer.jsx b/...nboardingView/OnboardingViewContainer.jsx → ...nboardingView/OnboardingViewContainer.jsx
@@ -1,5 +1,5 @@
 /**
- * Ghostery Browser Hub Onboarding View Container
+ * Dawn Hub Onboarding View Container
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/
@@ -38,9 +38,9 @@ import {
 const justInstalled = (QueryString.parse(window.location.search).justInstalled === 'true') || false;
 
 /**
- * @class Implement the Onboarding View for the Ghostery Browser Hub
+ * @class Wrap the root onboarding flow view of the Dawn Hub
  * @extends Component
- * @memberof GhosteryBrowserHubContainers
+ * @memberof DawnHubContainers
  */
 class OnboardingViewContainer extends Component {
 	constructor(props) {
@@ -83,7 +83,7 @@ class OnboardingViewContainer extends Component {
 
 	/**
 	 * React's required render function. Returns JSX
-	 * @return {JSX} JSX for rendering the Onboarding View of the Ghostery Browser Hub app
+	 * @return {JSX} JSX for rendering the root view of the onboarding flow of the Dawn Hub app
 	 */
 	render() {
 		const { sendMountActions } = this.state;

diff --git a/...browser-hub/Views/OnboardingView/index.js → app/dawn-hub/Views/OnboardingView/index.js b/...browser-hub/Views/OnboardingView/index.js → app/dawn-hub/Views/OnboardingView/index.js
@@ -1,5 +1,5 @@
 /**
- * Point of entry index.js file for Ghostery Browser Hub Onboarding View
+ * Point of entry index.js file for Dawn Hub Onboarding View
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/

diff --git a/...ngViews/Step0_WelcomeView/WelcomeView.jsx → ...ngViews/Step0_WelcomeView/WelcomeView.jsx b/...ngViews/Step0_WelcomeView/WelcomeView.jsx → ...ngViews/Step0_WelcomeView/WelcomeView.jsx
@@ -1,5 +1,5 @@
 /**
- * Ghostery Browser Hub Welcome View Component
+ * Dawn Hub onboarding flow Welcome View Component
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/
@@ -19,7 +19,7 @@ import { LOGIN, WELCOME } from '../../OnboardingView/OnboardingConstants';
 /**
  * A Functional React component for rendering the Browser Welcome View
  * @return {JSX} JSX for rendering the Browser Welcome View of the Hub app
- * @memberof GhosteryBrowserHubViews
+ * @memberof DawnHubViews
  */
 const WelcomeView = (props) => {
 	const { actions } = props;

diff --git a/...gViews/Step0_WelcomeView/WelcomeView.scss → ...gViews/Step0_WelcomeView/WelcomeView.scss b/...gViews/Step0_WelcomeView/WelcomeView.scss → ...gViews/Step0_WelcomeView/WelcomeView.scss
diff --git a/...elcomeView/__tests__/WelcomeView.test.jsx → ...elcomeView/__tests__/WelcomeView.test.jsx b/...elcomeView/__tests__/WelcomeView.test.jsx → ...elcomeView/__tests__/WelcomeView.test.jsx
@@ -1,5 +1,5 @@
 /**
- * Welcome View Test Component
+ * Dawn Hub onboarding flow Welcome View Test Component
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/
@@ -18,7 +18,7 @@ import WelcomeView from '../WelcomeView';
 
 const noop = () => {};
 
-describe('app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.test.jsx', () => {
+describe('app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.test.jsx', () => {
 	describe('Snapshot tests with react-test-renderer', () => {
 		test('Welcome View is rendered correctly', () => {
 			const initialState = {

diff --git a/..._/__snapshots__/WelcomeView.test.jsx.snap → ..._/__snapshots__/WelcomeView.test.jsx.snap b/..._/__snapshots__/WelcomeView.test.jsx.snap → ..._/__snapshots__/WelcomeView.test.jsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.test.jsx Snapshot tests with react-test-renderer Welcome View is rendered correctly 1`] = `
+exports[`app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.test.jsx Snapshot tests with react-test-renderer Welcome View is rendered correctly 1`] = `
 <div
   className="WelcomeView__container"
 >
@@ -12,7 +12,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/Welcom
   <div
     className="WelcomeView__subtitle"
   >
-    ghostery_dawn_onboarding_lets_begin
+    ghostery_dawn_onboarding_welcome_message
   </div>
   <img
     className="WelcomeView__rocketShip"

diff --git a/...nboardingViews/Step0_WelcomeView/index.js → ...nboardingViews/Step0_WelcomeView/index.js b/...nboardingViews/Step0_WelcomeView/index.js → ...nboardingViews/Step0_WelcomeView/index.js
@@ -1,5 +1,5 @@
 /**
- * Point of entry index.js file for Ghostery Browser Hub Welcome View
+ * Point of entry index.js file for Dawn Hub onboarding flow Welcome View
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/

diff --git a/...teAccountForm/Step1_CreateAccountForm.jsx → ...teAccountForm/Step1_CreateAccountForm.jsx b/...teAccountForm/Step1_CreateAccountForm.jsx → ...teAccountForm/Step1_CreateAccountForm.jsx
@@ -18,8 +18,8 @@ import ToggleCheckbox from '../../../../shared-components/ToggleCheckbox';
 
 /**
  * A Functional React component for rendering the Browser Create Account View
- * @return {JSX} JSX for rendering the Browser Create Account View of the Hub app
- * @memberof GhosteryBrowserHubViews
+ * @return {JSX} JSX for rendering the Browser Create Account View of the Dawn Hub app
+ * @memberof DawnHubViews
  */
 export const Step1_CreateAccountForm = (props) => {
 	const {

diff --git a/...eAccountForm/Step1_CreateAccountForm.scss → ...eAccountForm/Step1_CreateAccountForm.scss b/...eAccountForm/Step1_CreateAccountForm.scss → ...eAccountForm/Step1_CreateAccountForm.scss
diff --git a/...Form/Step1_CreateAccountFormContainer.jsx → ...Form/Step1_CreateAccountFormContainer.jsx b/...Form/Step1_CreateAccountFormContainer.jsx → ...Form/Step1_CreateAccountFormContainer.jsx
@@ -23,9 +23,9 @@ import {
 import BrowserCreateAccountForm from './Step1_CreateAccountForm';
 
 /**
- * @class Implement the Create Account View for the Ghostery Hub
+ * @class Implement the Create Account View for the Dawn Hub
  * @extends Component
- * @memberof GhosteryBrowserHubContainers
+ * @memberof DawnHubContainers
  */
 class CreateAccountFormContainer extends Component {
 	constructor(props) {

diff --git a/..._tests__/Step1_CreateAccountForm.test.jsx → ..._tests__/Step1_CreateAccountForm.test.jsx b/..._tests__/Step1_CreateAccountForm.test.jsx → ..._tests__/Step1_CreateAccountForm.test.jsx
diff --git a/...s__/Step1_CreateAccountForm.test.jsx.snap → ...s__/Step1_CreateAccountForm.test.jsx.snap b/...s__/Step1_CreateAccountForm.test.jsx.snap → ...s__/Step1_CreateAccountForm.test.jsx.snap
diff --git a/...ingViews/Step1_CreateAccountForm/index.js → ...ingViews/Step1_CreateAccountForm/index.js b/...ingViews/Step1_CreateAccountForm/index.js → ...ingViews/Step1_CreateAccountForm/index.js
@@ -1,5 +1,5 @@
 /**
- * Point of entry index.js file for Ghostery Browser Hub Create Account Form
+ * Point of entry index.js file for Dawn Hub onboarding flow Create Account Form
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/

diff --git a/...teAccountView/Step1_CreateAccountView.jsx → ...teAccountView/Step1_CreateAccountView.jsx b/...teAccountView/Step1_CreateAccountView.jsx → ...teAccountView/Step1_CreateAccountView.jsx
@@ -55,8 +55,8 @@ const renderFAQListItem = (icon, label, description) => (
 
 /**
  * A Functional React component for rendering the Browser Create Account View
- * @return {JSX} JSX for rendering the Browser Create Account View of the Hub app
- * @memberof GhosteryBrowserHubViews
+ * @return {JSX} JSX for rendering the Browser Create Account View of the Dawn Hub app
+ * @memberof DawnHubViews
  */
 const Step1_CreateAccountView = (props) => {
 	const { actions, step, user } = props;

diff --git a/...eAccountView/Step1_CreateAccountView.scss → ...eAccountView/Step1_CreateAccountView.scss b/...eAccountView/Step1_CreateAccountView.scss → ...eAccountView/Step1_CreateAccountView.scss
diff --git a/..._tests__/Step1_CreateAccountView.test.jsx → ..._tests__/Step1_CreateAccountView.test.jsx b/..._tests__/Step1_CreateAccountView.test.jsx → ..._tests__/Step1_CreateAccountView.test.jsx
diff --git a/...s__/Step1_CreateAccountView.test.jsx.snap → ...s__/Step1_CreateAccountView.test.jsx.snap b/...s__/Step1_CreateAccountView.test.jsx.snap → ...s__/Step1_CreateAccountView.test.jsx.snap
@@ -4,6 +4,28 @@ exports[`app/hub/Views/Step1_CreateAccountView component Snapshot tests with rea
 <div
   className="Step1_CreateAccountView"
 >
+  <div
+    className="CreateAccountView__relativeContainer"
+  >
+    <div
+      className="CreateAccountView__backContainer"
+    >
+      <span
+        className="CreateAccountView__caret left"
+      />
+      <a
+        aria-current={null}
+        href="/onboarding/3"
+        onClick={[Function]}
+      >
+        <span
+          className="CreateAccountView__back"
+        >
+          ghostery_dawn_onboarding_back_to_search_selection
+        </span>
+      </a>
+    </div>
+  </div>
   <div
     className="Step1_CreateAccountView__title"
   >
@@ -12,7 +34,7 @@ exports[`app/hub/Views/Step1_CreateAccountView component Snapshot tests with rea
   <div
     className="Step1_CreateAccountView__subtitle"
   >
-    ghostery_dawn_onboarding_sync_settings
+    ghostery_dawn_onboarding_create_account_for_trial
   </div>
   <div
     className="row align-center-middle"
@@ -25,27 +47,6 @@ exports[`app/hub/Views/Step1_CreateAccountView component Snapshot tests with rea
     </div>
   </div>
   <div />
-  <div
-    className="row align-center-middle"
-  >
-    <div
-      className="columns small-10 medium-6"
-    />
-    <div
-      className="columns small-10 medium-6"
-    >
-      <a
-        aria-current={null}
-        className="Step1_CreateAccountView__skip"
-        href="/onboarding/2"
-        onClick={[Function]}
-      >
-        <span>
-          ghostery_dawn_onboarding_skip
-        </span>
-      </a>
-    </div>
-  </div>
   <div
     className="Step1_CreateAccountView__FAQContainer"
   >

diff --git a/...ingViews/Step1_CreateAccountView/index.js → ...ingViews/Step1_CreateAccountView/index.js b/...ingViews/Step1_CreateAccountView/index.js → ...ingViews/Step1_CreateAccountView/index.js
@@ -1,5 +1,5 @@
 /**
- * Point of entry index.js file for Ghostery Browser Hub Create Account View
+ * Point of entry index.js file for Dawn Hub onboarding flow Create Account View
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/

diff --git a/...Views/Step1_LogInForm/Step1_LogInForm.jsx → ...Views/Step1_LogInForm/Step1_LogInForm.jsx b/...Views/Step1_LogInForm/Step1_LogInForm.jsx → ...Views/Step1_LogInForm/Step1_LogInForm.jsx
@@ -17,8 +17,8 @@ import ClassNames from 'classnames';
 
 /**
  * A Functional React component for rendering the Log In Form
- * @return {JSX} JSX for rendering the Log In Form of the Browser Hub app
- * @memberof HubComponents
+ * @return {JSX} JSX for rendering the Log In Form of the Dawn Hub app
+ * @memberof DawnHubViews
  */
 const Step1_LogInForm = (props) => {
 	const {

diff --git a/...iews/Step1_LogInForm/Step1_LogInForm.scss → ...iews/Step1_LogInForm/Step1_LogInForm.scss b/...iews/Step1_LogInForm/Step1_LogInForm.scss → ...iews/Step1_LogInForm/Step1_LogInForm.scss
diff --git a/...p1_LogInForm/Step1_LogInFormContainer.jsx → ...p1_LogInForm/Step1_LogInFormContainer.jsx b/...p1_LogInForm/Step1_LogInFormContainer.jsx → ...p1_LogInForm/Step1_LogInFormContainer.jsx
@@ -18,9 +18,9 @@ import { validateEmail } from '../../../../panel/utils/utils';
 import Step1_LogInForm from './Step1_LogInForm';
 
 /**
- * @class Implement the Browser Log In Form for the Ghostery Hub
+ * @class Implement the Browser Log In Form for the Dawn Hub
  * @extends Component
- * @memberof HubContainers
+ * @memberof DawnHubContainers
  */
 class Step1_LogInFormContainer extends Component {
 	constructor(props) {

diff --git a/...InForm/__tests__/Step1_LoginForm.test.jsx → ...InForm/__tests__/Step1_LoginForm.test.jsx b/...InForm/__tests__/Step1_LoginForm.test.jsx → ...InForm/__tests__/Step1_LoginForm.test.jsx
diff --git a/...snapshots__/Step1_LoginForm.test.jsx.snap → ...snapshots__/Step1_LoginForm.test.jsx.snap b/...snapshots__/Step1_LoginForm.test.jsx.snap → ...snapshots__/Step1_LoginForm.test.jsx.snap
diff --git a/.../OnboardingViews/Step1_LogInForm/index.js → .../OnboardingViews/Step1_LogInForm/index.js b/.../OnboardingViews/Step1_LogInForm/index.js → .../OnboardingViews/Step1_LogInForm/index.js
@@ -1,5 +1,5 @@
 /**
- * Point of entry index.js file for Ghostery Browser Hub Onboarding Login View
+ * Point of entry index.js file for Dawn Hub onboarding flow Onboarding Login View
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/

diff --git a/...2_BlockSettingsView/BlockSettingsView.jsx → ...2_BlockSettingsView/BlockSettingsView.jsx b/...2_BlockSettingsView/BlockSettingsView.jsx → ...2_BlockSettingsView/BlockSettingsView.jsx
@@ -1,5 +1,5 @@
 /**
- * Ghostery Browser Hub Block Settings View Component
+ * Dawn Hub onboarding flow Block Settings View Component
  *
  * Ghostery Browser Extension
  * https://www.ghostery.com/
@@ -21,9 +21,9 @@ import ToggleCheckbox from '../../../../shared-components/ToggleCheckbox/ToggleC
 import { CHOOSE_DEFAULT_SEARCH, ONBOARDING } from '../../OnboardingView/OnboardingConstants';
 
 /**
- * @class Implement the Block Settings View for the Ghostery Browser Hub
+ * @class Implement the Block Settings View for the Dawn Hub onboarding flow
  * @extends Component
- * @memberof HubComponents
+ * @memberof DawnHubViews
  */
 class BlockSettingsView extends Component {
 	constructor(props) {
@@ -135,7 +135,7 @@ class BlockSettingsView extends Component {
 	renderAnswerBlock = (checked, category, answer, label) => (
 		<div className="BlockSettingsView_answerBlock" onClick={() => this.handleAnswerChange(category, answer)}>
 			<div className="BlockSettingsView__radioButtonContainer">
-				<RadioButton checked={checked} altDesign onClick={() => {}} />
+				<RadioButton checked={checked} altDesign handleClick={() => {}} />
 			</div>
 			<div className="BlockSettingsView_answerText">{label}</div>
 		</div>

diff --git a/..._BlockSettingsView/BlockSettingsView.scss → ..._BlockSettingsView/BlockSettingsView.scss b/..._BlockSettingsView/BlockSettingsView.scss → ..._BlockSettingsView/BlockSettingsView.scss
diff --git a/...View/__tests__/BlockSettingsView.test.jsx → ...View/__tests__/BlockSettingsView.test.jsx b/...View/__tests__/BlockSettingsView.test.jsx → ...View/__tests__/BlockSettingsView.test.jsx
@@ -20,7 +20,7 @@ import BlockSettingsView from '../BlockSettingsView';
 const noop = () => {};
 jest.mock('../../../../../shared-components/Tooltip');
 
-describe('app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.test.jsx', () => {
+describe('app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.test.jsx', () => {
 	const initialState = {
 		actions: {
 			logout: noop,