Bug 1963764 - make sure Report Broken Site is still hidden appropriately when enterprise DisableFeedbackCommands policy is active (regressed by bug 1952334); r=Gijs

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

Author: wisniewskit

browser/components/reportbrokensite/ReportBrokenSite.sys.mjs

@@ -446,7 +446,7 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
 
   enableOrDisableMenuitems(selectedbrowser) {
     // Ensures that the various Report Broken Site menu items and
-    // toolbar buttons are disabled when appropriate.
+    // toolbar buttons are enabled/hidden when appropriate.
 
     const canReportUrl = this.canReportURI(selectedbrowser.currentURI);
 
@@ -455,6 +455,14 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
     // Altering the disabled attribute on the command does not propagate
     // the change to the related menuitems (see bug 805653), so we change them all.
     const cmd = document.getElementById("cmd_reportBrokenSite");
+    const allowedByPolicy = Services.policies.isAllowed(
+      "DisableFeedbackCommands"
+    );
+    if (allowedByPolicy) {
+      cmd.setAttribute("hidden", "false"); // see bug 805653
+    } else {
+      cmd.setAttribute("hidden", "true");
+    }
     const app = document.ownerGlobal.PanelMultiView.getViewNode(
       document,
       "appMenu-report-broken-site-button"
@@ -473,11 +481,12 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
       prot?.setAttribute("disabled", "true");
     }
 
-    // Changes to the "disabled" state of the command aren't reliably
+    // Changes to the "hidden" and "disabled" state of the command aren't reliably
     // reflected on the main menu unless we open it twice, or do it manually.
     // (See bug 1864953).
     const mainmenuItem = document.getElementById("help_reportBrokenSite");
     if (mainmenuItem) {
+      mainmenuItem.hidden = !allowedByPolicy;
       mainmenuItem.disabled = !canReportUrl;
     }
   }

browser/components/reportbrokensite/test/browser/browser_parent_menuitems.js

@@ -80,4 +80,17 @@ add_task(async function testMenus() {
       );
     }
   });
+
+  ensureReportBrokenSitePreffedOn();
+  ensureReportBrokenSiteDisabledByPolicy();
+
+  await BrowserTestUtils.withNewTab(REPORTABLE_PAGE_URL, async function () {
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemHidden(
+        reportBrokenSite,
+        `${menuDescription} option hidden when disabled by DisableFeedbackCommands enterprise policy`
+      );
+    }
+  });
 });

browser/components/reportbrokensite/test/browser/head.js

@@ -5,6 +5,11 @@ const { CustomizableUITestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/CustomizableUITestUtils.sys.mjs"
 );
 
+const { EnterprisePolicyTesting, PoliciesPrefTracker } =
+  ChromeUtils.importESModule(
+    "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
+  );
+
 const { UrlClassifierTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/UrlClassifierTestUtils.sys.mjs"
 );
@@ -146,6 +151,35 @@ function isSelectedTab(win, tab) {
   is(selectedTab, tab);
 }
 
+async function setupPolicyEngineWithJson(json, customSchema) {
+  PoliciesPrefTracker.restoreDefaultValues();
+  if (typeof json != "object") {
+    let filePath = getTestFilePath(json ? json : "non-existing-file.json");
+    return EnterprisePolicyTesting.setupPolicyEngineWithJson(
+      filePath,
+      customSchema
+    );
+  }
+  return EnterprisePolicyTesting.setupPolicyEngineWithJson(json, customSchema);
+}
+
+async function ensureReportBrokenSiteDisabledByPolicy() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      DisableFeedbackCommands: true,
+    },
+  });
+}
+
+registerCleanupFunction(async function resetPolicies() {
+  if (Services.policies.status != Ci.nsIEnterprisePolicies.INACTIVE) {
+    await setupPolicyEngineWithJson("");
+  }
+  EnterprisePolicyTesting.resetRunOnceState();
+  PoliciesPrefTracker.restoreDefaultValues();
+  PoliciesPrefTracker.stop();
+});
+
 function ensureReportBrokenSitePreffedOn() {
   Services.prefs.setBoolPref(PREFS.DATAREPORTING_ENABLED, true);
   Services.prefs.setBoolPref(PREFS.REPORTER_ENABLED, true);