432 account overview list details page

flexmeasures/ui/__init__.py

@@ -37,11 +37,13 @@ def register_at(app: Flask):
 
     from flexmeasures.ui.crud.assets import AssetCrudUI
     from flexmeasures.ui.crud.users import UserCrudUI
+    from flexmeasures.ui.crud.accounts import AccountCrudUI
     from flexmeasures.ui.views.sensors import SensorUI
 
     AssetCrudUI.register(app)
     UserCrudUI.register(app)
     SensorUI.register(app)
+    AccountCrudUI.register(app)
 
     import flexmeasures.ui.views  # noqa: F401 this is necessary to load the views
 

flexmeasures/ui/crud/accounts.py

@@ -0,0 +1,56 @@
+from flask import url_for
+from flask_classful import FlaskView
+from flask_login import current_user
+from flexmeasures.ui.crud.api_wrapper import InternalApi
+
+from flexmeasures.auth.policy import ADMIN_READER_ROLE, ADMIN_ROLE
+from flexmeasures.ui.utils.view_utils import render_flexmeasures_template
+
+
+def get_accounts():
+    """/accounts"""
+    accounts = []
+    if current_user.has_role(ADMIN_ROLE) or current_user.has_role(ADMIN_READER_ROLE):
+        accounts_response = InternalApi().get(url_for("AccountAPI:index"))
+        accounts = accounts_response.json()
+    else:
+        accounts = [
+            {
+                "id": current_user.user_account.id,
+                "name": current_user.account.name,
+                "account_roles": [
+                    current_user.account.account_roles[i].id
+                    for i in current_user.account.account_roles
+                ],
+            }
+        ]
+
+    return accounts
+
+
+def get_account(account_id: str):
+    account_response = InternalApi().get(url_for("AccountAPI:get", id=account_id))
+    account = account_response.json()
+
+    return account
+
+
+class AccountCrudUI(FlaskView):
+    route_base = "/accounts"
+    trailing_slash = False
+
+    def index(self):
+        """/accounts"""
+        accounts = get_accounts()
+
+        return render_flexmeasures_template(
+            "crud/accounts.html",
+            accounts=accounts,
+        )
+
+    def get(self, account_id: str):
+        account = get_account(account_id)
+        return render_flexmeasures_template(
+            "crud/account.html",
+            account=account,
+        )

flexmeasures/ui/templates/crud/account.html

@@ -0,0 +1,35 @@
+{% extends "base.html" %}{% block title %} {% endblock %} {% block divs %} {% if account %}
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-8">
+            <div class="account-data-table card">
+                <h2>Account overview</h2>
+                <small>Account: {{ account["name"] }}</small>
+                <table class="table table-striped table-responsive">
+                    <tbody>
+                        <tr>
+                            <td>
+                                ID
+                            </td>
+                            <td>
+                                {{ account["account_id"] }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                Account Roles
+                            </td>
+                            <td>
+                                {{ account["account_roles"] }}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="col-sm-2"></div>
+    </div>
+</div>
+
+{% endif %} {% endblock %}

flexmeasures/ui/templates/crud/accounts.html

@@ -0,0 +1,38 @@
+{% extends "base.html" %} {% set active_page = "accounts" %} {% block title %} Account listing {% endblock %} {% block divs %}
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-2"></div>
+        <div class="col-sm-8">
+            <table class="table table-striped table-responsive paginate">
+                <thead>
+                    <tr>
+                        <th>Account</th>
+                        <th>ID</th>
+                        <th>Roles</th>
+
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for account in accounts %}
+                    <tr>
+                        <td>
+                            {{ account["name"] }}
+                        </td>
+                        <td>
+                            {{ account["id"] }}
+                        </td>
+                        <td>
+                            {{ account["account_roles"]|join(", ") }}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="col-sm-2"></div>
+</div>
+</div>
+
+{% block paginate_tables_script %} {{ super() }} {% endblock %} {% endblock%}

flexmeasures/ui/tests/test_account_crud.py

@@ -0,0 +1,71 @@
+from flask_login import current_user
+from flask import url_for
+from flexmeasures.ui.crud.api_wrapper import InternalApi
+from flexmeasures.ui.crud.accounts import get_accounts, get_account
+from flexmeasures.ui.tests.utils import mock_account_response
+
+
+def test_account_list(client, as_admin, requests_mock):
+    requests_mock.get(
+        "http://localhost//api/v3_0/accounts",
+        status_code=200,
+        json=mock_account_response(multiple=True),
+    )
+    requests_mock.get(
+        "http://localhost//api/v3_0/accounts/1",
+        status_code=200,
+        json=mock_account_response(multiple=True),
+    )
+    account_index = InternalApi().get(url_for("AccountAPI:index"))
+
+    get_accounts_response = InternalApi().get(url_for("AccountAPI:get", id=1))
+    print(get_accounts_response)
+    assert account_index.status_code == 200
+    # assert 1==2
+
+
+def test_account(client, as_admin, requests_mock):
+    mock_account = mock_account_response(as_list=False)
+    requests_mock.get(
+        "http://localhost//api/v3_0/accounts/1",
+        status_code=200,
+        json=mock_account,
+    )
+
+    get_account_response = InternalApi().get(url_for("AccountAPI:get", id=1))
+    print(get_account_response.json())
+    print(current_user.account)
+    # assert 1 == 2
+
+
+def test_get_accounts(client, as_admin, requests_mock):
+    requests_mock.get(
+        "http://localhost//api/v3_0/accounts",
+        status_code=200,
+        json=mock_account_response(multiple=True),
+    )
+    accounts = get_accounts()
+    print(accounts)
+    assert get_accounts() == [
+        {"id": 1, "name": "test_account", "account_roles": []},
+        {
+            "id": 2,
+            "name": "test_account",
+            "account_roles": [],
+            "account_name": "test_account2",
+        },
+    ]
+
+
+def test_get_account(client, as_admin, requests_mock):
+    mock_account = mock_account_response(as_list=False)
+    requests_mock.get(
+        "http://localhost//api/v3_0/accounts/1",
+        status_code=200,
+        json=mock_account,
+    )
+    assert get_account(account_id="1") == {
+        "id": 1,
+        "name": "test_account",
+        "account_roles": [],
+    }

flexmeasures/ui/tests/utils.py

@@ -75,3 +75,27 @@ def mock_api_data_as_form_input(api_data: dict) -> dict:
     form_input = copy.deepcopy(api_data)
     form_input["account"] = api_data["account_id"]
     return form_input
+
+
+def mock_account_response(
+    account_id: int = 1,
+    account_name: str = "test_account",
+    account_roles: list = [],
+    as_list: bool = True,
+    multiple: bool = False,
+) -> Union[dict, List[dict]]:
+    account = dict(
+        id=account_id,
+        name=account_name,
+        account_roles=account_roles,
+    )
+    if as_list:
+        account_list = [account]
+        if multiple:
+            user2 = copy.deepcopy(account)
+            user2["id"] = 2
+            user2["account_name"] = "test_account2"
+            user2["account_roles"] = []
+            account_list.append(user2)
+        return account_list
+    return account