From 1179ba4ef23c01e286f885223f810552779f8b03 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 16 Dec 2020 22:00:29 +0100 Subject: [PATCH] api: remove counters from overview api and allow filtering on object apis --- authentik/admin/api/overview.py | 14 -- .../templates/administration/overview.html | 163 ------------------ authentik/core/api/providers.py | 5 +- authentik/policies/api.py | 4 + 4 files changed, 8 insertions(+), 178 deletions(-) diff --git a/authentik/admin/api/overview.py b/authentik/admin/api/overview.py index e61068abc5..65411b1ad5 100644 --- a/authentik/admin/api/overview.py +++ b/authentik/admin/api/overview.py @@ -10,8 +10,6 @@ from rest_framework.viewsets import ViewSet from authentik import __version__ from authentik.admin.tasks import VERSION_CACHE_KEY, update_latest_version -from authentik.core.models import Provider -from authentik.policies.models import Policy from authentik.root.celery import CELERY_APP @@ -21,8 +19,6 @@ class AdministrationOverviewSerializer(Serializer): version = SerializerMethodField() version_latest = SerializerMethodField() worker_count = SerializerMethodField() - providers_without_application = SerializerMethodField() - policies_without_binding = SerializerMethodField() cached_policies = SerializerMethodField() cached_flows = SerializerMethodField() @@ -42,16 +38,6 @@ class AdministrationOverviewSerializer(Serializer): """Ping workers""" return len(CELERY_APP.control.ping(timeout=0.5)) - def get_providers_without_application(self, _) -> int: - """Count of providers without application""" - return len(Provider.objects.filter(application=None)) - - def get_policies_without_binding(self, _) -> int: - """Count of policies not bound or use in prompt stages""" - return len( - Policy.objects.filter(bindings__isnull=True, promptstage__isnull=True) - ) - def get_cached_policies(self, _) -> int: """Get cached policy count""" return len(cache.keys("policy_*")) diff --git a/authentik/admin/templates/administration/overview.html b/authentik/admin/templates/administration/overview.html index ee38a95757..a386bb2d29 100644 --- a/authentik/admin/templates/administration/overview.html +++ b/authentik/admin/templates/administration/overview.html @@ -11,169 +11,6 @@
-
-
-
- {% trans 'Logins over the last 24 hours' %} -
-
-
- -
-
-
-
-
- {% trans 'Apps with most usage' %} -
-
-
- - - - - - - - - - {% for app in most_used_applications %} - - - - - - {% endfor %} - -
{% trans 'Application' %}{% trans 'Logins' %}
- {{ app.application.name }} - - {{ app.total_logins }} - - -
-
-
- -
-
-
- {% trans 'Providers' %} -
- - - -
-
- {% if providers_without_application.exists %} -

- {{ provider_count }} -

-

{% trans 'Warning: At least one Provider has no application assigned.' %}

- {% else %} -

- {{ provider_count }} -

- {% endif %} -
-
- -
-
-
- {% trans 'Policies' %} -
- - - -
-
- {% if policies_without_binding %} -

- {{ policy_count }} -

-

{% trans 'Policies without binding exist.' %}

- {% else %} -

- {{ policy_count }} -

- {% endif %} -
-
- -
-
-
- {% trans 'Users' %} -
- - - -
-
-

- {{ user_count }} -

-
-
- -
-
-
- {% trans 'Version' %} -
- - - -
-
-

- {% if version >= version_latest %} - {{ version }} - {% else %} - {{ version }} - {% endif %} -

- {% if version >= version_latest %} - {% blocktrans %} - Up-to-date! - {% endblocktrans %} - {% else %} - {% blocktrans with latest=version_latest %} - {{ latest }} is available! - {% endblocktrans %} - {% endif %} -
-
- -
-
-
- {% trans 'Workers' %} -
-
- -
-

- -

-

{% trans 'No workers connected.' %}

-
-
-

- -

-
-
- -
- -
-
diff --git a/authentik/core/api/providers.py b/authentik/core/api/providers.py index 3a23f66b7d..20af65733f 100644 --- a/authentik/core/api/providers.py +++ b/authentik/core/api/providers.py @@ -1,6 +1,6 @@ """Provider API Views""" from rest_framework.serializers import ModelSerializer, SerializerMethodField -from rest_framework.viewsets import ReadOnlyModelViewSet +from rest_framework.viewsets import ModelViewSet from authentik.core.models import Provider @@ -38,6 +38,9 @@ class ProviderViewSet(ModelViewSet): queryset = Provider.objects.all() serializer_class = ProviderSerializer + filterset_fields = { + 'application': ['isnull'], + } def get_queryset(self): return Provider.objects.select_subclasses() diff --git a/authentik/policies/api.py b/authentik/policies/api.py index 4fb9363430..fed8a28855 100644 --- a/authentik/policies/api.py +++ b/authentik/policies/api.py @@ -68,6 +68,10 @@ class PolicyViewSet(ReadOnlyModelViewSet): queryset = Policy.objects.all() serializer_class = PolicySerializer + filterset_fields = { + 'bindings': ['isnull'], + 'promptstage': ['isnull'], + } def get_queryset(self): return Policy.objects.select_subclasses()