Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/gh 1517 dynamic ui rendering #343

Closed
wants to merge 129 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
88fc5e4
Convert PanelData export to a singleton to facilitate dynamic UI port…
wlycdgr Jan 30, 2019
51b2a00
Add summaryUIPort
wlycdgr Jan 30, 2019
2516435
Move summaryUIPort to panel data. Create port initializion function
wlycdgr Jan 31, 2019
b1996fe
Add PanelData#updatePanelUI stub. Add call to this stub from eventsHa…
wlycdgr Jan 31, 2019
945245e
Create a map on panelData to store our multiple UI ports
wlycdgr Feb 1, 2019
a780efc
Reorder port connect name checks to account for relative frequency
wlycdgr Feb 1, 2019
3d14b93
Constantize summary ui port name
wlycdgr Feb 1, 2019
adb5b45
Update summary ui port name constant name
wlycdgr Feb 1, 2019
fe19632
Disconnect summary UI port on component unmount
wlycdgr Feb 1, 2019
705ae1c
Simplify logging to use existing utils api. revert port constant name
wlycdgr Feb 1, 2019
3c64875
post message to Summary component on bug update
wlycdgr Feb 1, 2019
87959b0
Add TODOs. Comment out code for testing.
wlycdgr Feb 4, 2019
b7708c1
Make tracker donut dynamic
wlycdgr Feb 5, 2019
96b4a72
Debug UI port flow and make sure the right tab objects are being pass…
wlycdgr Feb 6, 2019
d456d0c
Define PanelData#updatePanelAndSummaryTrackerData, which performs onl…
wlycdgr Feb 6, 2019
db70769
Refactor tracker data building in Panel Data to accomodate update use…
wlycdgr Feb 7, 2019
504bedf
Merge branch 'develop' into feature/GH-1517_dynamic-UI-rendering to …
wlycdgr Feb 7, 2019
50be4ff
Revise PanelData updates to placate linter
wlycdgr Feb 7, 2019
de84196
Update variable names in PanelData and remove some testing code
wlycdgr Feb 7, 2019
768f142
Add data structure doc for per-tab apps memoization to FoundBugs
wlycdgr Feb 8, 2019
b3b0f5c
Refactor FoundBugs to speed up app retrieval
wlycdgr Feb 11, 2019
4ab94a4
Fix typo in FoundBugs
wlycdgr Feb 11, 2019
f2d5751
Fix typo and uncomment a necessary line
wlycdgr Feb 11, 2019
0110050
Debugging hasLatencyIssue bug
wlycdgr Feb 12, 2019
9c2c7a4
Merge branch 'develop' into feature/GH-1517_dynamic-UI-rendering to b…
wlycdgr Feb 12, 2019
b539fcf
Fix assignment bug in hasLatencyIssue and remove debugging statements
wlycdgr Feb 12, 2019
86d3643
Clean up UI port listener in the Panel component
wlycdgr Feb 12, 2019
bd0d306
Move summary ui port back to Summary component
wlycdgr Feb 13, 2019
298d78b
Work on updating PanelData to handle update requests efficiently
wlycdgr Feb 13, 2019
a240322
Continue PanelData refactor
wlycdgr Feb 13, 2019
cbaa7ee
Retrieve active tab on port init and store in PanelData to avoid retr…
wlycdgr Feb 13, 2019
149e84d
Continue to refactor PanelData
wlycdgr Feb 13, 2019
27e0593
Work in progress on PanelData
wlycdgr Feb 13, 2019
0faa19a
Continue refactor of PanelData
wlycdgr Feb 13, 2019
786b778
Send init data on first time panel opens port on a tab
wlycdgr Feb 14, 2019
6fd1513
Use dynamic UI ports to retrieve initial panel data as well
wlycdgr Feb 14, 2019
4b9e7f1
Remove unnecessary functions from PanelData
wlycdgr Feb 14, 2019
8f359bd
Remove linear regression import from PanelData...not sure how it ende…
wlycdgr Feb 14, 2019
edb8d69
Remove now-redundant panelView getter and object on PanelData
wlycdgr Feb 14, 2019
afabd8e
Remove dependence on building tracker data map in PanelData
wlycdgr Feb 14, 2019
1f46583
Remove tracker data map from PanelData
wlycdgr Feb 14, 2019
bdee64c
Linter placation fixes in PanelData
wlycdgr Feb 14, 2019
79b49b6
Delete private *View var that are only ever used to return from their…
wlycdgr Feb 14, 2019
f51026a
Work to remove redundant confData data structure in PanelData
wlycdgr Feb 15, 2019
69478c7
Fix subscriptionsPlus typo
wlycdgr Feb 15, 2019
185e2bd
Delete this._confData get from this._buildCategories in PanelData
wlycdgr Feb 15, 2019
0ce4200
Remove this._buildConfData() from PanelData
wlycdgr Feb 15, 2019
5e0a907
Move updateSummaryData to SummaryActions
wlycdgr Feb 15, 2019
98dde48
Add blocking UI port. Move retrieval of blocking data to this port.
wlycdgr Feb 15, 2019
5ebb380
Activate blockingUIPort
wlycdgr Feb 15, 2019
154baf5
Clean up unnecessary code and comments
wlycdgr Feb 15, 2019
7d139ad
Convert Settings component to use port to get initial settings data
wlycdgr Feb 15, 2019
67367fb
Remove unnecessary call in Settings
wlycdgr Feb 15, 2019
6d505c3
Remove this._buildConfData call in PanelData#set
wlycdgr Feb 15, 2019
b232349
Update account.getUserSettings error message to reflect that it now l…
wlycdgr Feb 15, 2019
3516412
Remove log statements from Panel and Summary render funcs
wlycdgr Feb 15, 2019
9968d2a
Move rewards panel port to PanelData. Modify front and back end code …
wlycdgr Feb 15, 2019
a3fd2d0
Implement passing rewards panel data through PanelData port
wlycdgr Feb 15, 2019
b4bc375
Remove obviated Rewards panel background data retrieval code
wlycdgr Feb 15, 2019
287c034
Remove obviated PanelData#get
wlycdgr Feb 15, 2019
1bc265c
Clean up PanelData#initUIPort
wlycdgr Feb 15, 2019
051435d
Remove outdated PanelData constructor comment
wlycdgr Feb 15, 2019
efda3dd
Add comments to PanelData
wlycdgr Feb 15, 2019
bde6e1b
Remove variable related to removed PanelData conf Map from PanelData#set
wlycdgr Feb 15, 2019
ff16c6d
Minor change to reduce duplication in PanelData#set
wlycdgr Feb 16, 2019
d29e5dc
Factor some duplicate code in PanelData#set out to a helper func
wlycdgr Feb 16, 2019
aab593b
Remove commented out code from PanelData#set
wlycdgr Feb 16, 2019
4fcc7e1
Work towards converting getCliqzModuleData to use the summary UI port…
wlycdgr Feb 16, 2019
1571067
Modify GET_CLIQZ_MODULE_DATA reducer to look for 'blocked' rather tha…
wlycdgr Feb 18, 2019
84e7a57
Remove code that was used to get cliqz module data via messages, sinc…
wlycdgr Feb 18, 2019
4b689bb
Update BrowserButton#_getAntiTrackCount to check for 'blocked' rather…
wlycdgr Feb 19, 2019
1409296
Move cliqz antitracking and adblocking data retrieval to utils functi…
wlycdgr Feb 19, 2019
e9aa8e3
Remove unnecessary imports from BrowserButton. Linter clean up.
wlycdgr Feb 19, 2019
baddd40
Convert PanelData to use the cliqzModuleData utility functions
wlycdgr Feb 19, 2019
d30c723
Remove redundant unsafe count calculation from GET_CLIQZ_MODULE_DATA …
wlycdgr Feb 19, 2019
f168850
Revert to 'unsafe' in cliqModuleData and remove some logging calls
wlycdgr Feb 19, 2019
e67eb83
Update GET_REWARDS_DATA test
wlycdgr Feb 19, 2019
b900205
Update GET_CLIQZ_MODULE_DATA reducer and action creator tests
wlycdgr Feb 19, 2019
df0b2fb
Make donut arc a property on DonutGraph
wlycdgr Feb 19, 2019
09f9171
Make trackerPie a property on DonutGraph
wlycdgr Feb 19, 2019
4d5c8f6
Move towards correct updating of donut graph, without adding new elem…
wlycdgr Feb 20, 2019
b4a5633
Implement donut updating without adding new SVG elements
wlycdgr Feb 20, 2019
69eeb21
Begin adding UI state to Blocking to preserve per category expansion …
wlycdgr Feb 20, 2019
968d1e2
Always send blocking data on opening of blocking port instead of only…
wlycdgr Feb 20, 2019
1198e8a
Reduce duplicdation in data retrieval functions in PanelData. Streaml…
wlycdgr Feb 20, 2019
c95447d
Make sure rewards UI port disconnects. Handle detaching disconnect li…
wlycdgr Feb 20, 2019
209bda4
Reset page load time display if page is reloaded while panel is open
wlycdgr Feb 21, 2019
af2e4ba
Ensure that page load data is sent even if panel is first opened afte…
wlycdgr Feb 21, 2019
3c4f4d6
Work towards finalizing the API, organization, and documentation of P…
wlycdgr Feb 25, 2019
c3433ac
Continue finalizing refactor of PanelData
wlycdgr Feb 26, 2019
8baf15a
Finish PanelData refactor and reorganization. Fix typo in FoundBugs
wlycdgr Feb 26, 2019
db0e44b
Fix bug in summary data retrieval
wlycdgr Feb 26, 2019
0facec1
Add TODO comment to RewardsActions. Modify ui port code to make sure …
wlycdgr Feb 26, 2019
00ee717
Remove extraneous param listing from FoundBugs#update comment
wlycdgr Feb 26, 2019
6c9416c
Remove commented out code block and unused import from foundbugs.test.js
wlycdgr Feb 26, 2019
a85bcc8
Fix minor typos in foundbugs.test.js
wlycdgr Feb 26, 2019
0926253
Remove some debug logging from Rewards component. Update Rewards comp…
wlycdgr Feb 26, 2019
3d61faf
Remove unnecessary sinon import from Rewards test file
wlycdgr Feb 26, 2019
02a890a
Fix FoundBugs bug that kept any bugs from being blocked: true
wlycdgr Feb 26, 2019
24b2d74
Clean up Blocking#render in process of implementing expand/collapse t…
wlycdgr Feb 26, 2019
b89c383
Fix function call typo in PanelData
wlycdgr Feb 26, 2019
7052a98
Make sure extension loads correctly if there is no needsReload value …
wlycdgr Feb 27, 2019
136a469
Implement per category expanded state preservation during loading in …
wlycdgr Feb 27, 2019
0058677
Debug and cleanup expand/contract per category state preservation dur…
wlycdgr Feb 27, 2019
3cb5167
Throttle DonutGraph#_bakeDonut
wlycdgr Feb 28, 2019
f49761f
Remove unnecessary totalCount parameter extraction & passing from Don…
wlycdgr Feb 28, 2019
2b67b20
Restore immediate updating to redscale/greyscale in response to user …
wlycdgr Feb 28, 2019
970ae9f
Animate donut graph reslicing. Delint code.
wlycdgr Feb 28, 2019
fa98388
Add padAngle TODO note to DonutGraph. Remove commented out code.
wlycdgr Feb 28, 2019
6d32923
Merge branch 'develop' into feature/GH-1517_dynamic-UI-rendering
IAmThePan Feb 28, 2019
09dac12
Merge in new browser-core build from develop
wlycdgr Feb 28, 2019
7e8a130
Clean up merge comments from package.json
wlycdgr Feb 28, 2019
bd265d0
Merge branch 'feature/GH-1517_dynamic-UI-rendering' of github.com:gho…
wlycdgr Feb 28, 2019
c72c5db
Update yarn.lock
IAmThePan Feb 28, 2019
f1bef8d
Merge branch 'feature/GH-1517_dynamic-UI-rendering' of github.com:gho…
IAmThePan Feb 28, 2019
2503fa0
Merge branch 'develop' into feature/GH-1517_dynamic-UI-rendering
jsignanini Mar 4, 2019
acded00
Rearrange function calls in Panel#componentDidMount
wlycdgr Mar 4, 2019
1b61c2c
Change type of action created by updatePanelData back to GET_PANEL_DA…
wlycdgr Mar 4, 2019
045bb6c
Merge branch 'develop' into feature/GH-1517_dynamic-UI-rendering
wlycdgr Mar 5, 2019
773dafe
Remove a removeListener call that should not have been there from pan…
wlycdgr Mar 5, 2019
4fd878e
Modify rewards ui port code & logic to match current behavior
wlycdgr Mar 5, 2019
b8f36db
Throttle PanelData#updatePanelUI to 600ms, matching the donut redraw …
wlycdgr Mar 7, 2019
27b202b
Add and modify panel UI update throttling comments
wlycdgr Mar 7, 2019
96da132
Send account data with panel updates to avoid account reducer error
wlycdgr Mar 11, 2019
4869f71
Add performance analysis code
wlycdgr Mar 12, 2019
eeb926c
Add panel open performance logging
wlycdgr Mar 12, 2019
4127122
Remove performance logging
wlycdgr Mar 12, 2019
8df86d9
Remove performance analysis code
wlycdgr Mar 12, 2019
4e24b96
Revert the remainder of performance measurement changes
wlycdgr Mar 12, 2019
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Delete private *View var that are only ever used to return from their…
… respective getters in PanelData
  • Loading branch information
wlycdgr committed Feb 14, 2019
commit 79b49b6cd942b79a97c271e0ab0c28ffc2f88a6e
@@ -45,10 +45,6 @@ class PanelData {
*/
constructor() {
this._confData = new Map();
this._blockingView = {};
this._rewardsView = {};
this._settingsView = {};

this._uiPorts = new Map();
this._activeTab = null;
}
@@ -304,7 +300,7 @@ class PanelData {
const pageHost = url && processUrl(url).host || '';
const trackerList = foundBugs.getApps(id, false, url) || [];

this._blockingView = {
return {
expand_all_trackers: this._confData.get('expand_all_trackers'),
selected_app_ids: this._confData.get('selected_app_ids'),
show_tracker_urls: this._confData.get('show_tracker_urls'),
@@ -316,20 +312,18 @@ class PanelData {
pageUrl: url,
categories: this._buildCategories(id, url, pageHost, trackerList)
};
return this._blockingView;
}

/**
* Get rewards data for the Rewards View
* @return {Object} Rewards view data
*/
get rewardsView() {
this._rewardsView = {
return {
enable_offers: this._confData.get('enable_offers'),
rewards: rewards.storedOffers,
unread_offer_ids: rewards.unreadOfferIds,
};
return this._rewardsView;
}

/**
@@ -338,7 +332,7 @@ class PanelData {
* @return {Object} Settings View data
*/
get settingsView() {
this._settingsView = {
return {
alert_bubble_pos: this._confData.get('alert_bubble_pos'),
alert_bubble_timeout: this._confData.get('alert_bubble_timeout'),
block_by_default: this._confData.get('block_by_default'),
@@ -366,8 +360,6 @@ class PanelData {
toggle_individual_trackers: this._confData.get('toggle_individual_trackers'),
language: this._confData.get('language'), // required for the setup page that does not have access to panelView data
};

return this._settingsView;
}

// TODO would accessing conf directly be simpler than using this mirror (except for categories) data structure?
ProTip! Use n and p to navigate between commits in a pull request.