Move preview URL implementation to mock-transport.js

Author: noisysocks

special-pages/pages/onboarding/app/components/v3/data.js

@@ -239,19 +239,3 @@ export const stepDefinitions = {
         rows: ['bookmarks', 'session-restore', 'home-shortcut'],
     },
 };
-
-export const stepDefinitionsAdBlocking = {
-    systemSettings: {
-        id: 'systemSettings',
-        kind: 'settings',
-        rows: ['dock', 'ad-blocking', 'import'],
-    },
-};
-
-export const stepDefinitionsYouTubeAdBlocking = {
-    systemSettings: {
-        id: 'systemSettings',
-        kind: 'settings',
-        rows: ['dock', 'youtube-ad-blocking', 'import'],
-    },
-};

special-pages/pages/onboarding/app/index.js

@@ -13,6 +13,7 @@ import { callWithRetry } from '../../../shared/call-with-retry';
 import { TranslationProvider } from '../../../shared/components/TranslationsProvider';
 import { SettingsProvider } from './components/SettingsProvider';
 import enStrings from '../public/locales/en/onboarding.json';
+import { stepDefinitions as stepDefinitionsV3 } from './components/v3/data';
 import { mockTransport } from '../src/mock-transport.js';
 
 const baseEnvironment = new Environment().withInjectName(document.documentElement.dataset.platform).withEnv(import.meta.env);
@@ -64,9 +65,8 @@ async function init() {
         .withPlatformName(baseEnvironment.injectName)
         .withPlatformName(init.platform?.name)
         .withPlatformName(baseEnvironment.urlParams.get('platform'))
-        .withNamedStepDefinitions(init.order)
+        .withStepDefinitions(init.order === 'v3' ? stepDefinitionsV3 : null)
         .withStepDefinitions(init.stepDefinitions)
-        .withNamedStepDefinitions(environment.urlParams.get('steps'))
         .withNamedOrder(init.order)
         .withNamedOrder(environment.urlParams.get('order'))
         .withExcludedScreens(init.exclude)

special-pages/pages/onboarding/app/settings.js

@@ -1,6 +1,5 @@
 import { ALT_ORDER, DEFAULT_ORDER, EVERY_PAGE_ID, ORDER_V3 } from './types';
 import { stepDefinitions as defaultStepDefinitions } from './data';
-import { stepDefinitions as stepDefinitionsV3, stepDefinitionsAdBlocking, stepDefinitionsYouTubeAdBlocking } from './components/v3/data';
 
 /**
  * Settings that affect the Application, such as running order
@@ -149,17 +148,4 @@ export class Settings {
             stepDefinitions: nextSteps,
         });
     }
-
-    /**
-     * @param {string|null|undefined} named
-     * @returns {Settings}
-     */
-    withNamedStepDefinitions(named) {
-        if (!named) return this;
-        if (named === 'v3') return this.withStepDefinitions(stepDefinitionsV3);
-        if (named === 'adBlocking') return this.withStepDefinitions(stepDefinitionsAdBlocking);
-        if (named === 'youTubeAdBlocking') return this.withStepDefinitions(stepDefinitionsYouTubeAdBlocking);
-        console.warn('ignoring named step definitions:', named);
-        return this;
-    }
 }

special-pages/pages/onboarding/src/mock-transport.js

@@ -4,6 +4,8 @@ import { TestTransportConfig } from '@duckduckgo/messaging';
  * @typedef {import('../../release-notes/types/release-notes.ts').UpdateMessage} UpdateMessage
  */
 
+const url = new URL(window.location.href);
+
 export function mockTransport() {
     return new TestTransportConfig({
         notify(_msg) {
@@ -20,8 +22,19 @@ export function mockTransport() {
             const msg = /** @type {any} */ (_msg);
             switch (msg.method) {
                 case 'init': {
+                    const stepDefinitions = {};
+
+                    const adBlocking = url.searchParams.get('adBlocking');
+                    if (adBlocking) {
+                        stepDefinitions.systemSettings = {
+                            id: 'systemSettings',
+                            kind: 'settings',
+                            rows: ['dock', adBlocking === 'youtube' ? 'youtube-ad-blocking' : 'ad-blocking', 'import'],
+                        };
+                    }
+
                     return Promise.resolve({
-                        stepDefinitions: {},
+                        stepDefinitions,
                         exclude: [],
                         order: 'v3',
                         locale: 'en',