chrome-devtools-frontend 1.0.1582745 → 1.0.1585538

package/front_end/panels/network/RequestConditionsDrawer.ts

@@ -10,7 +10,6 @@ import '../../ui/components/tooltips/tooltips.js';
 import type * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
-import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Logs from '../../models/logs/logs.js';
 import * as Buttons from '../../ui/components/buttons/buttons.js';
@@ -28,34 +27,18 @@ const {ref, live} = Directives;
 const {widgetConfig} = UI.Widget;
 
 const UIStrings = {
-  /**
-   * @description Text to enable blocking of network requests
-   */
-  enableNetworkRequestBlocking: 'Enable network request blocking',
   /**
    * @description Text to enable blocking of network requests
    */
   enableBlockingAndThrottling: 'Enable blocking and throttling',
-  /**
-   * @description Tooltip text that appears when hovering over the plus button in the Blocked URLs Pane of the Network panel
-   */
-  addPattern: 'Add pattern',
   /**
    * @description Tooltip text that appears when hovering over the plus button in the Blocked URLs Pane of the Network panel
    */
   addRule: 'Add rule',
-  /**
-   * @description Accessible label for the button to add request blocking patterns in the network request blocking tool
-   */
-  addNetworkRequestBlockingPattern: 'Add network request blocking pattern',
   /**
    * @description Accessible label for the button to add request blocking patterns in the network request blocking tool
    */
   addPatternLabel: 'Add network request throttling or blocking pattern',
-  /**
-   * @description Text that shows in the network request blocking panel if no pattern has yet been added.
-   */
-  noNetworkRequestsBlocked: 'No blocked network requests',
   /**
    * @description Text that shows in the network request blocking panel if no pattern has yet been added.
    */
@@ -66,25 +49,11 @@ const UIStrings = {
    */
   noThrottlingOrBlockingPattern:
       `To throttle or block a network request, add a rule here manually or via the network panel's context menu. {PH1}`,
-  /**
-   * @description Text that shows  in the network request blocking panel if no pattern has yet been added.
-   * @example {Add pattern} PH1
-   */
-  addPatternToBlock: 'Add a pattern by clicking on the "{PH1}" button.',
-  /**
-   * @description Text in Blocked URLs Pane of the Network panel
-   * @example {4} PH1
-   */
-  dBlocked: '{PH1} blocked',
   /**
    * @description Text in Blocked URLs Pane of the Network panel
    * @example {4} PH1
    */
   dAffected: '{PH1} affected',
-  /**
-   * @description Text in Blocked URLs Pane of the Network panel
-   */
-  textPatternToBlockMatching: 'Text pattern to block matching requests; use * for wildcard',
   /**
    * @description Text in Blocked URLs Pane of the Network panel
    */
@@ -178,7 +147,6 @@ interface ViewInput {
 }
 type View = (input: ViewInput, output: object, target: HTMLElement) => void;
 export const DEFAULT_VIEW: View = (input, output, target) => {
-  const individualThrottlingEnabled = Boolean(Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled);
   render(
       // clang-format off
     html`
@@ -187,31 +155,24 @@ export const DEFAULT_VIEW: View = (input, output, target) => {
         ?checked=${input.enabled}
         @click=${input.toggleEnabled}
         .jslogContext=${'network.enable-request-blocking'}>
-        ${individualThrottlingEnabled ? i18nString(UIStrings.enableBlockingAndThrottling)
-                                      : i18nString(UIStrings.enableNetworkRequestBlocking)}
+        ${i18nString(UIStrings.enableBlockingAndThrottling)}
       </devtools-checkbox>
       <div class="toolbar-divider"></div>
       <devtools-button ${bindToAction('network.add-network-request-blocking-pattern')}></devtools-button>
       <devtools-button ${bindToAction('network.remove-all-network-request-blocking-patterns')}></devtools-button>
     </devtools-toolbar>
     <div class=empty-state ${ref(e => input.list.setEmptyPlaceholder(e ?? null))}>
-      <span class=empty-state-header>${individualThrottlingEnabled
-                                       ? i18nString(UIStrings.noPattern)
-                                       : i18nString(UIStrings.noNetworkRequestsBlocked)}</span>
+      <span class=empty-state-header>${i18nString(UIStrings.noPattern)}</span>
       <div class=empty-state-description>
-        ${individualThrottlingEnabled
-        ? uiI18n.getFormatLocalizedStringTemplate(str_, UIStrings.noThrottlingOrBlockingPattern, {PH1: learnMore()})
-        : html`<span>${i18nString(UIStrings.addPatternToBlock,
-                                  {PH1: i18nString(UIStrings.addPattern)})}</span>${learnMore()}`}
+        ${uiI18n.getFormatLocalizedStringTemplate(str_, UIStrings.noThrottlingOrBlockingPattern, {PH1: learnMore()})}
       </div>
       <devtools-button
         @click=${input.addPattern}
         class=add-button
         .jslogContext=${'network.add-network-request-blocking-pattern'}
-        title=${individualThrottlingEnabled ? i18nString(UIStrings.addPatternLabel)
-                                                 : i18nString(UIStrings.addNetworkRequestBlockingPattern)}
+        title=${i18nString(UIStrings.addPatternLabel)}
         .variant=${Buttons.Button.Variant.TONAL}>
-          ${individualThrottlingEnabled ? i18nString(UIStrings.addRule) : i18nString(UIStrings.addPattern)}
+          ${i18nString(UIStrings.addRule)}
       </devtools-button>
     </div>
     <devtools-widget .widgetConfig=${UI.Widget.widgetConfig(UI.Widget.VBox)}>
@@ -222,79 +183,154 @@ export const DEFAULT_VIEW: View = (input, output, target) => {
       target);
 };
 
+function renderItem(
+    condition: SDK.NetworkManager.RequestCondition, editable: boolean, index: number,
+    onToggle: (condition: SDK.NetworkManager.RequestCondition) => void,
+    onConditionsChanged: (
+        condition: SDK.NetworkManager.RequestCondition, conditions: SDK.NetworkManager.ThrottlingConditions) => void,
+    onIncreasePriority: (condition: SDK.NetworkManager.RequestCondition) => void,
+    onDecreasePriority: (condition: SDK.NetworkManager.RequestCondition) => void,
+    lookUpRequestCount: (condition: SDK.NetworkManager.RequestCondition) => number): LitTemplate {
+  const {enabled, originalOrUpgradedURLPattern, constructorStringOrWildcardURL, wildcardURL} = condition;
+  const toggle = (e: Event): void => {
+    e.consume(true);
+    onToggle(condition);
+  };
+
+  const moveUp = (e: Event): void => {
+    e.consume(true);
+    onIncreasePriority(condition);
+  };
+
+  const moveDown = (e: Event): void => {
+    e.consume(true);
+    onDecreasePriority(condition);
+  };
+
+  // clang-format off
+  return html`
+    <input class=blocked-url-checkbox
+      @change=${toggle}
+      type=checkbox
+      title=${i18nString(UIStrings.enableThrottlingToggleLabel, {PH1: constructorStringOrWildcardURL})}
+      .checked=${live(enabled)}
+      .disabled=${!editable || !originalOrUpgradedURLPattern}
+      jslog=${VisualLogging.toggle().track({ change: true })}>
+    <devtools-button
+      .iconName=${'arrow-up'}
+      .variant=${Buttons.Button.Variant.ICON}
+      .title=${i18nString(UIStrings.increasePriority, {PH1: constructorStringOrWildcardURL})}
+      .jslogContext=${'decrease-priority'}
+      ?disabled=${!editable || !originalOrUpgradedURLPattern}
+      @click=${moveUp}>
+    </devtools-button>
+    <devtools-button
+      .iconName=${'arrow-down'}
+      .variant=${Buttons.Button.Variant.ICON}
+      .title=${i18nString(UIStrings.decreasePriority, {PH1: constructorStringOrWildcardURL})}
+      .jslogContext=${'increase-priority'}
+      ?disabled=${!editable || !originalOrUpgradedURLPattern}
+      @click=${moveDown}></devtools-button>
+    ${originalOrUpgradedURLPattern ? html`
+      <devtools-tooltip variant=rich jslogcontext=url-pattern id=url-pattern-${index}>
+        <div>hash: ${originalOrUpgradedURLPattern.hash}</div>
+        <div>hostname: ${originalOrUpgradedURLPattern.hostname}</div>
+        <div>password: ${originalOrUpgradedURLPattern.password}</div>
+        <div>pathname: ${originalOrUpgradedURLPattern.pathname}</div>
+        <div>port: ${originalOrUpgradedURLPattern.port}</div>
+        <div>protocol: ${originalOrUpgradedURLPattern.protocol}</div>
+        <div>search: ${originalOrUpgradedURLPattern.search}</div>
+        <div>username: ${originalOrUpgradedURLPattern.username}</div>
+        <hr />
+        ${learnMore()}
+      </devtools-tooltip>` : nothing}
+    ${wildcardURL ? html`
+      <devtools-icon name=warning-filled class="small warning" aria-details=url-pattern-warning-${index}>
+      </devtools-icon>
+      <devtools-tooltip variant=rich jslogcontext=url-pattern-warning id=url-pattern-warning-${index}>
+        ${i18nString(UIStrings.patternWasUpgraded, {PH1: wildcardURL})}
+      </devtools-tooltip>
+      `: nothing}
+    ${!originalOrUpgradedURLPattern ? html`
+      <devtools-icon name=cross-circle-filled class=small aria-details=url-pattern-error-${index}>
+      </devtools-icon>
+      <devtools-tooltip variant=rich jslogcontext=url-pattern-warning id=url-pattern-error-${index}>
+        ${SDK.NetworkManager.RequestURLPattern.isValidPattern(constructorStringOrWildcardURL) ===
+            SDK.NetworkManager.RequestURLPatternValidity.HAS_REGEXP_GROUPS
+            ? i18nString(UIStrings.patternFailedWithRegExpGroups)
+            : i18nString(UIStrings.patternFailedToParse)}
+        ${learnMore()}
+      </devtools-tooltip>`: nothing}
+    <div
+      @click=${toggle}
+      ?disabled=${!editable || !originalOrUpgradedURLPattern}
+      class=blocked-url-label
+      aria-details=url-pattern-${index}>
+        ${constructorStringOrWildcardURL}
+    </div>
+    <devtools-widget
+       class=conditions-selector
+       title=${i18nString(UIStrings.requestConditionsLabel)}
+       .widgetConfig=${UI.Widget.widgetConfig(
+         MobileThrottling.NetworkThrottlingSelector.NetworkThrottlingSelectorWidget, {
+           variant:
+             MobileThrottling.NetworkThrottlingSelector.NetworkThrottlingSelect.Variant.INDIVIDUAL_REQUEST_CONDITIONS,
+           jslogContext: 'request-conditions',
+           disabled: !editable,
+           onConditionsChanged: conditions => onConditionsChanged(condition, conditions),
+           currentConditions: condition.conditions,
+         })}></devtools-widget>
+    <devtools-widget
+      ?disabled=${!editable || !originalOrUpgradedURLPattern}
+      .widgetConfig=${widgetConfig(AffectedCountWidget, {condition, lookUpRequestCount})}></devtools-widget>`;
+  // clang-format on
+}
+
 interface AffectedCountViewInput {
   count: number;
 }
 type AffectedCountView = (input: AffectedCountViewInput, output: object, target: HTMLElement) => void;
 export const AFFECTED_COUNT_DEFAULT_VIEW: AffectedCountView = (input, output, target) => {
-  if (Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled) {
-    render(html`${i18nString(UIStrings.dAffected, {PH1: input.count})}`, target);
-  } else {
-    render(html`${i18nString(UIStrings.dBlocked, {PH1: input.count})}`, target);
-  }
+  render(html`${i18nString(UIStrings.dAffected, {PH1: input.count})}`, target);
 };
 
 function matchesUrl(conditions: SDK.NetworkManager.RequestCondition, url: string): boolean {
-  function matchesPattern(pattern: string, url: string): boolean {
-    let pos = 0;
-    const parts = pattern.split('*');
-    for (let index = 0; index < parts.length; index++) {
-      const part = parts[index];
-      if (!part.length) {
-        continue;
-      }
-      pos = url.indexOf(part, pos);
-      if (pos === -1) {
-        return false;
-      }
-      pos += part.length;
-    }
-    return true;
-  }
-
-  return Boolean(
-      Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled ?
-          conditions.originalOrUpgradedURLPattern?.test(url) :
-          (conditions.wildcardURL && matchesPattern(conditions.wildcardURL, url)));
+  return Boolean(conditions.originalOrUpgradedURLPattern?.test(url));
 }
 
 export class AffectedCountWidget extends UI.Widget.Widget {
   readonly #view: AffectedCountView;
   #condition?: SDK.NetworkManager.RequestCondition;
-  #drawer?: RequestConditionsDrawer;
+  #lookUpRequestCount?: (condition: SDK.NetworkManager.RequestCondition) => number;
+
   constructor(target?: HTMLElement, view = AFFECTED_COUNT_DEFAULT_VIEW) {
     super(target, {classes: ['blocked-url-count']});
     this.#view = view;
   }
 
-  get condition(): SDK.NetworkManager.RequestCondition|undefined {
-    return this.#condition;
+  get lookUpRequestCount(): ((condition: SDK.NetworkManager.RequestCondition) => number)|undefined {
+    return this.#lookUpRequestCount;
   }
 
-  set condition(conditions: SDK.NetworkManager.RequestCondition) {
-    this.#condition = conditions;
-    this.requestUpdate();
+  set lookUpRequestCount(val: (condition: SDK.NetworkManager.RequestCondition) => number) {
+    this.#lookUpRequestCount = val;
   }
 
-  get drawer(): RequestConditionsDrawer|undefined {
-    return this.#drawer;
+  get condition(): SDK.NetworkManager.RequestCondition|undefined {
+    return this.#condition;
   }
 
-  set drawer(drawer: RequestConditionsDrawer) {
-    this.#drawer = drawer;
+  set condition(conditions: SDK.NetworkManager.RequestCondition) {
+    this.#condition = conditions;
     this.requestUpdate();
   }
 
   override performUpdate(): void {
-    if (!this.#condition || !this.#drawer) {
+    if (!this.#condition || !this.#lookUpRequestCount) {
       return;
     }
 
-    const count = !Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled || this.#condition.isBlocking ?
-        this.#drawer.blockedRequestsCount(this.#condition) :
-        this.#drawer.throttledRequestsCount(this.#condition);
-
-    this.#view({count}, {}, this.element);
+    this.#view({count: this.#lookUpRequestCount(this.#condition)}, {}, this.element);
   }
 
   override wasShown(): void {
@@ -406,129 +442,39 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
 
   updateItem(element: HTMLElement, condition: SDK.NetworkManager.RequestCondition, editable: boolean, index: number):
       void {
-    const toggle = (e: Event): void => {
+    const onToggle = (condition: {enabled: boolean}): void => {
       if (editable) {
-        e.consume(true);
         condition.enabled = !condition.enabled;
       }
     };
-    const onConditionsChanged = (conditions: SDK.NetworkManager.ThrottlingConditions): void => {
-      if (editable) {
-        condition.conditions = conditions;
+
+    const onConditionsChanged =
+        (condition: {conditions: SDK.NetworkManager.ThrottlingConditions},
+         conditions: SDK.NetworkManager.ThrottlingConditions): void => {
+          if (editable) {
+            condition.conditions = conditions;
+          }
+        };
+
+    const onIncreasePriority = (condition: SDK.NetworkManager.RequestCondition): void => {
+      if (this.manager.requestConditions.conditionsEnabled) {
+        UI.ARIAUtils.LiveAnnouncer.status(i18nString(UIStrings.patternMovedUp));
+        this.manager.requestConditions.increasePriority(condition);
       }
     };
 
-    const {enabled, originalOrUpgradedURLPattern, constructorStringOrWildcardURL, wildcardURL} = condition;
+    const onDecreasePriority = (condition: SDK.NetworkManager.RequestCondition): void => {
+      if (this.manager.requestConditions.conditionsEnabled) {
+        UI.ARIAUtils.LiveAnnouncer.status(i18nString(UIStrings.patternMovedDown));
+        this.manager.requestConditions.decreasePriority(condition);
+      }
+    };
 
-    if (Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled) {
-      const moveUp = (e: Event): void => {
-        if (this.manager.requestConditions.conditionsEnabled) {
-          UI.ARIAUtils.LiveAnnouncer.status(i18nString(UIStrings.patternMovedUp));
-          e.consume(true);
-          this.manager.requestConditions.increasePriority(condition);
-        }
-      };
-      const moveDown = (e: Event): void => {
-        if (this.manager.requestConditions.conditionsEnabled) {
-          UI.ARIAUtils.LiveAnnouncer.status(i18nString(UIStrings.patternMovedDown));
-          e.consume(true);
-          this.manager.requestConditions.decreasePriority(condition);
-        }
-      };
-      render(
-          // clang-format off
-        html`
-    <input class=blocked-url-checkbox
-      @change=${toggle}
-      type=checkbox
-      title=${i18nString(UIStrings.enableThrottlingToggleLabel, {PH1: constructorStringOrWildcardURL})}
-      .checked=${live(enabled)}
-      .disabled=${!editable || !originalOrUpgradedURLPattern}
-      jslog=${VisualLogging.toggle().track({ change: true })}>
-    <devtools-button
-      .iconName=${'arrow-up'}
-      .variant=${Buttons.Button.Variant.ICON}
-      .title=${i18nString(UIStrings.increasePriority, {PH1: constructorStringOrWildcardURL})}
-      .jslogContext=${'decrease-priority'}
-      ?disabled=${!editable || !originalOrUpgradedURLPattern}
-      @click=${moveUp}>
-    </devtools-button>
-    <devtools-button
-      .iconName=${'arrow-down'}
-      .variant=${Buttons.Button.Variant.ICON}
-      .title=${i18nString(UIStrings.decreasePriority, {PH1: constructorStringOrWildcardURL})}
-      .jslogContext=${'increase-priority'}
-      ?disabled=${!editable || !originalOrUpgradedURLPattern}
-      @click=${moveDown}></devtools-button>
-    ${originalOrUpgradedURLPattern ? html`
-      <devtools-tooltip variant=rich jslogcontext=url-pattern id=url-pattern-${index}>
-        <div>hash: ${originalOrUpgradedURLPattern.hash}</div>
-        <div>hostname: ${originalOrUpgradedURLPattern.hostname}</div>
-        <div>password: ${originalOrUpgradedURLPattern.password}</div>
-        <div>pathname: ${originalOrUpgradedURLPattern.pathname}</div>
-        <div>port: ${originalOrUpgradedURLPattern.port}</div>
-        <div>protocol: ${originalOrUpgradedURLPattern.protocol}</div>
-        <div>search: ${originalOrUpgradedURLPattern.search}</div>
-        <div>username: ${originalOrUpgradedURLPattern.username}</div>
-        <hr />
-        ${learnMore()}
-      </devtools-tooltip>` : nothing}
-    ${wildcardURL ? html`
-      <devtools-icon name=warning-filled class="small warning" aria-details=url-pattern-warning-${index}>
-      </devtools-icon>
-      <devtools-tooltip variant=rich jslogcontext=url-pattern-warning id=url-pattern-warning-${index}>
-        ${i18nString(UIStrings.patternWasUpgraded, {PH1: wildcardURL})}
-      </devtools-tooltip>
-      `: nothing}
-    ${!originalOrUpgradedURLPattern ? html`
-      <devtools-icon name=cross-circle-filled class=small aria-details=url-pattern-error-${index}>
-      </devtools-icon>
-      <devtools-tooltip variant=rich jslogcontext=url-pattern-warning id=url-pattern-error-${index}>
-        ${SDK.NetworkManager.RequestURLPattern.isValidPattern(constructorStringOrWildcardURL) ===
-            SDK.NetworkManager.RequestURLPatternValidity.HAS_REGEXP_GROUPS
-            ? i18nString(UIStrings.patternFailedWithRegExpGroups)
-            : i18nString(UIStrings.patternFailedToParse)}
-        ${learnMore()}
-      </devtools-tooltip>`: nothing}
-    <div
-      @click=${toggle}
-      ?disabled=${!editable || !originalOrUpgradedURLPattern}
-      class=blocked-url-label
-      aria-details=url-pattern-${index}>
-        ${constructorStringOrWildcardURL}
-    </div>
-    <devtools-widget
-       class=conditions-selector
-       title=${i18nString(UIStrings.requestConditionsLabel)}
-       .widgetConfig=${UI.Widget.widgetConfig(
-         MobileThrottling.NetworkThrottlingSelector.NetworkThrottlingSelectorWidget, {
-           variant:
-             MobileThrottling.NetworkThrottlingSelector.NetworkThrottlingSelect.Variant.INDIVIDUAL_REQUEST_CONDITIONS,
-           jslogContext: 'request-conditions',
-           disabled: !editable,
-           onConditionsChanged,
-           currentConditions: condition.conditions,
-         })}></devtools-widget>
-    <devtools-widget
-      ?disabled=${!editable || !originalOrUpgradedURLPattern}
-      .widgetConfig=${widgetConfig(AffectedCountWidget, {condition, drawer: this})}></devtools-widget>`,
-          // clang-format on
-          element);
-    } else {
-      render(
-          // clang-format off
-        html`
-    <input class=blocked-url-checkbox
-      @change=${toggle}
-      type=checkbox
-      .checked=${condition.enabled}
-      .disabled=${!editable}
-      jslog=${VisualLogging.toggle().track({ change: true })}>
-    <div @click=${toggle} class=blocked-url-label>${wildcardURL}</div>
-    <devtools-widget .widgetConfig=${widgetConfig(AffectedCountWidget, {condition, drawer: this})}></devtools-widget>`,
-          // clang-format on
-          element);
-    }
+    render(
+        renderItem(
+            condition, editable, index, onToggle, onConditionsChanged, onIncreasePriority, onDecreasePriority,
+            this.#getRequestCount.bind(this)),
+        element);
   }
 
   private toggleEnabled(): void {
@@ -543,9 +489,7 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
 
   beginEdit(pattern: SDK.NetworkManager.RequestCondition): UI.ListWidget.Editor<SDK.NetworkManager.RequestCondition> {
     this.editor = this.createEditor();
-    this.editor.control('url').value = Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled ?
-        pattern.constructorStringOrWildcardURL :
-        pattern.wildcardURL ?? '';
+    this.editor.control('url').value = pattern.constructorStringOrWildcardURL;
     return this.editor;
   }
 
@@ -553,9 +497,7 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
       item: SDK.NetworkManager.RequestCondition, editor: UI.ListWidget.Editor<SDK.NetworkManager.RequestCondition>,
       isNew: boolean): void {
     const constructorString = editor.control('url').value as SDK.NetworkManager.URLPatternConstructorString;
-    const pattern = Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled ?
-        SDK.NetworkManager.RequestURLPattern.create(constructorString) :
-        constructorString;
+    const pattern = SDK.NetworkManager.RequestURLPattern.create(constructorString);
     if (!pattern) {
       throw new Error('Failed to parse pattern');
     }
@@ -574,14 +516,10 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
     const content = editor.contentElement();
     const titles = content.createChild('div', 'blocked-url-edit-row');
     const label = titles.createChild('label');
-    if (Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled) {
-      const learnMore = Link.create(PATTERN_API_DOCS_URL, i18nString(UIStrings.learnMore), undefined, 'learn-more');
-      learnMore.title = i18nString(UIStrings.learnMoreLabel);
-      titles.append('\xA0', learnMore);
-      label.textContent = i18nString(UIStrings.textEditPattern);
-    } else {
-      label.textContent = i18nString(UIStrings.textPatternToBlockMatching);
-    }
+    const learnMore = Link.create(PATTERN_API_DOCS_URL, i18nString(UIStrings.learnMore), undefined, 'learn-more');
+    learnMore.title = i18nString(UIStrings.learnMoreLabel);
+    titles.append('\xA0', learnMore);
+    label.textContent = i18nString(UIStrings.textEditPattern);
     const fields = content.createChild('div', 'blocked-url-edit-row');
     const validator =
         (_item: SDK.NetworkManager.RequestCondition, _index: number, input: UI.ListWidget.EditorControl): {
@@ -594,14 +532,12 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
           if (this.manager.requestConditions.has(input.value)) {
             return {errorMessage: i18nString(UIStrings.patternAlreadyExists), valid: false};
           }
-          if (Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled) {
-            const isValid = SDK.NetworkManager.RequestURLPattern.isValidPattern(input.value);
-            switch (isValid) {
-              case SDK.NetworkManager.RequestURLPatternValidity.FAILED_TO_PARSE:
-                return {errorMessage: i18nString(UIStrings.patternFailedToParse), valid: false};
-              case SDK.NetworkManager.RequestURLPatternValidity.HAS_REGEXP_GROUPS:
-                return {errorMessage: i18nString(UIStrings.patternFailedWithRegExpGroups), valid: false};
-            }
+          const isValid = SDK.NetworkManager.RequestURLPattern.isValidPattern(input.value);
+          switch (isValid) {
+            case SDK.NetworkManager.RequestURLPatternValidity.FAILED_TO_PARSE:
+              return {errorMessage: i18nString(UIStrings.patternFailedToParse), valid: false};
+            case SDK.NetworkManager.RequestURLPatternValidity.HAS_REGEXP_GROUPS:
+              return {errorMessage: i18nString(UIStrings.patternFailedWithRegExpGroups), valid: false};
           }
           return {valid: true, errorMessage: undefined};
         };
@@ -613,8 +549,7 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
 
   update(): void {
     const enabled = this.manager.requestConditions.conditionsEnabled;
-    const newItems = Array.from(this.manager.requestConditions.conditions.filter(
-        pattern => Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled || pattern.wildcardURL));
+    const newItems = Array.from(this.manager.requestConditions.conditions);
 
     let oldIndex = 0;
     for (; oldIndex < newItems.length; ++oldIndex) {
@@ -637,17 +572,17 @@ export class RequestConditionsDrawer extends UI.Widget.VBox implements
     this.requestUpdate();
   }
 
-  blockedRequestsCount(condition: SDK.NetworkManager.RequestCondition): number {
-    let result = 0;
-    for (const blockedUrl of this.blockedCountForUrl.keys()) {
-      if (matchesUrl(condition, blockedUrl)) {
-        result += (this.blockedCountForUrl.get(blockedUrl) as number);
+  #getRequestCount(condition: SDK.NetworkManager.RequestCondition): number {
+    if (condition.isBlocking) {
+      let result = 0;
+      for (const blockedUrl of this.blockedCountForUrl.keys()) {
+        if (matchesUrl(condition, blockedUrl)) {
+          result += (this.blockedCountForUrl.get(blockedUrl) as number);
+        }
       }
+      return result;
     }
-    return result;
-  }
 
-  throttledRequestsCount(condition: SDK.NetworkManager.RequestCondition): number {
     let result = 0;
     for (const ruleId of condition.ruleIds) {
       result += this.#throttledCount.get(ruleId) ?? 0;

package/front_end/panels/network/network-meta.ts

@@ -23,18 +23,10 @@ const UIStrings = {
    * @description Title of the Network tool
    */
   network: 'Network',
-  /**
-   * @description Command for showing the 'Network request blocking' tool
-   */
-  showNetworkRequestBlocking: 'Show Network request blocking',
   /**
    * @description Command for showing the 'Network request blocking' tool
    */
   showRequestConditions: 'Show Request conditions',
-  /**
-   * @description Title of the 'Network request blocking' tool in the bottom drawer
-   */
-  networkRequestBlocking: 'Network request blocking',
   /**
    * @description Title of the 'Request conditions' tool in the bottom drawer
    */
@@ -123,14 +115,6 @@ const UIStrings = {
    * @description Title of a button for clearing the network log
    */
   clear: 'Clear network log',
-  /**
-   * @description Title of an action in the Network request blocking panel to add a new URL pattern to the blocklist.
-   */
-  addNetworkRequestBlockingPattern: 'Add network request blocking pattern',
-  /**
-   * @description Title of an action in the Network request blocking panel to clear all URL patterns.
-   */
-  removeAllNetworkRequestBlockingPatterns: 'Remove all network request blocking patterns',
   /**
    * @description Title of an action in the Network request blocking panel to add a new URL pattern to the blocklist.
    */
@@ -190,15 +174,11 @@ UI.ViewManager.registerViewExtension({
   },
 });
 
-const individualThrottlingEnabled = (): boolean =>
-    Boolean(Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled);
 UI.ViewManager.registerViewExtension({
   location: UI.ViewManager.ViewLocationValues.DRAWER_VIEW,
   id: 'network.blocked-urls',
-  commandPrompt: () => individualThrottlingEnabled() ? i18nString(UIStrings.showRequestConditions) :
-                                                       i18nString(UIStrings.showNetworkRequestBlocking),
-  title: () => individualThrottlingEnabled() ? i18nString(UIStrings.networkRequestConditions) :
-                                               i18nString(UIStrings.networkRequestBlocking),
+  commandPrompt: () => i18nString(UIStrings.showRequestConditions),
+  title: () => i18nString(UIStrings.networkRequestConditions),
   persistence: UI.ViewManager.ViewPersistence.CLOSEABLE,
   order: 60,
   async loadView() {
@@ -350,8 +330,7 @@ UI.ActionRegistration.registerActionExtension({
 UI.ActionRegistration.registerActionExtension({
   actionId: 'network.add-network-request-blocking-pattern',
   category: UI.ActionRegistration.ActionCategory.NETWORK,
-  title: () => individualThrottlingEnabled() ? i18nString(UIStrings.addNetworkRequestBlockingOrThrottlingPattern) :
-                                               i18nString(UIStrings.addNetworkRequestBlockingPattern),
+  title: () => i18nString(UIStrings.addNetworkRequestBlockingOrThrottlingPattern),
   iconClass: UI.ActionRegistration.IconClass.PLUS,
   contextTypes() {
     return maybeRetrieveContextTypes(Network => [Network.RequestConditionsDrawer.RequestConditionsDrawer]);
@@ -365,9 +344,7 @@ UI.ActionRegistration.registerActionExtension({
 UI.ActionRegistration.registerActionExtension({
   actionId: 'network.remove-all-network-request-blocking-patterns',
   category: UI.ActionRegistration.ActionCategory.NETWORK,
-  title: () => individualThrottlingEnabled() ?
-      i18nString(UIStrings.removeAllNetworkRequestBlockingOrThrottlingPatterns) :
-      i18nString(UIStrings.removeAllNetworkRequestBlockingPatterns),
+  title: () => i18nString(UIStrings.removeAllNetworkRequestBlockingOrThrottlingPatterns),
   iconClass: UI.ActionRegistration.IconClass.CLEAR,
   contextTypes() {
     return maybeRetrieveContextTypes(Network => [Network.RequestConditionsDrawer.RequestConditionsDrawer]);