GH-2178: Update Anti-suite names where they appear in GBE #614

benstrumeyer · 2020-10-01T18:40:07Z

Have you followed the guidelines in CONTRIBUTING.md?
Have you checked to ensure there aren't other open Pull Requests for the same update/change?
Have you added an explanation of what your changes do?
Does your submission pass tests?
Did you lint your code prior to submission?

Change string names from:

Enhanced Anti-Tracking → Anti-Tracking
Enhanced Ad Blocking → Ad-Blocking
Smart Blocking → Smart Browsing
Ad Block / Ad Block Lists → Ad-Block / Ad-Block Lists

Ticket: https://ghostery.atlassian.net/browse/GH-2178

…ock lists to their new names

wlycdgr

Looks good, just a couple other spots that need to be updated

wlycdgr · 2020-10-01T19:30:13Z

app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss

@@ -63,12 +63,12 @@
 	background-image: buildAdBlockActiveIcon(#1dafed);
 }

-// Smart Blocking Icon
+// Smart Browsing Icon
 .SetupAntiSuite__feature .smart-blocking {


Let's also change the class names .smart-blocking -> .smart-browsing

Updated the class names!

app/panel/components/BuildingBlocks/CliqzFeature.jsx

wlycdgr · 2020-10-01T19:30:13Z

app/panel/components/BuildingBlocks/CliqzFeature.jsx

 		} else if (featureType === 'smart_block') {
 			featureName = t('smart_blocking');
 		}


wlycdgr

Quick comment on one of the updates. Otherwise, we were looking good until I made the mistake of running a global search on 'smart_block'....looks like there are....a few more spots:

I know it's a pain, but let's update those and try to stick closer to one name per feature - we have enough confusion around feature names in the extension as is

wlycdgr · 2020-10-02T16:58:05Z

app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss

 // Smart Browsing Icon
-.SetupAntiSuite__feature .smart-blocking {
+.SetupAntiSuite__feature .smart-browsing {
 	background-image: buildSmartBrowsingIcon(#9f9f9f);
 }
-.SetupAntiSuite__feature .smart-blocking.active {
+.SetupAntiSuite__feature .smart-browsing.active {
 	background-image: buildSmartBrowsingActiveIcon(#1dafed);


Did you also update the place(s) in the components where these classes are used? Sorry if I missed that

My bad! Looks like it got updated by the global search and replace 👍

…rtBlock.js to PolicySmartBrowse.js

jmlh556 · 2020-10-06T21:42:43Z

wlycdgr · 2020-10-27T15:04:23Z

Looks like there's supposed to be a dash between "Smart" and "Browsing"

wlycdgr · 2020-10-27T15:06:43Z

"The following Ad-Block filter lists" should be "The following ad-block filter lists" (in the Ad-Block Lists Settings tab)

… GH-2178

wlycdgr · 2020-10-27T17:03:24Z

CHANGELOG.md

@@ -134,7 +134,7 @@ See the complete GitHub [milestone](https://github.com/ghostery/ghostery-extensi
 + Add new counter for Requests Modified by Anti-Tracking (#392)
 + Show fingerprint, cookie and advertisement icons in Detail View tracker list (#394)
 + Improved Anti-Tracking integration (#377)
-+ Integrate Click2Play into SmartBlocking (#388)
+ Integrate Click2Play into SmartBrowsing (#388)


Same deal here with the CHANGELOG - let's leave the old entries as is

wlycdgr · 2020-10-27T17:03:24Z

src/classes/EventHandlers.js

+		const smartBrowseed = !block ? this.policySmartBrowse.shouldBlock(app_id, cat_id, tab_id, page_url, eventMutable.type, eventMutable.timeStamp) : false;
+		const smartUnblocked = block ? this.policySmartBrowse.shouldUnblock(app_id, cat_id, tab_id, page_url, eventMutable.type) : false;


Looks like a spot where the auto-replace didn't quite do the trick. Let's update these to smartBrowseBlocked and smartBrowseUnblocked

Typos! Gotta watch out for those, good catch

wlycdgr · 2020-10-27T17:03:24Z

src/classes/TabInfo.js

@@ -15,7 +15,7 @@
 *		prefetched: 	{boolean}	indicates that the tab was prefetched and not part of the main window
 *		purplebox: 		{boolean}	indicates that the purplebox.js script has been loaded on this tab
 *		protocol: 		{string} 	request protocol
- *		smartBlock: 	{Object}	smart blocking stats for this tab
+ *		smartBrowse: 	{Object}	smart blocking stats for this tab


Comment needs an update to match ~

Nice catch! I just found/replaced the variables, didn't think to look for comments too. Updated the comments in a few more places too

christophertino · 2020-10-27T18:07:42Z

src/classes/ConfData.js

@@ -119,7 +119,7 @@ class ConfData {
 			_initProperty('enable_click2play_social', true);
 			_initProperty('enable_human_web', !IS_CLIQZ && !IS_FIREFOX);
 			_initProperty('enable_abtests', true);
-			_initProperty('enable_smart_block', true);
+			_initProperty('enable_smart_browse', true);


This is going to override the setting for any users with Smart Block currently turned off. Is there a reason we are changing all of these variable and file names, instead of just changing the user-facing language?

christophertino · 2020-10-27T19:12:50Z

Closing in favor of #626

benstrumeyer added 2 commits Oct 1, 2020

Rename anti tracking, ad blocking, smart blocking, ad block and ad bl…

Loading status checks…

14c38c3

…ock lists to their new names

Update snapshot

Loading status checks…

7177972

benstrumeyer added the Type: Feature Enhancement label Oct 1, 2020

benstrumeyer added this to the 8.5.4 milestone Oct 1, 2020

benstrumeyer requested a review from wlycdgr Oct 1, 2020

benstrumeyer requested a review from ghostery/extension as a code owner Oct 1, 2020

benstrumeyer self-assigned this Oct 1, 2020

wlycdgr reviewed Oct 1, 2020

View changes

Update smart blocking to smart browsing in a few more places

Loading status checks…

47e19e5

benstrumeyer requested a review from wlycdgr Oct 1, 2020

Update snapshot

Loading status checks…

9ce11ae

wlycdgr changed the title ~~GH-2178: Update Anti-suite names where they appear in GBE~~ (DNM UNTIL 8.5.3 IS OUT) GH-2178: Update Anti-suite names where they appear in GBE Oct 2, 2020

Merge in develop

Loading status checks…

e9bda62

wlycdgr reviewed Oct 2, 2020

View changes

benstrumeyer added 2 commits Oct 6, 2020

Rename all variables from smartBlock -> smartBrowse, rename PolicySma…

5da56d0

…rtBlock.js to PolicySmartBrowse.js

Update snapshot

Loading status checks…

c276bf6

benstrumeyer requested a review from christophertino as a code owner Oct 6, 2020

benstrumeyer requested a review from wlycdgr Oct 6, 2020

wlycdgr changed the title ~~(DNM UNTIL 8.5.3 IS OUT) GH-2178: Update Anti-suite names where they appear in GBE~~ (8.5.4) GH-2178: Update Anti-suite names where they appear in GBE Oct 7, 2020

wlycdgr and others added 2 commits Oct 27, 2020

Merge in develop

Loading status checks…

b2a3776

Merge branch 'develop' into GH-2178

92133b7

benstrumeyer added 4 commits Oct 27, 2020

Merge branch 'develop' into GH-2178

635b330

Merge branch 'GH-2178' of github.com:ghostery/ghostery-extension into…

7bfbe2d

… GH-2178

Update copy

Loading status checks…

7d86f5b

Smart Browsing -> Smart-Browsing, add a dash

Loading status checks…

4afc08d

wlycdgr reviewed Oct 27, 2020

View changes

Update CHANGELOG

3bf1cc1

benstrumeyer added 2 commits Oct 27, 2020

Update more variables (smartBrowseBlocked/smartBrowseUnblocked)

b0d54a8

Update Smart Blocking -> Smart Blocking in comments

Loading status checks…

0166d29

benstrumeyer requested a review from wlycdgr Oct 27, 2020

christophertino reviewed Oct 27, 2020

View changes

christophertino removed this from the 8.5.4 milestone Oct 27, 2020

christophertino closed this Oct 27, 2020

christophertino deleted the GH-2178 branch Oct 27, 2020

christophertino changed the title ~~(8.5.4) GH-2178: Update Anti-suite names where they appear in GBE~~ GH-2178: Update Anti-suite names where they appear in GBE Oct 27, 2020

ghostery / ghostery-extension

GH-2178: Update Anti-suite names where they appear in GBE #614

GH-2178: Update Anti-suite names where they appear in GBE #614

benstrumeyer commented Oct 1, 2020

wlycdgr left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

wlycdgr left a comment •

edited

This comment has been minimized.

This comment has been minimized.

jmlh556 commented Oct 6, 2020

wlycdgr commented Oct 27, 2020

wlycdgr commented Oct 27, 2020

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

christophertino commented Oct 27, 2020

		const smartBrowseed = !block ? this.policySmartBrowse.shouldBlock(app_id, cat_id, tab_id, page_url, eventMutable.type, eventMutable.timeStamp) : false;
		const smartUnblocked = block ? this.policySmartBrowse.shouldUnblock(app_id, cat_id, tab_id, page_url, eventMutable.type) : false;

ghostery / ghostery-extension

GH-2178: Update Anti-suite names where they appear in GBE #614

GH-2178: Update Anti-suite names where they appear in GBE #614

Conversation

benstrumeyer commented Oct 1, 2020

wlycdgr left a comment

This comment has been minimized.

wlycdgr Oct 1, 2020 Member

This comment has been minimized.

benstrumeyer Oct 1, 2020 Author Contributor

This comment has been minimized.

wlycdgr Oct 1, 2020 Member

This comment has been minimized.

benstrumeyer Oct 1, 2020 Author Contributor

wlycdgr left a comment • edited

This comment has been minimized.

wlycdgr Oct 2, 2020 Member

This comment has been minimized.

benstrumeyer Oct 6, 2020 Author Contributor

jmlh556 commented Oct 6, 2020

wlycdgr commented Oct 27, 2020

wlycdgr commented Oct 27, 2020

This comment has been minimized.

wlycdgr Oct 27, 2020 Member

This comment has been minimized.

benstrumeyer Oct 27, 2020 Author Contributor

This comment has been minimized.

wlycdgr Oct 27, 2020 Member

This comment has been minimized.

benstrumeyer Oct 27, 2020 Author Contributor

This comment has been minimized.

wlycdgr Oct 27, 2020 Member

This comment has been minimized.

benstrumeyer Oct 27, 2020 Author Contributor

This comment has been minimized.

christophertino Oct 27, 2020 Member

christophertino commented Oct 27, 2020

wlycdgr Oct 1, 2020
Member

benstrumeyer Oct 1, 2020
Author Contributor

wlycdgr Oct 1, 2020
Member

benstrumeyer Oct 1, 2020
Author Contributor

wlycdgr left a comment •

edited

wlycdgr Oct 2, 2020
Member

benstrumeyer Oct 6, 2020
Author Contributor

wlycdgr Oct 27, 2020
Member

benstrumeyer Oct 27, 2020
Author Contributor

wlycdgr Oct 27, 2020
Member

benstrumeyer Oct 27, 2020
Author Contributor

wlycdgr Oct 27, 2020
Member

benstrumeyer Oct 27, 2020
Author Contributor

christophertino Oct 27, 2020
Member