432 account overview list details page #605

nhoening · 2023-03-09T17:18:15Z

Accounts API
Small improvements: Health API documented, user.last_seen in CLI account overview
Account list and details page

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

coveralls · 2023-03-09T17:24:45Z

Pull Request Test Coverage Report for Build 4720206723

94 of 110 (85.45%) changed or added relevant lines in 8 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+0.1%) to 64.793%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
flexmeasures/data/schemas/account.py	15	16	93.75%
flexmeasures/data/services/accounts.py	6	10	60.0%
flexmeasures/ui/crud/accounts.py	23	34	67.65%

Totals
Change from base Build 4700729859:	0.1%
Covered Lines:	7071
Relevant Lines:	10158

💛 - Coveralls

flexmeasures/api/v3_0/tests/test_accounts_api.py

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

flexmeasures/api/v3_0/accounts.py

flexmeasures/api/v3_0/users.py

flexmeasures/data/services/accounts.py

Signed-off-by: GustaafL <guus@seita.nl>

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

…ed for filtering Signed-off-by: Nicolas Höning <nicolas@seita.nl>

I had overlooked additional contributions from Guus added to this PR. Need to review still.

flexmeasures/ui/crud/accounts.py

flexmeasures/ui/templates/crud/account.html

flexmeasures/ui/templates/crud/accounts.html

flexmeasures/ui/tests/test_account_crud.py

flexmeasures/ui/tests/utils.py

flexmeasures/ui/tests/test_account_crud.py

flexmeasures/ui/templates/crud/account.html

Signed-off-by: GustaafL <guus@seita.nl>

Flix6x

Thanks for revising. Only a few small changes left, and one idea for a follow-up ticket.

flexmeasures/api/v3_0/accounts.py

flexmeasures/ui/crud/accounts.py

flexmeasures/ui/templates/crud/account.html

Signed-off-by: GustaafL <guus@seita.nl>

Flix6x

Thanks for implementing the revisions. Three things left that I see:

Docstring of account index API (see unresolved comment)
Missing changelog entries (general changelog and API changelog); we indicate this with a label on the PR, feel free to remove the label after pushing a changelog entry
Can you create the follow-up ticket I mentioned? (see unresolved comment)

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

nhoening · 2023-03-23T08:57:40Z

@GustaafL I fixed the issue in the API docs, and I created the issue @Flix6x proposed.
The last things to do is changelog entries - it would be good if you can try your hand on those - and then this should be done!

Flix6x

Thanks for addressing my comments. I've now moved on from a line-by-line review to reviewing the new functionality (by checking out the branch, running FlexMeasures and running through the new pages manually). I saw some missing styling and missing auth decorators.

@nhoening The accounts page is not more informative than the user's own account page, in case the user does not have read access to multiple accounts. Should we hide the menu link for such (non-admin) users?

flexmeasures/ui/templates/crud/accounts.html

flexmeasures/ui/crud/accounts.py

flexmeasures/ui/templates/crud/accounts.html

nhoening · 2023-03-25T12:31:52Z

I wrote in #432:

Also, the main menu entry "accounts" should appear for admins (and link to the account list). The "users" entry should appear for everyone else (as it shows the users in their account).

So that remains a TODO for @GustaafL

Is that agreeable, @Flix6x ?

Flix6x · 2023-03-25T13:43:07Z

Is that agreeable, @Flix6x ?

Yes, with one clarification: the users page should appear for all users, not just for non-admin users. Do you agree?

nhoening · 2023-03-25T14:05:17Z

No, as you should easily reach the users through the account pages.

Signed-off-by: GustaafL <guus@seita.nl>

nhoening

I found a few improvements while trying out the new UI :)

flexmeasures/ui/templates/crud/accounts.html

flexmeasures/ui/templates/crud/account.html

flexmeasures/ui/templates/crud/accounts.html

flexmeasures/ui/templates/crud/account.html

Signed-off-by: GustaafL <guus@seita.nl>

* Add AccountRoleSchema and connect it to the AccountSchema Signed-off-by: F.N. Claessen <felix@seita.nl> * Update test Signed-off-by: F.N. Claessen <felix@seita.nl> --------- Signed-off-by: F.N. Claessen <felix@seita.nl> Co-authored-by: Flix6x <flix6x@users.noreply.github.com>

Signed-off-by: GustaafL <guus@seita.nl>

Flix6x

I have some other comments, but those concern the front-end UX so it will be easier to go through those in person (video call).

documentation/api/change_log.rst

documentation/changelog.rst

flexmeasures/api/v3_0/accounts.py

flexmeasures/ui/crud/users.py

Signed-off-by: GustaafL <guus@seita.nl>

nhoening

I have a few comments about the menu and I'd like to list public assets on their own account page.

flexmeasures/ui/templates/defaults.jinja

flexmeasures/ui/templates/crud/account.html

documentation/api/change_log.rst

flexmeasures/ui/templates/defaults.jinja

Signed-off-by: GustaafL <guus@seita.nl>

Signed-off-by: F.N. Claessen <felix@seita.nl>

…list-details-page # Conflicts: # documentation/changelog.rst # flexmeasures/ui/templates/crud/users.html

Signed-off-by: F.N. Claessen <felix@seita.nl>

Flix6x

Thanks for amending! NB I fixed a few more issues I found, including the merge conflict with PR #634 (I also copyied the fix in that PR to our new copy of the users html table).

nhoening added 3 commits March 9, 2023 14:13

Add user.last_seen to CLI command show account

cc91a96

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

Document health API

6f878dd

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

Start /accounts API: GET endpoints

4318518

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

nhoening linked an issue Mar 9, 2023 that may be closed by this pull request

Account overview: list & details page #432

Closed

remove two debugging statements

aa80880

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

nhoening requested a review from GustaafL March 10, 2023 08:58

GustaafL approved these changes Mar 13, 2023

View reviewed changes

flexmeasures/api/v3_0/tests/test_accounts_api.py Outdated Show resolved Hide resolved

nhoening added 4 commits March 13, 2023 18:27

use utility function for headers, fix typo

4364b52

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

support new-style Optional shorthand in Python > 3.10

f0988f2

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

Merge branch 'main' into 432-account-overview-list-details-page

56d4dea

update the number of accounts, as PR 602 added two more

f0e5a32

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

Flix6x requested changes Mar 14, 2023

View reviewed changes

flexmeasures/api/v3_0/accounts.py Outdated Show resolved Hide resolved

flexmeasures/api/v3_0/accounts.py Outdated Show resolved Hide resolved

flexmeasures/api/v3_0/users.py Outdated Show resolved Hide resolved

flexmeasures/data/services/accounts.py Show resolved Hide resolved

GustaafL and others added 3 commits March 15, 2023 09:40

feat(CRUD): add R of accounts CRUD

a765bc5

Signed-off-by: GustaafL <guus@seita.nl>

three textual corrections

cbf73ce

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

get_accounts util function returns empty list if unknown role is pass…

869890b

…ed for filtering Signed-off-by: Nicolas Höning <nicolas@seita.nl>

nhoening added this to the 0.13.0 milestone Mar 15, 2023

Flix6x previously approved these changes Mar 15, 2023

View reviewed changes

Flix6x requested changes Mar 15, 2023

View reviewed changes

feat(CRUD): updated accounts tests and added links to user pages

a33f42f

Signed-off-by: GustaafL <guus@seita.nl>

Flix6x added the Still Needs Changelog Entry label Mar 20, 2023

Flix6x requested changes Mar 20, 2023

View reviewed changes

GustaafL added 2 commits March 21, 2023 13:08

feat(CRUD): add accounts to navbar and get single account through api

19d49f7

Signed-off-by: GustaafL <guus@seita.nl>

feat(CRUD): review comments implemented

2310160

Signed-off-by: GustaafL <guus@seita.nl>

GustaafL requested a review from Flix6x March 21, 2023 12:34

Flix6x requested changes Mar 21, 2023

View reviewed changes

nhoening mentioned this pull request Mar 23, 2023

Allow filtering accounts by role in API #611

Open

fix docstring in API /index

24d40dd

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

GustaafL added API UI labels Mar 24, 2023

Flix6x requested changes Mar 25, 2023

View reviewed changes

flexmeasures/ui/templates/crud/accounts.html Show resolved Hide resolved

flexmeasures/ui/crud/accounts.py Show resolved Hide resolved

flexmeasures/ui/templates/crud/accounts.html Outdated Show resolved Hide resolved

feat(account): accountpage updated with asset and user info

8509d10

Signed-off-by: GustaafL <guus@seita.nl>

nhoening commented Mar 29, 2023

View reviewed changes

GustaafL and others added 4 commits April 4, 2023 15:19

feat(accounts): Add user and asset counts to accounts page

d098f03

Signed-off-by: GustaafL <guus@seita.nl>

test

cb4d78d

Signed-off-by: GustaafL <guus@seita.nl>

feat(accounts): account role names added to the account pages

bcd584f

Signed-off-by: GustaafL <guus@seita.nl>

GustaafL requested a review from Flix6x April 6, 2023 10:21

Merge branch 'main' into 432-account-overview-list-details-page

b768c1b

Flix6x reviewed Apr 7, 2023

View reviewed changes

refactor(users): review changes, updated changelog and typing

8d152b5

Signed-off-by: GustaafL <guus@seita.nl>

nhoening commented Apr 11, 2023

View reviewed changes

flexmeasures/ui/templates/defaults.jinja Outdated Show resolved Hide resolved

flexmeasures/ui/templates/defaults.jinja Outdated Show resolved Hide resolved

flexmeasures/ui/templates/crud/account.html Outdated Show resolved Hide resolved

Flix6x reviewed Apr 11, 2023

View reviewed changes

documentation/api/change_log.rst Outdated Show resolved Hide resolved

flexmeasures/ui/templates/defaults.jinja Outdated Show resolved Hide resolved

refactor(crud): review changes to html templates

1b342fe

Signed-off-by: GustaafL <guus@seita.nl>

GustaafL requested a review from Flix6x April 14, 2023 14:23

Flix6x added 7 commits April 17, 2023 10:50

Remove redundant lines

10d4d9a

Signed-off-by: F.N. Claessen <felix@seita.nl>

Fix type annotations

7413643

Signed-off-by: F.N. Claessen <felix@seita.nl>

Fix button for including inactive users

e1f49e8

Signed-off-by: F.N. Claessen <felix@seita.nl>

Move button to the side

becb83d

Signed-off-by: F.N. Claessen <felix@seita.nl>

Merge remote-tracking branch 'origin/main' into 432-account-overview-…

711396a

…list-details-page # Conflicts: # documentation/changelog.rst # flexmeasures/ui/templates/crud/users.html

Fix data sort on copy of users table

557fbaf

Signed-off-by: F.N. Claessen <felix@seita.nl>

Add missing decorators to fix redirects to the login page

09f2a52

Signed-off-by: F.N. Claessen <felix@seita.nl>

Flix6x approved these changes Apr 17, 2023

View reviewed changes

GustaafL merged commit 67d2236 into main Apr 17, 2023
5 checks passed

GustaafL deleted the 432-account-overview-list-details-page branch April 17, 2023 12:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

432 account overview list details page #605

432 account overview list details page #605

nhoening commented Mar 9, 2023 •

edited

coveralls commented Mar 9, 2023 •

edited

Flix6x left a comment

Flix6x left a comment

nhoening commented Mar 23, 2023

Flix6x left a comment

nhoening commented Mar 25, 2023

Flix6x commented Mar 25, 2023

nhoening commented Mar 25, 2023

nhoening left a comment

Flix6x left a comment

nhoening left a comment

Flix6x left a comment

432 account overview list details page #605

432 account overview list details page #605

Conversation

nhoening commented Mar 9, 2023 • edited

coveralls commented Mar 9, 2023 • edited

Pull Request Test Coverage Report for Build 4720206723

💛 - Coveralls

Flix6x left a comment

Choose a reason for hiding this comment

Flix6x left a comment

Choose a reason for hiding this comment

nhoening commented Mar 23, 2023

Flix6x left a comment

Choose a reason for hiding this comment

nhoening commented Mar 25, 2023

Flix6x commented Mar 25, 2023

nhoening commented Mar 25, 2023

nhoening left a comment

Choose a reason for hiding this comment

Flix6x left a comment

Choose a reason for hiding this comment

nhoening left a comment

Choose a reason for hiding this comment

Flix6x left a comment

Choose a reason for hiding this comment

nhoening commented Mar 9, 2023 •

edited

coveralls commented Mar 9, 2023 •

edited