[mv3] Show all dynamic/session rules in Develop pane

gorhill · gorhill · commit c1cadb35d95e · 2026-06-01T10:58:18.000-04:00
The editor is read-only, thus no need to filter out user rules or
rules meant for no-filtering sites.
diff --git a/platform/mv3/extension/js/background.js b/platform/mv3/extension/js/background.js
@@ -84,8 +84,6 @@ import {
     enableRulesets,
     excludeFromStrictBlock,
     getDefaultRulesetsFromEnv,
-    getEffectiveDynamicRules,
-    getEffectiveSessionRules,
     getEffectiveUserRules,
     getEnabledRulesetsDetails,
     getRulesetDetails,
@@ -520,11 +518,11 @@ async function onMessage(request, sender) {
         });
         return;
 
-    case 'getEffectiveDynamicRules':
-        return getEffectiveDynamicRules();
+    case 'getAllDynamicRules':
+        return dnr.getDynamicRules();
 
-    case 'getEffectiveSessionRules':
-        return getEffectiveSessionRules();
+    case 'getAllSessionRules':
+        return dnr.getSessionRules();
 
     case 'getEffectiveUserRules':
         return getEffectiveUserRules();
diff --git a/platform/mv3/extension/js/ro-dnr-editor.js b/platform/mv3/extension/js/ro-dnr-editor.js
@@ -30,14 +30,14 @@ import { textFromRules } from './dnr-parser.js';
 export class ReadOnlyDNREditor extends DNREditor {
     async getText(hint) {
         if ( hint === 'dnr.ro.dynamic' ) {
-            const rules = await sendMessage({ what: 'getEffectiveDynamicRules' });
+            const rules = await sendMessage({ what: 'getAllDynamicRules' });
             if ( Array.isArray(rules) === false ) { return; }
             this.id = 'dynamic';
             this.count = rules.length;
             return textFromRules(rules, { keepId: true });
         }
         if ( hint === 'dnr.ro.session' ) {
-            const rules = await sendMessage({ what: 'getEffectiveSessionRules' });
+            const rules = await sendMessage({ what: 'getAllSessionRules' });
             if ( Array.isArray(rules) === false ) { return; }
             this.id = 'session';
             this.count = rules.length;
diff --git a/platform/mv3/extension/js/ruleset-manager.js b/platform/mv3/extension/js/ruleset-manager.js
@@ -227,18 +227,6 @@ async function updateDynamicRules() {
 
 /******************************************************************************/
 
-async function getEffectiveDynamicRules() {
-    const allRules = await dnr.getDynamicRules();
-    const dynamicRules = [];
-    for ( const rule of allRules ) {
-        if ( rule.id >= USER_RULES_BASE_RULE_ID ) { continue; }
-        dynamicRules.push(rule);
-    }
-    return dynamicRules;
-}
-
-/******************************************************************************/
-
 async function updateStrictBlockRules(currentRules, addRules, removeRuleIds) {
     // Remove existing strictblock-related rules
     for ( const rule of currentRules ) {
@@ -391,18 +379,6 @@ async function clearSessionRules() {
 
 /******************************************************************************/
 
-async function getEffectiveSessionRules() {
-    const allRules = await dnr.getSessionRules();
-    const sessionRules = [];
-    for ( const rule of allRules ) {
-        if ( rule.id >= USER_RULES_BASE_RULE_ID ) { continue; }
-        sessionRules.push(rule);
-    }
-    return sessionRules;
-}
-
-/******************************************************************************/
-
 async function filteringModesToDNR(modes) {
     const noneHostnames = new Set([ ...modes.none ]);
     const notNoneHostnames = new Set([ ...modes.basic, ...modes.optimal, ...modes.complete ]);
@@ -716,8 +692,6 @@ export {
     enableRulesets,
     excludeFromStrictBlock,
     filteringModesToDNR,
-    getEffectiveDynamicRules,
-    getEffectiveSessionRules,
     getEffectiveUserRules,
     getEnabledRulesetsDetails,
     getRulesetDetails,
