Bug 2048048 - Fix policy issues with new tab preferences. a=pascalc

Original Revision: https://phabricator.services.mozilla.com/D307332

Differential Revision: https://phabricator.services.mozilla.com/D309878

Author: mkaply

browser/components/enterprisepolicies/Policies.sys.mjs

@@ -1742,6 +1742,13 @@ export var Policies = {
           param.Weather,
           param.Locked
         );
+        // The Nova layout (enabled by default) binds the weather toggle to a
+        // different pref, so set it too.
+        PoliciesUtils.setDefaultPref(
+          "browser.newtabpage.activity-stream.widgets.weather.enabled",
+          param.Weather,
+          param.Locked
+        );
       }
       if ("TopSites" in param) {
         PoliciesUtils.setDefaultPref(
@@ -1765,23 +1772,13 @@ export var Policies = {
         );
       }
       if ("Pocket" in param) {
-        PoliciesUtils.setDefaultPref(
-          "browser.newtabpage.activity-stream.feeds.system.topstories",
-          param.Pocket,
-          param.Locked
-        );
         PoliciesUtils.setDefaultPref(
           "browser.newtabpage.activity-stream.feeds.section.topstories",
           param.Pocket,
           param.Locked
         );
       }
       if ("Stories" in param) {
-        PoliciesUtils.setDefaultPref(
-          "browser.newtabpage.activity-stream.feeds.system.topstories",
-          param.Stories,
-          param.Locked
-        );
         PoliciesUtils.setDefaultPref(
           "browser.newtabpage.activity-stream.feeds.section.topstories",
           param.Stories,
@@ -1802,6 +1799,20 @@ export var Policies = {
           param.Locked
         );
       }
+      // The "Support Firefox" toggle in the settings UI is a parent control for
+      // the two sponsored child settings. When both are locked by policy, lock
+      // it to their combined value so it can't be toggled to no effect.
+      if (
+        param.Locked &&
+        "SponsoredTopSites" in param &&
+        "SponsoredStories" in param
+      ) {
+        PoliciesUtils.setDefaultPref(
+          "browser.newtabpage.activity-stream.showSponsoredCheckboxes",
+          param.SponsoredTopSites || param.SponsoredStories,
+          param.Locked
+        );
+      }
     },
   },
 

browser/components/enterprisepolicies/tests/browser/browser_policy_firefoxhome.js

@@ -193,3 +193,44 @@ add_task(async function test_firefoxhome_preferences_set() {
   });
   await SpecialPowers.popPrefEnv();
 });
+
+add_task(async function test_firefoxhome_support_firefox_sponsored_locked() {
+  // The supportFirefox setting only exists in the Settings Redesign UI.
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.settings-redesign.enabled", true]],
+  });
+
+  await setupPolicyEngineWithJson({
+    policies: {
+      FirefoxHome: {
+        SponsoredTopSites: false,
+        SponsoredStories: false,
+        Locked: true,
+      },
+    },
+  });
+
+  await BrowserTestUtils.withNewTab("about:preferences#home", async browser => {
+    let doc = browser.contentDocument;
+    let control = await TestUtils.waitForCondition(() =>
+      doc.getElementById("setting-control-supportFirefox")
+    );
+    await control.updateComplete;
+    let toggle = control.querySelector("moz-toggle");
+    ok(
+      toggle.disabled,
+      "Support Firefox toggle is disabled when both sponsored prefs are locked"
+    );
+    ok(
+      !toggle.pressed,
+      "Support Firefox toggle is off when both sponsored prefs are locked off"
+    );
+  });
+
+  await setupPolicyEngineWithJson({
+    policies: {
+      FirefoxHome: {},
+    },
+  });
+  await SpecialPowers.popPrefEnv();
+});

browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js

@@ -631,12 +631,40 @@ const POLICIES_TESTS = [
       },
     },
     lockedPrefs: {
-      "browser.newtabpage.activity-stream.feeds.system.topstories": false,
       "browser.newtabpage.activity-stream.feeds.section.topstories": false,
       "browser.newtabpage.activity-stream.showSponsored": false,
     },
   },
 
+  // POLICY: FirefoxHome (Weather sets both the legacy and Nova prefs)
+  {
+    policies: {
+      FirefoxHome: {
+        Weather: false,
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "browser.newtabpage.activity-stream.showWeather": false,
+      "browser.newtabpage.activity-stream.widgets.weather.enabled": false,
+    },
+  },
+
+  // POLICY: FirefoxHome (locking both sponsored settings locks the parent
+  // "Support Firefox" toggle to their combined value)
+  {
+    policies: {
+      FirefoxHome: {
+        SponsoredTopSites: false,
+        SponsoredStories: false,
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "browser.newtabpage.activity-stream.showSponsoredCheckboxes": false,
+    },
+  },
+
   // POLICY: OfferToSaveLoginsDefault
   {
     policies: {