-
Notifications
You must be signed in to change notification settings - Fork 254
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
CSV Changes with Redux Toolkit and Formatting Updates #1284
base: development
Are you sure you want to change the base?
CSV Changes with Redux Toolkit and Formatting Updates #1284
Conversation
…with csv uploads manually and looks to be working
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks to @mikedivine and anyone else involved in this PR. Overall, it works as desired. I am releasing this as comments to get my thoughts to the team. I suspect we will want to discuss at an upcoming meeting. I still need to do some more careful reading/testing but maybe that can wait until these comments are decided. As always, I appreciate your thoughts and I'm here to clarify, esp. given my thoughts were released quickly.
…grayed out if on that page
…ed create and edit meter with it. Fixed bug where the form metername wasn't being set on a newly created meter
…pload readings and create meters via csv
…rly and daily. Updated the API to only use that option and refreshAllReadingViews if requested.
…ference optional in the file upload component.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for all the updates. I have made some comments to address. I'm also delaying final testing until this is done and development is merged. This is looking good and I think it should all be done soon.
- The pipeline tests were modified to use identifier and also for removal of the createMeter option. - uploadMeters still used name in some places even though identifier supplied so fixed.
I just pushed a commit to fix the pipeline test for identifier use and no create meter. It also fixes meter upload to consistently use identifier. |
…s added to the DB and update redux accordingly
… having a chosen meter update the readingsData state. Removed null options called 'meter' from certain Types such as TimeSortTypes and BooleanMeterTypes which signaled to use the meter value or the default value. This is now the current way it is done even without these types. Also updated some minor changes from review comment.s
…me state issues. Change Readings upload to closely mimick Create/Edit Meter layout.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for another update. Testing did not find issues. I have a few more comments that I hope are easy to address. Other than that it seems ready.
… to meterData to allow them to see meter defaults when uploading meter readings manually via CSV files
…ad of the exact same BooleanTypes mirroed in a different location. Also fixed duplicated translations by removing them and altering CSV components to use the ones other components are using.
…shown to choose which meter is updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was not sure if this was ready for review but I wanted to move it forward. I've made one comment to address and there are a couple of old ones to finalize. If you want to discuss the new one then let me know as it may not be trivial. Thanks for all your efforts.
…ge becayse the frontend CSV API is expecting a string back for the message.
…eturn the error.message becayse the frontend CSV API is expecting a string back for the message. This reverts commit a9b8a2b.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see I have to submit review for you to see comments
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see I have to submit review for you to see comments
I just merged in development since recent PRs caused a merge conflict and I had meant to do this PR earlier. I'll get it to work. After that there is one item unresolved that remains. @mikedivine Can you look over the last comment and also verify my large merge did not cause an issue. My basic testing did not find any issues outside the last comment. |
- Incorrectly merged in some code. - username vs email for user
I'm going to work with @mikedivine on the failed test to resolve meter name vs identifier. |
…'true', 'false' so Curl command users can user either. Front End will now use strictly boolean values when sending to the CSV API. Also Fixed State issue on Readings CSV component.
…ed fields when cumulative is set to 'no'. This mirrors CreateMeter component
Description
Removed CSV container and split into separate CSV pages. Uses Create Meter Modal in Readings and seems to be working with Redux.
@rfrost30 has helped contribute on this PR.
Fixes #1198
Type of change
Checklist
Limitations
None