From 446953cb1e359c1836fb313b1bb38bfaa5805755 Mon Sep 17 00:00:00 2001 From: wlycdgr Date: Thu, 4 Feb 2021 10:54:19 -0500 Subject: [PATCH 1/6] Update alternative search engine identifiers to match name field vlues returned by browser.search.get() --- .../ChooseDefaultSearchConstants.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js index 29a6ad199..c50a4e34b 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js @@ -15,11 +15,11 @@ export const SET_DEFAULT_SEARCH = 'SET_DEFAULT_SEARCH'; export const SEARCH_GHOSTERY = 'Ghostery'; export const SEARCH_BING = 'Bing'; export const SEARCH_YAHOO = 'Yahoo'; -export const SEARCH_STARTPAGE = 'StartPage'; +export const SEARCH_STARTPAGE = 'Startpage'; export const SEARCH_DUCKDUCK_GO = 'DuckDuckGo'; -export const SEARCH_ECOSIA = 'Ecosia Search'; -export const SEARCH_EKORU = 'ekoru'; -export const SEARCH_GIBIRU = 'Gibiru.com'; +export const SEARCH_ECOSIA = 'Ecosia'; +export const SEARCH_EKORU = 'Ekoru'; +export const SEARCH_GIBIRU = 'Gibiru'; export const SEARCH_GOOGLE = 'Google'; export const SEARCH_ONESEARCH = 'OneSearch'; export const SEARCH_PRIVADO = 'Privado'; From fbf8b8bbc37ad3cac693fb3e75905bd763e464a4 Mon Sep 17 00:00:00 2001 From: wlycdgr Date: Thu, 4 Feb 2021 11:49:27 -0500 Subject: [PATCH 2/6] Guard against errors in case of unlisted or renamed chosen search --- .../ChooseDefaultSearchConstants.js | 2 ++ .../ChooseDefaultSearchView.jsx | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js index c50a4e34b..d18c59631 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js @@ -12,6 +12,7 @@ */ export const SET_DEFAULT_SEARCH = 'SET_DEFAULT_SEARCH'; +export const DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH = 0; export const SEARCH_GHOSTERY = 'Ghostery'; export const SEARCH_BING = 'Bing'; export const SEARCH_YAHOO = 'Yahoo'; @@ -27,3 +28,4 @@ export const SEARCH_QWANT = 'Qwant'; export const SEARCH_ENCRYPT = 'TODO: Add Search Encrypt browser.search.get() string'; export const SEARCH_TAILCAT = 'Tailcat'; export const SEARCH_OTHER = t('ghostery_dawn_onboarding_other'); + diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx index 4dda4582e..f2224fecc 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx @@ -32,7 +32,8 @@ import { SEARCH_QWANT, SEARCH_ENCRYPT, SEARCH_TAILCAT, - SEARCH_OTHER + SEARCH_OTHER, + DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH } from './ChooseDefaultSearchConstants'; import { Modal } from '../../../../shared-components'; @@ -161,9 +162,14 @@ class ChooseDefaultSearchView extends Component { setDefaultSearch(chosenSearchName); + const chosenSearchNameIndex = searchSetupNumbers.indexOf(chosenSearchName); + const dawn_setup_number = (chosenSearchNameIndex === -1) + ? DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH + : searchSetupNumbers[chosenSearchNameIndex].dawn_setup_number; + setSetupStep({ setup_step: CHOOSE_DEFAULT_SEARCH, - dawn_setup_number: searchSetupNumbers.find(elem => elem.name === chosenSearchName).dawn_setup_number, + dawn_setup_number, origin: ONBOARDING }); history.push(`/${ONBOARDING}/${CHOOSE_PLAN}`); From b89c7b8bd81f1fb4b05caaa55b2f946bfe6f7c24 Mon Sep 17 00:00:00 2001 From: wlycdgr Date: Thu, 4 Feb 2021 11:51:16 -0500 Subject: [PATCH 3/6] Make a best guess for what Search Encrypt identifier will be --- .../ChooseDefaultSearchConstants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js index d18c59631..60fdb06de 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js @@ -25,7 +25,7 @@ export const SEARCH_GOOGLE = 'Google'; export const SEARCH_ONESEARCH = 'OneSearch'; export const SEARCH_PRIVADO = 'Privado'; export const SEARCH_QWANT = 'Qwant'; -export const SEARCH_ENCRYPT = 'TODO: Add Search Encrypt browser.search.get() string'; +export const SEARCH_ENCRYPT = 'SearchEncrypt'; // TODO this is just our best guess. Once Search Encrypt is added on the Dawn side, we should confirm, particularly if we start getting a lot of DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH pings export const SEARCH_TAILCAT = 'Tailcat'; export const SEARCH_OTHER = t('ghostery_dawn_onboarding_other'); From 7abb306dccf66db01bbf71c1e8f2f7f4faaa6d49 Mon Sep 17 00:00:00 2001 From: wlycdgr Date: Thu, 4 Feb 2021 11:53:55 -0500 Subject: [PATCH 4/6] Delete the Forbidden Blank Line --- .../ChooseDefaultSearchConstants.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js index 60fdb06de..7eb92cbec 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchConstants.js @@ -28,4 +28,3 @@ export const SEARCH_QWANT = 'Qwant'; export const SEARCH_ENCRYPT = 'SearchEncrypt'; // TODO this is just our best guess. Once Search Encrypt is added on the Dawn side, we should confirm, particularly if we start getting a lot of DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH pings export const SEARCH_TAILCAT = 'Tailcat'; export const SEARCH_OTHER = t('ghostery_dawn_onboarding_other'); - From ae263d6b65b560b5af0e5f61416d4a386d97d7a8 Mon Sep 17 00:00:00 2001 From: wlycdgr Date: Thu, 4 Feb 2021 13:14:02 -0500 Subject: [PATCH 5/6] Look for search engine name using ds-appropriate array method --- .../ChooseDefaultSearchView.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx index f2224fecc..87e40f86a 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx @@ -162,7 +162,11 @@ class ChooseDefaultSearchView extends Component { setDefaultSearch(chosenSearchName); - const chosenSearchNameIndex = searchSetupNumbers.indexOf(chosenSearchName); + const chosenSearchNameIndex = searchSetupNumbers.findIndex(el => el.name === chosenSearchName); + + console.log('chosenSearchName:', chosenSearchName); + console.log('chosenSearchNameIndex:', chosenSearchNameIndex); + const dawn_setup_number = (chosenSearchNameIndex === -1) ? DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH : searchSetupNumbers[chosenSearchNameIndex].dawn_setup_number; From 5bfadf030437a5caaec676e0997e8fd42cc263a2 Mon Sep 17 00:00:00 2001 From: wlycdgr Date: Thu, 4 Feb 2021 13:14:26 -0500 Subject: [PATCH 6/6] Remove console logs --- .../Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx index 87e40f86a..1685cca6c 100644 --- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx +++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx @@ -164,9 +164,6 @@ class ChooseDefaultSearchView extends Component { const chosenSearchNameIndex = searchSetupNumbers.findIndex(el => el.name === chosenSearchName); - console.log('chosenSearchName:', chosenSearchName); - console.log('chosenSearchNameIndex:', chosenSearchNameIndex); - const dawn_setup_number = (chosenSearchNameIndex === -1) ? DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH : searchSetupNumbers[chosenSearchNameIndex].dawn_setup_number;