Skip to content

Commit 46feed4

Browse files
authored
Align Network filter bar features, disable UI experiment (#155)
1 parent 17895f4 commit 46feed4

2 files changed

Lines changed: 28 additions & 23 deletions

File tree

front_end/entrypoints/rn_fusebox/rn_fusebox.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ UI.ViewManager.maybeRemoveViewExtension('throttling-conditions');
7575
RNExperiments.RNExperimentsImpl.setIsReactNativeEntryPoint(true);
7676
RNExperiments.RNExperimentsImpl.Instance.enableExperimentsByDefault([
7777
Root.Runtime.ExperimentName.JS_HEAP_PROFILER_ENABLE,
78-
Root.Runtime.ExperimentName.NETWORK_PANEL_FILTER_BAR_REDESIGN,
7978
Root.Runtime.ExperimentName.REACT_NATIVE_SPECIFIC_UI,
8079
]);
8180

front_end/panels/network/NetworkLogView.ts

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -639,13 +639,15 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
639639
UI.Tooltip.Tooltip.install(this.dataURLFilterUI.element(), i18nString(UIStrings.hidesDataAndBlobUrls));
640640
filterBar.addFilter(this.dataURLFilterUI);
641641

642-
this.hideChromeExtensionsUI = new UI.FilterBar.CheckboxFilterUI(
643-
'chrome-extension', i18nString(UIStrings.chromeExtensions), true, this.networkHideChromeExtensions,
644-
'hide-extension-urls');
645-
this.hideChromeExtensionsUI.addEventListener(
642+
if (!this.isReactNative) {
643+
this.hideChromeExtensionsUI = new UI.FilterBar.CheckboxFilterUI(
644+
'chrome-extension', i18nString(UIStrings.chromeExtensions), true, this.networkHideChromeExtensions,
645+
'hide-extension-urls');
646+
this.hideChromeExtensionsUI.addEventListener(
646647
UI.FilterBar.FilterUIEvents.FilterChanged, this.filterChanged.bind(this), this);
647-
UI.Tooltip.Tooltip.install(this.hideChromeExtensionsUI.element(), i18nString(UIStrings.hideChromeExtension));
648-
filterBar.addFilter(this.hideChromeExtensionsUI);
648+
UI.Tooltip.Tooltip.install(this.hideChromeExtensionsUI.element(), i18nString(UIStrings.hideChromeExtension));
649+
filterBar.addFilter(this.hideChromeExtensionsUI);
650+
}
649651

650652
this.resourceCategoryFilterUI =
651653
new UI.FilterBar.NamedBitSetFilterUI(filterItems, this.networkResourceTypeFiltersSetting);
@@ -654,14 +656,16 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
654656
UI.FilterBar.FilterUIEvents.FilterChanged, this.filterChanged.bind(this), this);
655657
filterBar.addFilter(this.resourceCategoryFilterUI);
656658

657-
this.onlyBlockedResponseCookiesFilterUI = new UI.FilterBar.CheckboxFilterUI(
658-
'only-show-blocked-cookies', i18nString(UIStrings.hasBlockedCookies), true,
659-
this.networkShowBlockedCookiesOnlySetting, 'only-show-blocked-cookies');
660-
this.onlyBlockedResponseCookiesFilterUI.addEventListener(
661-
UI.FilterBar.FilterUIEvents.FilterChanged, this.filterChanged.bind(this), this);
662-
UI.Tooltip.Tooltip.install(
663-
this.onlyBlockedResponseCookiesFilterUI.element(), i18nString(UIStrings.onlyShowRequestsWithBlockedCookies));
664-
filterBar.addFilter(this.onlyBlockedResponseCookiesFilterUI);
659+
if (!this.isReactNative) {
660+
this.onlyBlockedResponseCookiesFilterUI = new UI.FilterBar.CheckboxFilterUI(
661+
'only-show-blocked-cookies', i18nString(UIStrings.hasBlockedCookies), true,
662+
this.networkShowBlockedCookiesOnlySetting, 'only-show-blocked-cookies');
663+
this.onlyBlockedResponseCookiesFilterUI.addEventListener(
664+
UI.FilterBar.FilterUIEvents.FilterChanged, this.filterChanged.bind(this), this);
665+
UI.Tooltip.Tooltip.install(
666+
this.onlyBlockedResponseCookiesFilterUI.element(), i18nString(UIStrings.onlyShowRequestsWithBlockedCookies));
667+
filterBar.addFilter(this.onlyBlockedResponseCookiesFilterUI);
668+
}
665669

666670
this.onlyBlockedRequestsUI = new UI.FilterBar.CheckboxFilterUI(
667671
'only-show-blocked-requests', i18nString(UIStrings.blockedRequests), true,
@@ -671,14 +675,16 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
671675
UI.Tooltip.Tooltip.install(this.onlyBlockedRequestsUI.element(), i18nString(UIStrings.onlyShowBlockedRequests));
672676
filterBar.addFilter(this.onlyBlockedRequestsUI);
673677

674-
this.onlyThirdPartyFilterUI = new UI.FilterBar.CheckboxFilterUI(
675-
'only-show-third-party', i18nString(UIStrings.thirdParty), true, this.networkOnlyThirdPartySetting,
676-
'only-show-third-party');
677-
this.onlyThirdPartyFilterUI.addEventListener(
678-
UI.FilterBar.FilterUIEvents.FilterChanged, this.filterChanged.bind(this), this);
679-
UI.Tooltip.Tooltip.install(
680-
this.onlyThirdPartyFilterUI.element(), i18nString(UIStrings.onlyShowThirdPartyRequests));
681-
filterBar.addFilter(this.onlyThirdPartyFilterUI);
678+
if (!this.isReactNative) {
679+
this.onlyThirdPartyFilterUI = new UI.FilterBar.CheckboxFilterUI(
680+
'only-show-third-party', i18nString(UIStrings.thirdParty), true, this.networkOnlyThirdPartySetting,
681+
'only-show-third-party');
682+
this.onlyThirdPartyFilterUI.addEventListener(
683+
UI.FilterBar.FilterUIEvents.FilterChanged, this.filterChanged.bind(this), this);
684+
UI.Tooltip.Tooltip.install(
685+
this.onlyThirdPartyFilterUI.element(), i18nString(UIStrings.onlyShowThirdPartyRequests));
686+
filterBar.addFilter(this.onlyThirdPartyFilterUI);
687+
}
682688
}
683689

684690
this.filterParser = new TextUtils.TextUtils.FilterParser(searchKeys);

0 commit comments

Comments
 (0)