better handling of global

Author: shakyShane

special-pages/pages/new-tab/app/omnibar/components/PersistentOmnibarValuesProvider.js

@@ -101,13 +101,18 @@ export function useModeWithLocalPersistence(tabId, defaultMode) {
     useEffect(() => {
         if (!service) return;
         return service.onConfig((v) => {
-            if (tabId && v.source === 'manual') {
-                if (v.data.enableAi === false) {
-                    values?.updateAll({ value: 'search' });
-                } else {
-                    values?.update({ id: tabId, value: v.data.mode });
-                }
+            if (!tabId) return;
+
+            // when manually updated + enableAi === 'true', allow this tab to be recorded
+            if (v.source === 'manual') {
+                values?.update({ id: tabId, value: v.data.mode });
+            }
+
+            // when `enableAi` is false, we reset ALL tabs to 'search'
+            if (v.data.enableAi === false) {
+                values?.updateAll({ value: 'search' });
             }
+
             setState(v.data.mode);
         });
     }, [service, tabId, values, defaultMode]);

special-pages/pages/new-tab/app/omnibar/integration-tests/omnibar.page.js

@@ -187,7 +187,18 @@ export class OmnibarPage {
      */
     async didSwitchToTab(tabId, tabIds) {
         await test.step(`simulate tab change event, to: ${tabId} `, async () => {
-            await this.ntp.mocks.simulateSubscriptionMessage(sub('tabs_onDataUpdate'), tabs({ tabId, tabIds }));
+            const event = sub('tabs_onDataUpdate').payload({ tabId, tabIds });
+            await this.ntp.mocks.simulateSubscriptionEvent(event);
+        });
+    }
+
+    /**
+     * @returns {Promise<void>}
+     */
+    async didDisableGlobally() {
+        const event = sub('omnibar_onConfigUpdate').payload({ mode: 'search', enableAi: false, showAiSetting: false });
+        await test.step(`simulates global disabled (eg: settings): ${JSON.stringify(event.name)} ${JSON.stringify(event.payload)} `, async () => {
+            await this.ntp.mocks.simulateSubscriptionEvent(event);
         });
     }
 
@@ -218,6 +229,7 @@ export class OmnibarPage {
                 return await expect(this.chatInput()).toHaveValue(value);
             }
             case 'search': {
+                await this.searchInput().waitFor({ timeout: 1000 });
                 return await expect(this.searchInput()).toHaveValue(value);
             }
         }
@@ -242,15 +254,14 @@ export class OmnibarPage {
 }
 
 /**
- * @param {import("../../../types/new-tab.js").NewTabMessages["subscriptions"]["subscriptionEvent"]} name
+ * @template {import("../../../types/new-tab.js").NewTabMessages["subscriptions"]["subscriptionEvent"]} SubName
+ * @param {SubName} name
+ * @return {{payload: (payload: Extract<import("../../../types/new-tab.js").NewTabMessages["subscriptions"], {subscriptionEvent: SubName}>['params']) => {name: string, payload: any}}}
  */
 function sub(name) {
-    return name;
-}
-
-/**
- * @param {import("../../../types/new-tab.js").Tabs} t
- */
-function tabs(t) {
-    return t;
+    return {
+        payload: (payload) => {
+            return { name, payload };
+        },
+    };
 }

special-pages/pages/new-tab/app/omnibar/integration-tests/omnibar.persistence.spec.js

@@ -73,4 +73,26 @@ test.describe('omnibar widget persistence', () => {
         await omnibar.didSwitchToTab('01', ['01', '02']);
         await omnibar.expectValue({ value: '', mode: 'search' });
     });
+    test('adjusts mode of other tabs when duck.ai is globally disabled', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        const omnibar = new OmnibarPage(ntp);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { omnibar: true, tabs: true, 'tabs.debug': true } });
+        await omnibar.ready();
+
+        // first tab, switch to ai mode
+        await omnibar.switchMode({ mode: 'ai' });
+
+        // switch to second tab, should be empty but still on duck.ai
+        await omnibar.didSwitchToTab('02', ['01', '02']);
+        await omnibar.expectValue({ value: '', mode: 'ai' });
+
+        // disable globally
+        await omnibar.didDisableGlobally();
+        await omnibar.expectValue({ value: '', mode: 'search' });
+
+        // back to first tab, should now also be search
+        await omnibar.didSwitchToTab('01', ['01', '02']);
+        await omnibar.expectValue({ value: '', mode: 'search' });
+    });
 });

special-pages/shared/mocks.js

@@ -92,6 +92,20 @@ export class Mocks {
         });
     }
 
+    /**
+     * @param {object} props
+     * @param {string} props.name
+     * @param {Record<string, any>} props.payload
+     */
+    async simulateSubscriptionEvent(props) {
+        await this.page.evaluate(simulateSubscriptionMessage, {
+            messagingContext: this.messagingContext,
+            name: props.name,
+            payload: props.payload,
+            injectName: this.build.name,
+        });
+    }
+
     /**
      * @param {{names: string[]}} [opts]
      * @returns {Promise<any[]>}