Historical view v1 #4353

Kongkille · 2022-07-18T13:22:58Z

First version of historical view addressing #3938.

This PR introduces 4 different time ranges that users can use to explore past data. This also contains large infrastructure changes including large changes to our redux setup as well as changes to the zonemap allowing it to change on every hour.

Preview

* Update mock data * Add jest * Add initial test * [historical view] Info (and FAQ) Modals (#4232) * Lints scss file * Fixes button colors * Creates new fancy pill button * Adds usage examples as JSDocs * Adds new info modal * Hides legal links from FAQ on mobile * Adds new FAQ modal * Adds the modals * Updates icons and changes FAQ button back * Adds a dash of padding * Updates buttons to avoid style-props * drop `electricitymap.contrib` from import (#4256) * Comment out test * Add middleware * fix UI * Fix timeslider disappearing * Remove old datareducer * Update redux * Update fetch * Remove unused grid property * Add new reducer * add yarn lock * Enable tests * Fix some bugs * Move things around * Improve ELEXON parser for historical refetch (#4266) * Improve ELEXON parser for historical refetch * Enable historical wind refetching * fix zoneList * Fix enterzone from ranking * Update nl.json (#4231) Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com> * Fix bug * add hasData * remove hasParser * Added tests for validators (#4268) * Add pytest * Invert so 1=valid and 0=invalid * Added tests for validators * format * Rename fixture file * Replaces middleware * Kills nightime feature * Fixes "no-parser" message * Fixes styling on Firefox * Fixes polling * Fixes bug in ranking panel * Removes customDatetime * Makes createStore simpler * Removes firefox styling as it broke Chrome styling * Makes eslint happy again * Adds comments and deletes a few unused things * Simplifies grid-success-state-changes * Fixes hasData bug * Removes old isNonClickable code from zonemap Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com> Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com> Co-authored-by: Pierre Segonne <32778266+pierresegonne@users.noreply.github.com> Co-authored-by: Rodeobe <43032396+Rodeobe@users.noreply.github.com> Co-authored-by: Felix Qvist <felix.qvist@gmail.com>

* Remove all related to feature flag * add lockfile

* Adds new history files * Adds new state files * Changes mockserver to use new files * Fixes exchange refactor bug to make test pass * Fixes api test * Lints file

Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

* [historical view] Implements a Settings modal (#4233) * Lints scss file * Fixes button colors * Lints scss file * Fixes button colors * Adds styling for disabled and makes button more flexible for other languages * Adds new settings modal * Makes toggle tooltip placement flexible * Adds setting to reducer * Moves logic to button cmp and simplifies usage * [E2E] Tests map, country panel and ranking panel (#4267) * [historical view] Map buttons for info and settings modal (#4250) * Update to new dataReducer (#4265) * Update mock data * Add jest * Add initial test * [historical view] Info (and FAQ) Modals (#4232) * Lints scss file * Fixes button colors * Creates new fancy pill button * Adds usage examples as JSDocs * Adds new info modal * Hides legal links from FAQ on mobile * Adds new FAQ modal * Adds the modals * Updates icons and changes FAQ button back * Adds a dash of padding * Updates buttons to avoid style-props * drop `electricitymap.contrib` from import (#4256) * Comment out test * Add middleware * fix UI * Fix timeslider disappearing * Remove old datareducer * Update redux * Update fetch * Remove unused grid property * Add new reducer * add yarn lock * Enable tests * Fix some bugs * Move things around * Improve ELEXON parser for historical refetch (#4266) * Improve ELEXON parser for historical refetch * Enable historical wind refetching * fix zoneList * Fix enterzone from ranking * Update nl.json (#4231) Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com> * Fix bug * add hasData * remove hasParser * Added tests for validators (#4268) * Add pytest * Invert so 1=valid and 0=invalid * Added tests for validators * format * Rename fixture file * Replaces middleware * Kills nightime feature * Fixes "no-parser" message * Fixes styling on Firefox * Fixes polling * Fixes bug in ranking panel * Removes customDatetime * Makes createStore simpler * Removes firefox styling as it broke Chrome styling * Makes eslint happy again * Adds comments and deletes a few unused things * Simplifies grid-success-state-changes * Fixes hasData bug * Removes old isNonClickable code from zonemap Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com> Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com> Co-authored-by: Pierre Segonne <32778266+pierresegonne@users.noreply.github.com> Co-authored-by: Rodeobe <43032396+Rodeobe@users.noreply.github.com> Co-authored-by: Felix Qvist <felix.qvist@gmail.com> * [historical-view] use history as default (#4264) * Remove all related to feature flag * add lockfile * Removes feature-toggle-checks * renames component to hidden * Updates countrypanel test after his-view changes * Fixes test in ranking Co-authored-by: Markus Killendahl <markus.killendahl@tmrow.com> Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com> Co-authored-by: Pierre Segonne <32778266+pierresegonne@users.noreply.github.com> Co-authored-by: Rodeobe <43032396+Rodeobe@users.noreply.github.com> Co-authored-by: Felix Qvist <felix.qvist@gmail.com>

* disable datedisplay on load * install react-spinner lib * add loading and refactor timeaxis * remove testing selector * change color of pulseloader

Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

This reverts commit 484d9b7.

* Moves styling to SC * Updates styling for timeslider input. This add the icon back and fixes bugs on Firefox

…ricitymap-contrib into historical-view-v1

* Adds start script that uses nodemon * Updates dependencies

* Allows ingestion of details with empty array * Add changes back. git is hard * Add estimation_method flag in zones * Add script to update mock data * Update mock data * allow estimation method in pydantic * pass test * pass test hopefully * Update web/cypress/integration/ranking.spec.js Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com> * Update web/src/helpers/redux.js Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com> * Remove unused package in mockserver * format Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

* Makes it possible to hover and interact with graphs... without affecting the timeslider component and globally selected time * Applies same changes to emissions graph * Adds a test id so we can setup e2e tests * Adds e2e testing of graph hover * Moves hover index handling inside AreaGraph * Moves data start and end date measurement inside areagraph * Shows marker based on selected time on TimeSlider. As a fallback if graph is not hovered

* Adds new social share image * Removes eslint-disable comments * Changes link to button * Adds labels, types and a few minor things * Changes links to buttons * Makes circulargauge tooltips aria hidden for now * Replaces Twitter JS widget with a styled button

* Moves styling to SC * Updates styling for timeslider input. This add the icon back and fixes bugs on Firefox

* displays exchanges for all hours * Generate new mock data * fix timeslider test * Uses fixture data directly in cypress test * Update web/cypress/integration/timeslider.spec.js Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

* Fix formatting * Fix loading jumping

* Add date to map tooltip * zonemap colors correctly updates * Add aggregate label * Disable wind and solar data

* Fix graph bin width * Fix rendering errors * Minor changes Co-authored-by: Markus Killendahl <markus.killendahl@tmrow.com>

* Unrelated bug fix * Ensure aggregate label appears

VIKTORVAV99

Just took a quick look at the code changes and didn't find anything major but I left 2 suggestions for the ci (workflow) files.

.github/workflows/CI.yml

.github/workflows/jest.yml

Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com>

Kongkille · 2022-07-18T17:02:07Z

Just took a quick look at the code changes and didn't find anything major but I left 2 suggestions for the ci (workflow) files.

Thanks! Most of this code should also have been reviewed throughout so hopefully, it all works.

In either case, we'll probably run into a few issues since the infrastructure and UI has been changed so drastically but i'll be monitoring a lot over the next couple of weeks :-)

VIKTORVAV99 · 2022-07-18T17:10:39Z

Just took a quick look at the code changes and didn't find anything major but I left 2 suggestions for the ci (workflow) files.

Thanks! Most of this code should also have been reviewed throughout so hopefully, it all works.

In either case, we'll probably run into a few issues since the infrastructure and UI has been changed so drastically but i'll be monitoring a lot over the next couple of weeks :-)

Yeah I expect we'll find some small UI issues (missing translations mainly) and such as well but it's expected. Should be no major issues though since like you said it has been reviewed throughout (I've been keeping an eye on some of the PRs as well 😉).

VIKTORVAV99 · 2022-07-19T07:36:16Z

@Kongkille let me know if you need a Approving review, I haven't had time to test it all locally yet but like you said before it should already have passed several reviews.

Kongkille · 2022-07-19T07:37:11Z

@Kongkille let me know if you need a Approving review, I haven't had time to test it all locally yet but like you said before it should already have passed several reviews.

All good merging now. There are some internal deploy processes i need to run but hopefully it's up in a few hours! :)

VIKTORVAV99 · 2022-07-19T07:38:19Z

@Kongkille let me know if you need a Approving review, I haven't had time to test it all locally yet but like you said before it should already have passed several reviews.

All good merging now. There are some internal deploy processes i need to run but hopefully it's up in a few hours! :)

Great! Looking forward to seeing it all in action! 🎉

Markus Killendahl and others added 30 commits June 21, 2022 09:49

[historical-view] use history as default (#4264)

2858521

* Remove all related to feature flag * add lockfile

Adds datetimes to mockserver response

a86de8e

Updates mockserver and fixes tests (#4278)

b9ebb36

* Adds new history files * Adds new state files * Changes mockserver to use new files * Fixes exchange refactor bug to make test pass * Fixes api test * Lints file

[Historical-view] Add formatting and function (#4275)

9edb57f

Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

[Historical-view] Enable exchanges (#4274)

b6fc654

[historical-view] Adds loading spinner to timecontroller (#4279)

fbd08a2

* disable datedisplay on load * install react-spinner lib * add loading and refactor timeaxis * remove testing selector * change color of pulseloader

Fix production/consumption toggle and sources being duplicated (#4280)

bf8dd37

Fixes inverted if statement

29bee43

Fix jests tests for datareducer (#4282)

529e79d

Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

Allow empty zonestate overviews from app-backend

484d9b7

Revert "Allow empty zonestate overviews from app-backend"

f18d94f

This reverts commit 484d9b7.

merge

48e7b74

Adds timeslider icon and fixes styling on Firefox (#4297)

934ebcc

* Moves styling to SC * Updates styling for timeslider input. This add the icon back and fixes bugs on Firefox

Merge branch 'historical-view-v1' of https://github.com/tmrowco/elect…

8cd018a

…ricitymap-contrib into historical-view-v1

[Historical view] Adds more e2e testing of the new feature (#4283)

386f5a7

Changes mockserver to use nodemon (#4299)

6b3412e

* Adds start script that uses nodemon * Updates dependencies

Adds expiration (#4305)

4b95e77

Fix missing countrypanel elements (#4307)

15abccf

Adds timeslider icon and fixes styling on Firefox (#4297)

34c30e2

* Moves styling to SC * Updates styling for timeslider input. This add the icon back and fixes bugs on Firefox

Enable exchanges in 24 hour view (#4309)

8d78995

* displays exchanges for all hours * Generate new mock data * fix timeslider test * Uses fixture data directly in cypress test * Update web/cypress/integration/timeslider.spec.js Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

Updates to timeslider and graphs (#4312)

7b6e687

fixes test

dafeb0e

Change timecontrols a bit (#4311)

497efab

* Fix formatting * Fix loading jumping

Adds infobox (#4310)

8df9ddd

[Historical-view] Adds a few nice touches (#4325)

0442ad6

* Add date to map tooltip * zonemap colors correctly updates * Add aggregate label * Disable wind and solar data

Markus Killendahl and others added 6 commits July 5, 2022 10:27

web icons updated

189e260

Historical view fix width graph (#4327)

6253adb

* Fix graph bin width * Fix rendering errors * Minor changes Co-authored-by: Markus Killendahl <markus.killendahl@tmrow.com>

Fix aggregate label (#4352)

dc17a9b

* Unrelated bug fix * Ensure aggregate label appears

only refetch when in hourly mode

ee9bf06

Merge and tweaks

9acdc4a

Track aggregation change

9ebc03b

github-actions bot added dependencies Pull requests that update a dependency file frontend 🎨 infrastructure translations 🗣 labels Jul 18, 2022

VIKTORVAV99 reviewed Jul 18, 2022

View reviewed changes

.github/workflows/CI.yml Outdated Show resolved Hide resolved

.github/workflows/jest.yml Outdated Show resolved Hide resolved

Markus Killendahl and others added 5 commits July 18, 2022 17:35

Fix vertical scroll on countryPanel

6d4a904

Remove inconsistent lastupdatedtime

448a4d0

Makes modal dots easier to see on mobile

f24fb3e

Update .github/workflows/CI.yml

f31ef8f

Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com>

Update .github/workflows/jest.yml

a0ced80

Co-authored-by: Viktor Andersson <30777521+VIKTORVAV99@users.noreply.github.com>

Merge branch 'master' into mk/historical-view-merge

7fb3add

Kongkille enabled auto-merge (squash) July 19, 2022 07:29

VIKTORVAV99 linked an issue Jul 19, 2022 that may be closed by this pull request

feature=history has new accessibility issues #4301

Closed

Merge branch 'master' into mk/historical-view-merge

1d666a3

VIKTORVAV99 linked an issue Jul 19, 2022 that may be closed by this pull request

Simplify state and history files object structure #4049

Closed

Kongkille disabled auto-merge July 19, 2022 07:36

Kongkille merged commit 1b287d9 into master Jul 19, 2022

Kongkille deleted the mk/historical-view-merge branch July 19, 2022 07:36

VIKTORVAV99 mentioned this pull request Jul 20, 2022

UK live figure does not match 24 hour plot #4144

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Historical view v1 #4353

Historical view v1 #4353

Kongkille commented Jul 18, 2022

VIKTORVAV99 left a comment

Kongkille commented Jul 18, 2022

VIKTORVAV99 commented Jul 18, 2022 •

edited

VIKTORVAV99 commented Jul 19, 2022

Kongkille commented Jul 19, 2022

VIKTORVAV99 commented Jul 19, 2022

Historical view v1 #4353

Historical view v1 #4353

Conversation

Kongkille commented Jul 18, 2022

Preview

VIKTORVAV99 left a comment

Choose a reason for hiding this comment

Kongkille commented Jul 18, 2022

VIKTORVAV99 commented Jul 18, 2022 • edited

VIKTORVAV99 commented Jul 19, 2022

Kongkille commented Jul 19, 2022

VIKTORVAV99 commented Jul 19, 2022

VIKTORVAV99 commented Jul 18, 2022 •

edited