Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns #787

Deelane · 2022-07-24T21:50:31Z

Description

Units Page

Overhauled the units page as introduced in PR 766, including additional functionality, bugfixes, and updates. The page is now complete and is being used as the template for the creation of similar pages like the Meters and Conversions pages.

Notable changes are as follows:

Components converted to hooks and now uses hooks to access and alter Redux store and local state.
Container files removed.
Actions optimized, unnecessary actions removed.
State/Reducers optimized, unnecessary state removed.
Fixed bugs with reducers not properly updating store state.
Updated UI visuals.

Meters Page (TODO)

Updated to match units page functionality and interface using units page as template. This is partly done at this time in code included in this PR.

Select Component Dropdowns

Added functionality and fixed bugs associated with selecting groups, meters, and units from the dropdowns in the ChartDataSelectComponent. The component should now work as intended.

Notable changes are as follows:

Added functions for determining compatibility for groups and meters with other selected items.
Fixed bugs where store state was not properly updated.
Fixed bugs associated with unselecting a unit.
Select items are now properly disabled if they are incompatible with other items.
Added functionality allowing for switching between units without clearing the unit.
Clearing the selected unit now clears all meters and groups, resetting the graph.

New Graphic Rate Menu

Added a new rate menu allowing for changing of the time unit for line graphs.

Issues Addressed

Partly Addresses #726
TODO Fixes #644

Developer test data

Code was added to create units, meters and groups for testing the updated system. I directly adds via code rather than using CSV files (previous CSV used for this are now removed). The script testData now uses this code.

TODO Need some more added to deal with rate changes because kWh and kW are treated specially.

Type of change

Note merging this changes the node modules
Note merging this changes the database configuration.
This change requires a documentation update

Checklist

I have followed the OED pull request ideas
I have removed text in ( ) from the issue request

Limitations

The TODOs must still be addressed.

…ceGeneralization

…yDashboard/OED into resourceGeneralization

edited units details component, container, etc

added header and footer to UnitDetailsComponent

…ine/OED into sagar

Sagar

…se yet

Added the button to identifier. Need to fix the logic

Add SecInRate edit button

Revert "Add SecInRate edit button"

Revert "Added the button to identifier. Need to fix the logic"

…ine/OED into Andrew

Andrew

…disabled if incompatible, non-admin selects now properly hidden, groups/meters without default graphic unit now disabled when no unit is selected, fixed bug where selecting unit first did not allow graphing, added buttons to clear selects

- Allow meters & groups to control displayable value. - Allow meters to not have a unit (-99). - Added some meters/groups for new options/testing.

…Deelane/OED into units-page-group-dropdown-merge

…fferent time rates for line graphs of specific unit types

- Put back special label for kWh/hour by fixing check. - Remove TODO on raw/flow since flow correctly handled above. - Fix hover label so matches new rate value plotted. - Add translations for hour, minute, second in French/Spanish.

We don't include these types of files to the repo.

- Update how label kWh & kW and don't allow rate change on these. - Fix so hoverText on line graphic shows scaling value. - Added lots of missing translations outside English and removed a few that no longer used. - Put in unit create/edit tooltip help & links - Remove test script and CSV files for unit tests as now included in TesData - Remove debug check that only one meter/group when selectedUnit is -99 - Some small changes to comment wording. - Lots of small formatting changes.

huss · 2022-07-26T20:17:36Z

I just pushed changes to the PR. See commit message/code changes for details.

I also note that the check is failing. All GitHub Action checks started failing recently so this is not an issue with this PR. I did run them locally and they all passed so I think the PR is okay.

My review should be posted soon.

huss

Overall this works as expected. I did not look at the meter code yet since it was not done. I have left some comments to address. Thanks for the good work.

src/client/app/components/ChartDataSelectComponent.tsx

src/client/app/components/RouteComponent.tsx

src/client/app/components/unit/CreateUnitModalComponent.tsx

src/client/app/components/unit/EditUnitModalComponent.tsx

src/client/app/types/redux/actions.ts

src/client/app/utils/api/unitsApi.ts

src/server/routes/units.js

huss · 2022-07-27T16:27:24Z

@wootent There are two comments on this PR that seem to involve code you added. They ask whether actions are needed since they don't seem to be used at this time. They are: EDIT_METER_DETAILS and DELETE_EDITED_METER. However, they might be used in upcoming work or I missed something. Could you let us know? Thanks.

huss · 2022-07-27T16:28:38Z

The update by @Deelane covers everything involving them. The PR seems fine for units and the dropdown menus. It is on hold since it also has partly completed meter page work.

- Add Water quantity and flow units/conversions/meters to allow testing of rate menu - Allow rate for units for test data - Always try to insert standard units in case missing for test data - Fix up Postgres commands to remove all test data - Add TODO about unused action

huss · 2022-07-28T18:40:44Z

I just pushed changes for test data for rate meters and a comment on the extra action.

huss · 2022-07-31T17:24:17Z

The meter work is in PR #786 so merging this so others can easily incorporate.

Andrew and others added 30 commits February 23, 2022 06:03

added files for admin unit page

bad8910

Merge branch 'OpenEnergyDashboard:resourceGeneralization' into resour…

dfdd1fe

…ceGeneralization

added front-end starter code for admin units page

b573378

added necessary files for displaying units

ef1263a

finished unit display page, added page and form for adding units

4bd9970

Merge branch 'resourceGeneralization' of https://github.com/OpenEnerg…

3df5e1b

…yDashboard/OED into resourceGeneralization

added ES and FR translation messages for unit page

21147ad

edited UnitsDetailContainer

301addc

edited UnitsDetailContainer

d0a0561

edited units details component, container, etc

069df2f

Merge pull request #1 from andrew-cline/sagar

87c0ee0

edited units details component, container, etc

added header and footer to UnitDetailComponent

0c9eb3b

Merge pull request #2 from andrew-cline/resourceGenJustin

40b5e2b

added header and footer to UnitDetailsComponent

testing

7221074

Merge branch 'resourceGeneralization' of https://github.com/andrew-cl…

b8d2697

…ine/OED into sagar

IDK

3a9d972

Merge pull request #3 from andrew-cline/sagar

0a8641e

Sagar

Added the button to identifier. Need to fix the logic

65fcb98

added SecInRate update; updates in client but does not save to databa…

16f292f

…se yet

added button to unitRepresent column in UnitViewComponent

78679a9

Merge pull request #4 from andrew-cline/sagar

2ee835e

Added the button to identifier. Need to fix the logic

Merge branch 'resourceGeneralization' into resourceGenJustin

c21e557

Merge pull request #5 from andrew-cline/resourceGenJustin

977af8d

Add SecInRate edit button

Revert "Add SecInRate edit button"

e786a35

Merge pull request #6 from andrew-cline/revert-5-resourceGenJustin

6d97d4a

Revert "Add SecInRate edit button"

Revert "Added the button to identifier. Need to fix the logic"

e56336b

Merge pull request #7 from andrew-cline/revert-4-sagar

81f5c11

Revert "Added the button to identifier. Need to fix the logic"

Merge branch 'resourceGeneralization' of https://github.com/andrew-cl…

197499a

…ine/OED into Andrew

added a button to the notes column in units page

280bfc2

Merge pull request OpenEnergyDashboard#8 from andrew-cline/Andrew

099f3db

Andrew

wootent and others added 14 commits July 21, 2022 15:23

fixed formmated messages

e3e519b

UI updates

6d20d44

add test groups

9b34341

updates

4c46f74

update unit testData

983fa46

- Allow meters & groups to control displayable value. - Allow meters to not have a unit (-99). - Added some meters/groups for new options/testing.

Merge branch 'units-page-group-dropdown-merge' of https://github.com/…

407dc68

…Deelane/OED into units-page-group-dropdown-merge

Removed buttons, extraneous code and comments

8e901c5

fix missing units on meter in testData

f09d0bf

Merge branch 'units-page-group-dropdown-merge' of https://github.com/…

dc6453d

…Deelane/OED into units-page-group-dropdown-merge

Added first version of new rate menu allowing for the selection of di…

359db6c

…fferent time rates for line graphs of specific unit types

update rate menu code

c008d4c

- Put back special label for kWh/hour by fixing check. - Remove TODO on raw/flow since flow correctly handled above. - Fix hover label so matches new rate value plotted. - Add translations for hour, minute, second in French/Spanish.

Delete settings.json

71e654a

We don't include these types of files to the repo.

huss requested changes Jul 26, 2022

View reviewed changes

Deelane added 2 commits July 26, 2022 15:56

Removed unused code, addressed comments

52114d6

Removed more unused code, addressed comments

7ac4bd9

huss changed the title ~~Units Page, (TODO Meters Page, Conversions Page), Select Component Dropdowns, (TODO New Graphic Rate Menu)~~ Units Page, (TODO Meters Page), Select Component Dropdowns, New Graphic Rate Dropdowns Jul 27, 2022

Deelane added 2 commits July 28, 2022 16:47

minor update to ensure submitting array is overwritten properly

8e090a0

small function call optimization

ee558c7

huss changed the title ~~Units Page, (TODO Meters Page), Select Component Dropdowns, New Graphic Rate Dropdowns~~ Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns Jul 31, 2022

huss approved these changes Jul 31, 2022

View reviewed changes

huss merged commit 5378708 into OpenEnergyDashboard:resourceGeneralization Jul 31, 2022

huss mentioned this pull request Oct 2, 2022

Meter Drop Down #770

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns #787

Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns #787

Deelane commented Jul 24, 2022 •

edited

Loading

huss commented Jul 26, 2022

huss left a comment

huss commented Jul 27, 2022

huss commented Jul 27, 2022

huss commented Jul 28, 2022

huss commented Jul 31, 2022

Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns #787

Units Page, Select Component Dropdowns, New Graphic Rate Dropdowns #787

Conversation

Deelane commented Jul 24, 2022 • edited Loading

Description

Units Page

Meters Page (TODO)

Select Component Dropdowns

New Graphic Rate Menu

Issues Addressed

Developer test data

Type of change

Checklist

Limitations

huss commented Jul 26, 2022

huss left a comment

Choose a reason for hiding this comment

huss commented Jul 27, 2022

huss commented Jul 27, 2022

huss commented Jul 28, 2022

huss commented Jul 31, 2022

Deelane commented Jul 24, 2022 •

edited

Loading