-
-
-
-
-
- |
- |
- |
- |
- |
-
-
-
- {% for d in dids.all %}
-
- | {{ d.created_at }} |
- {{ d.label }} |
- {{ d.did }} |
- |
- |
-
- {% endfor %}
-
-
-
-
-
+{% render_table table %}
+
{% for d in dids.all %}
diff --git a/idhub/templates/idhub/user/profile.html b/idhub/templates/idhub/user/profile.html
index 3a5d5f3..6efdc48 100644
--- a/idhub/templates/idhub/user/profile.html
+++ b/idhub/templates/idhub/user/profile.html
@@ -1,5 +1,6 @@
{% extends "idhub/base.html" %}
{% load i18n %}
+{% load render_table from django_tables2 %}
{% block content %}
@@ -33,33 +34,6 @@
{% bootstrap_form form %}
+{% render_table table %}
-
-
-
-
-
-
- |
- |
- |
- |
-
-
-
- {% for membership in object.memberships.all %}
-
- | {{ membership.get_type }} |
- {{ membership.start_date|default:'' }} |
- {{ membership.end_date|default:'' }} |
-
-
- |
-
- {% endfor %}
-
-
-
-
-
{% endblock %}
diff --git a/idhub/templates/idhub/user/roles.html b/idhub/templates/idhub/user/roles.html
index 2c32e97..22777ee 100644
--- a/idhub/templates/idhub/user/roles.html
+++ b/idhub/templates/idhub/user/roles.html
@@ -1,35 +1,12 @@
{% extends "idhub/base.html" %}
{% load i18n %}
+{% load render_table from django_tables2 %}
{% block content %}
{{ subtitle }}
-
-
-
-
-
-
- |
- |
- |
-
-
-
- {% for rol in user.roles.all %}
-
- | {{ rol.service.get_roles }} |
- {{ rol.service.description }} |
- {{ rol.service.domain }} |
-
- {% endfor %}
-
-
-
-
-
-
+{% render_table table %}
{% endblock %}
diff --git a/idhub/user/forms.py b/idhub/user/forms.py
index 5ac04ad..07b134d 100644
--- a/idhub/user/forms.py
+++ b/idhub/user/forms.py
@@ -1,21 +1,10 @@
-import requests
from django import forms
from django.conf import settings
from django.utils.translation import gettext_lazy as _
-
-from idhub_auth.models import User
from idhub.models import DID, VerificableCredential
from oidc4vp.models import Organization
-class ProfileForm(forms.ModelForm):
- MANDATORY_FIELDS = ['first_name', 'last_name', 'email']
-
- class Meta:
- model = User
- fields = ('first_name', 'last_name', 'email')
-
-
class RequestCredentialForm(forms.Form):
did = forms.ChoiceField(label=_("Did"), choices=[])
credential = forms.ChoiceField(label=_("Credential"), choices=[])
diff --git a/idhub/user/tables.py b/idhub/user/tables.py
new file mode 100644
index 0000000..0cdb4fb
--- /dev/null
+++ b/idhub/user/tables.py
@@ -0,0 +1,144 @@
+from django.utils.html import format_html
+import django_tables2 as tables
+from idhub.models import Event, Membership, UserRol, DID, VerificableCredential
+
+
+class ButtonColumn(tables.Column):
+ attrs = {
+ "a": {
+ "type": "button",
+ "class": "text-primary",
+ }
+ }
+ # it makes no sense to order a column of buttons
+ orderable = False
+ # django_tables will only call the render function if it doesn't find
+ # any empty values in the data, so we stop it from matching the data
+ # to any value considered empty
+ empty_values = ()
+
+
+class DashboardTable(tables.Table):
+ type = tables.Column(verbose_name="Event")
+ message = tables.Column(verbose_name="Description")
+ created = tables.Column(verbose_name="Date")
+
+ class Meta:
+ model = Event
+ template_name = "idhub/custom_table.html"
+ fields = ("type", "message", "created")
+
+
+class PersonalInfoTable(tables.Table):
+ type = tables.Column(verbose_name="Membership")
+ credential = ButtonColumn(
+ # TODO: See where this should actually link
+ linkify="idhub:user_credentials",
+ orderable=False
+ )
+
+ def render_credential(self):
+ return format_html('
')
+
+ class Meta:
+ model = Membership
+ template_name = "idhub/custom_table.html"
+ fields = ("type", "start_date", "end_date", "credential")
+
+
+class RolesTable(tables.Table):
+ name = tables.Column(verbose_name="Role", empty_values=())
+ description = tables.Column(empty_values=())
+ service = tables.Column()
+
+ def render_name(self, record):
+ return record.service.get_roles()
+
+ def render_description(self, record):
+ return record.service.description
+
+ def render_service(self, record):
+ return record.service.domain
+
+ def order_name(self, queryset, is_descending):
+ queryset = queryset.order_by(
+ ("-" if is_descending else "") + "service__rol__name"
+ )
+
+ return (queryset, True)
+
+ def order_description(self, queryset, is_descending):
+ queryset = queryset.order_by(
+ ("-" if is_descending else "") + "service__description"
+ )
+
+ return (queryset, True)
+
+ def order_service(self, queryset, is_descending):
+ queryset = queryset.order_by(
+ ("-" if is_descending else "") + "service__domain"
+ )
+
+ return (queryset, True)
+
+ class Meta:
+ model = UserRol
+ template_name = "idhub/custom_table.html"
+ fields = ("name", "description", "service")
+
+
+class DIDTable(tables.Table):
+ created_at = tables.Column(verbose_name="Date")
+ did = tables.Column(verbose_name="ID")
+ edit = ButtonColumn(
+ linkify={
+ "viewname": "idhub:user_dids_edit",
+ "args": [tables.A("pk")]
+ },
+ orderable=False
+ )
+ delete_template_code = """
"""
+ delete = tables.TemplateColumn(template_code=delete_template_code,
+ orderable=False)
+
+ def render_edit(self):
+ return format_html('
')
+
+ class Meta:
+ model = DID
+ template_name = "idhub/custom_table.html"
+ fields = ("created_at", "label", "did", "edit", "delete")
+
+
+class CredentialsTable(tables.Table):
+ description = tables.Column(verbose_name="Details", empty_values=())
+
+ def render_description(self, record):
+ return record.get_description()
+
+ def render_status(self, record):
+ return record.get_status()
+
+ def order_type(self, queryset, is_descending):
+ queryset = queryset.order_by(
+ ("-" if is_descending else "") + "schema__type"
+ )
+
+ return (queryset, True)
+
+ def order_description(self, queryset, is_descending):
+ queryset = queryset.order_by(
+ ("-" if is_descending else "") + "schema__template_description"
+ )
+
+ return (queryset, True)
+
+ class Meta:
+ model = VerificableCredential
+ template_name = "idhub/custom_table.html"
+ fields = ("type", "description", "issued_on", "status")
diff --git a/idhub/user/views.py b/idhub/user/views.py
index e6e28dc..07430f5 100644
--- a/idhub/user/views.py
+++ b/idhub/user/views.py
@@ -12,13 +12,21 @@ from django.shortcuts import get_object_or_404, redirect
from django.urls import reverse_lazy
from django.http import HttpResponse
from django.contrib import messages
+from django_tables2 import SingleTableView
+from idhub.user.tables import (
+ DashboardTable,
+ PersonalInfoTable,
+ RolesTable,
+ DIDTable,
+ CredentialsTable
+)
from idhub.user.forms import (
- ProfileForm,
- RequestCredentialForm,
- DemandAuthorizationForm
+ RequestCredentialForm,
+ DemandAuthorizationForm
)
from idhub.mixins import UserView
-from idhub.models import DID, VerificableCredential, Event
+from idhub.models import DID, VerificableCredential, Event, Membership
+from idhub_auth.models import User
class MyProfile(UserView):
@@ -31,21 +39,35 @@ class MyWallet(UserView):
section = "MyWallet"
-class DashboardView(UserView, TemplateView):
+class DashboardView(UserView, SingleTableView):
template_name = "idhub/user/dashboard.html"
+ table_class = DashboardTable
title = _('Dashboard')
subtitle = _('Events')
icon = 'bi bi-bell'
section = "Home"
+ def get_queryset(self, **kwargs):
+ queryset = Event.objects.select_related('user').filter(
+ user=self.request.user)
-class ProfileView(MyProfile, UpdateView):
+ return queryset
+
+
+class ProfileView(MyProfile, UpdateView, SingleTableView):
template_name = "idhub/user/profile.html"
+ table_class = PersonalInfoTable
subtitle = _('My personal data')
icon = 'bi bi-person-gear'
- from_class = ProfileForm
fields = ('first_name', 'last_name', 'email')
success_url = reverse_lazy('idhub:user_profile')
+ model = User
+
+ def get_queryset(self, **kwargs):
+ queryset = Membership.objects.select_related('user').filter(
+ user=self.request.user)
+
+ return queryset
def get_object(self):
return self.request.user
@@ -61,11 +83,17 @@ class ProfileView(MyProfile, UpdateView):
return super().form_valid(form)
-class RolesView(MyProfile, TemplateView):
+class RolesView(MyProfile, SingleTableView):
template_name = "idhub/user/roles.html"
+ table_class = RolesTable
subtitle = _('My roles')
icon = 'fa-brands fa-critical-role'
+ def get_queryset(self, **kwargs):
+ queryset = self.request.user.roles.all()
+
+ return queryset
+
class GDPRView(MyProfile, TemplateView):
template_name = "idhub/user/gdpr.html"
@@ -73,20 +101,17 @@ class GDPRView(MyProfile, TemplateView):
icon = 'bi bi-file-earmark-medical'
-class CredentialsView(MyWallet, TemplateView):
+class CredentialsView(MyWallet, SingleTableView):
template_name = "idhub/user/credentials.html"
+ table_class = CredentialsTable
subtitle = _('Credential management')
icon = 'bi bi-patch-check-fill'
- def get_context_data(self, **kwargs):
- context = super().get_context_data(**kwargs)
- creds = VerificableCredential.objects.filter(
- user=self.request.user
- )
- context.update({
- 'credentials': creds,
- })
- return context
+ def get_queryset(self):
+ queryset = VerificableCredential.objects.filter(
+ user=self.request.user)
+
+ return queryset
class CredentialView(MyWallet, TemplateView):
@@ -180,8 +205,9 @@ class DemandAuthorizationView(MyWallet, FormView):
return super().form_valid(form)
-class DidsView(MyWallet, TemplateView):
+class DidsView(MyWallet, SingleTableView):
template_name = "idhub/user/dids.html"
+ table_class = DIDTable
subtitle = _('Identities (DIDs)')
icon = 'bi bi-patch-check-fill'
@@ -192,6 +218,11 @@ class DidsView(MyWallet, TemplateView):
})
return context
+ def get_queryset(self, **kwargs):
+ queryset = DID.objects.filter(user=self.request.user)
+
+ return queryset
+
class DidRegisterView(MyWallet, CreateView):
template_name = "idhub/user/did_register.html"