Issue 6432 - Hide remove button for additional filter lists

js/desktop-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* globals checkShareResource, getDocLink, i18nFormatDateTime, openSharePopup,
            setLinks, E */
 
 "use strict";
 
 let subscriptionsMap = Object.create(null);
 let filtersMap = Object.create(null);
 let collections = Object.create(null);
 let acceptableAdsUrl = null;
 let acceptableAdsPrivacyUrl = null;
 let isCustomFiltersLoaded = false;
+let additionalSubscriptions = [];
 let {getMessage} = browser.i18n;
 let {setElementText} = ext.i18n;
 let customFilters = [];
 let filterErrors = new Map([
   ["synchronize_invalid_url",
    "options_filterList_lastDownload_invalidURL"],
   ["synchronize_connection_error",
    "options_filterList_lastDownload_connectionError"],
   ["synchronize_invalid_data",
    "options_filterList_lastDownload_invalidData"],
@@ skipping 194 matching lines @@
     if (this.details[i].searchable)
       element.setAttribute("data-search", title.toLowerCase());
     let controls = element.querySelectorAll(".control[role='checkbox']");
     for (let control of controls)
     {
       control.setAttribute("aria-checked", item.disabled == false);
       if (isAcceptableAds(item.url) && this == collections.filterLists)
       {
         control.disabled = true;
       }
-      else if (this == collections.filterLists)
-      {
-        // List preinstalled by administrators
-        getPref("additional_subscriptions", (additionalSubscriptions) =>
-        {
-          if (additionalSubscriptions.includes(item.url))
-            element.classList.add("non-removable");
-        });
-      }
+    }
+    if (additionalSubscriptions.includes(item.url))
+    {
+      element.classList.add("preconfigured");
+      let disablePreconfigures =
+        element.querySelectorAll("[data-disable~='preconfigured']");
+      for (let disablePreconfigure of disablePreconfigures)
+        disablePreconfigure.disabled = true;
     }
 
     let lastUpdateElement = element.querySelector(".last-update");
     if (lastUpdateElement)
     {
       let message = element.querySelector(".message");
       if (item.isDownloading)
       {
         let text = getMessage("options_filterList_lastDownload_inProgress");
         message.textContent = text;
@@ skipping 210 matching lines @@
 
   filtersMap[filter.text] = filter;
 }
 
 function loadCustomFilters(filters)
 {
   for (let filter of filters)
     updateFilter(filter);
 
   setCustomFiltersView("read");
-  isCustomFiltersLoaded = true;
 }
 
 function removeCustomFilter(text)
 {
   let index = customFilters.indexOf(text);
   if (index >= 0)
     customFilters.splice(index, 1);
 
   updateCustomFiltersUi();
 }
@@ skipping 658 matching lines @@
   for (let property in collections)
     collections[property].clearAll();
 
   setCustomFiltersView("empty");
   browser.runtime.sendMessage({
     type: "subscriptions.get",
     special: true
   },
   (subscriptions) =>
   {
-    // Load filters
-    for (let subscription of subscriptions)
-    {
-      browser.runtime.sendMessage({
-        type: "filters.get",
-        subscriptionUrl: subscription.url
-      },
-      (filters) =>
-      {
-        loadCustomFilters(filters);
-      });
-    }
+    let customFilterPromises = subscriptions.map(getSubscriptionFilters);
+    Promise.all(customFilterPromises).then((filters) =>
+    {
+      loadCustomFilters([].concat(...filters));
+      isCustomFiltersLoaded = true;
+    });
   });
   loadRecommendations();
   browser.runtime.sendMessage({
     type: "prefs.get",
     key: "subscriptions_exceptionsurl"
   },
   (url) =>
   {
     acceptableAdsUrl = url;
 
     browser.runtime.sendMessage({
       type: "prefs.get",
       key: "subscriptions_exceptionsurl_privacy"
     },
     (urlPrivacy) =>
     {
       acceptableAdsPrivacyUrl = urlPrivacy;
 
-      // Load user subscriptions
-      browser.runtime.sendMessage({
-        type: "subscriptions.get",
-        downloadable: true
-      },
-      (subscriptions) =>
-      {
-        for (let subscription of subscriptions)
-          onSubscriptionMessage("added", subscription);
-
-        setAcceptableAds();
+      getPref("additional_subscriptions", (subscriptionUrls) =>
+      {
+        additionalSubscriptions = subscriptionUrls;
+
+        // Load user subscriptions
+        browser.runtime.sendMessage({
+          type: "subscriptions.get",
+          downloadable: true
+        },
+        (subscriptions) =>
+        {
+          for (let subscription of subscriptions)
+            onSubscriptionMessage("added", subscription);
+
+          setAcceptableAds();
+        });
       });
     });
   });
 }
 
 function addWhitelistedDomain()
 {
   let domain = E("whitelisting-textbox");
   for (let whitelistItem of collections.whitelist.items)
   {
@@ skipping 125 matching lines @@
         else
         {
           collections.more.removeItem(subscription);
         }
       }
 
       collections.filterLists.removeItem(subscription);
       setPrivacyConflict();
       break;
   }
+}
+
+function getSubscriptionFilters(subscription)
+{
+  return browser.runtime.sendMessage({
+    type: "filters.get",
+    subscriptionUrl: subscription.url});
 }
 
 function hidePref(key, value)
 {
   let element = document.querySelector("[data-pref='" + key + "']");
   if (element)
     element.setAttribute("aria-hidden", value);
 }
 
 function getPref(key, callback)
@@ skipping 119 matching lines @@
            "ui_warn_tracking"]
 });
 browser.runtime.sendMessage({
   type: "subscriptions.listen",
   filter: ["added", "disabled", "homepage", "lastDownload", "removed",
            "title", "downloadStatus", "downloading"]
 });
 
 window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 window.addEventListener("hashchange", onHashChange, false);