Skip to content

Commit

Permalink
AG-8566 display modified events by 'modified' filter
Browse files Browse the repository at this point in the history
Merge in EXTENSIONS/browser-extension from fix/AG-8566 to feature/AG-2737

* commit '03486fafc151e8254a3f4b70cc74eeeef8972a54':
  do not consider css and script events as blocked
  do not consider removeparam events as blocked
  display modified events by 'modified' filter
  • Loading branch information
slavaleleka committed Jun 15, 2021
2 parents cec31e5 + 03486fa commit 3c93e6b
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions Extension/src/pages/filtering-log/stores/LogStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,15 @@ class LogStore {
}

const isAllowlisted = filteringEvent.requestRule?.whitelistRule;
const isBlocked = filteringEvent.requestRule && !filteringEvent.requestRule.whitelistRule;
const isModified = filteringEvent.requestRule?.isModifyingCookieRule;
const isBlocked = filteringEvent.requestRule
&& !filteringEvent.requestRule.whitelistRule
&& !filteringEvent.requestRule.cssRule
&& !filteringEvent.requestRule.scriptRule
&& !filteringEvent.removeParam;
const isModified = filteringEvent.requestRule?.isModifyingCookieRule
|| filteringEvent.requestRule?.cssRule
|| filteringEvent.requestRule?.scriptRule
|| filteringEvent.removeParam;
const isUserFilter = filteringEvent.requestRule?.filterId === 0;
const isFirstParty = !filteringEvent.requestThirdParty;
const isThirdParty = filteringEvent.requestThirdParty;
Expand Down

0 comments on commit 3c93e6b

Please sign in to comment.