From b2a712771052f99e33fac8349a79ba101dd9f3d8 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Tue, 19 Mar 2024 20:09:15 +0100 Subject: [PATCH 1/7] Rebase dev --- .../projectroles/_site_titlebar_dropdown.html | 168 ++++++++++-------- .../templatetags/projectroles_tags.py | 9 +- projectroles/utils.py | 60 ++++++- 3 files changed, 161 insertions(+), 76 deletions(-) diff --git a/projectroles/templates/projectroles/_site_titlebar_dropdown.html b/projectroles/templates/projectroles/_site_titlebar_dropdown.html index 3251a871..da5721b1 100644 --- a/projectroles/templates/projectroles/_site_titlebar_dropdown.html +++ b/projectroles/templates/projectroles/_site_titlebar_dropdown.html @@ -7,47 +7,56 @@ {# Responsive replacement for user dropdown #} {# Admin link #} -{% if request.user.is_superuser %} -
  • - - Admin - -
    • -{% endif %} - +{#{% if request.user.is_superuser %}#} +{#
  • #} +{# #} +{# Admin#} +{# #} +{#
    • #} +{#{% endif %}#} +{##} {# Site-wide apps #} -{% for plugin in site_apps %} - {% has_perm plugin.app_permission request.user as can_view_app %} - {% if not plugin.app_permission or can_view_app %} -
  • - - {{ plugin.title }} -
    • - {% endif %} -{% endfor %} - +{#{% for plugin in site_apps %}#} +{# {% has_perm plugin.app_permission request.user as can_view_app %}#} +{# {% if not plugin.app_permission or can_view_app %}#} +{#
  • #} +{# #} +{# {{ plugin.title }}#} +{#
    • #} +{# {% endif %}#} +{#{% endfor %}#} +{##} {# Log out link #} -{% if request.user.is_authenticated %} -
  • - - Logout - -
    • -{% elif not kiosk_mode %} -
  • - - Login +{#{% if request.user.is_authenticated %}#} +{#
  • #} +{# #} +{# Logout#} +{# #} +{#
    • #} +{#{% elif not kiosk_mode %}#} +{#
  • #} +{# #} +{# Login#} +{# #} +{#
    • #} +{#{% endif %}#} +{% get_user_links request as dropdown_links %} +{% for link in dropdown_links %} +
  • + + {{ link.label }} -
    • -{% endif %} - +{% endfor %} {# Actual user dropdown #}
  • @@ -76,44 +85,55 @@
    {# Site-wide apps #} - {% for plugin in site_apps %} - {% has_perm plugin.app_permission request.user as can_view_app %} - {% if not plugin.app_permission or can_view_app %} - - {{ plugin.title }} - - {% endif %} - {% endfor %} - {% if site_apps|length > 0 %} -
    - {% endif %} - +{# {% for plugin in site_apps %}#} +{# {% has_perm plugin.app_permission request.user as can_view_app %}#} +{# {% if not plugin.app_permission or can_view_app %}#} +{# #} +{# {{ plugin.title }}#} +{# #} +{# {% endif %}#} +{# {% endfor %}#} +{# {% if site_apps|length > 0 %}#} +{#
    #} +{# {% endif %}#} +{##} {# Admin link #} - {% if request.user.is_superuser %} - - Django Admin - -
    - {% endif %} - +{# {% if request.user.is_superuser %}#} +{# #} +{# Django Admin#} +{# #} +{#
    #} +{# {% endif %}#} +{##} {# Log out / log in links #} - {% if request.user.is_authenticated %} - - Logout - - {% else %} - - Login +{# {% if request.user.is_authenticated %}#} +{# #} +{# Logout#} +{# #} +{# {% else %}#} +{# #} +{# Login#} +{# #} +{# {% endif %}#} + + {% get_user_links request as dropdown_links %} + {% for link in dropdown_links %} + + {{ link.label }} - {% endif %} + {% endfor %}
    • diff --git a/projectroles/templatetags/projectroles_tags.py b/projectroles/templatetags/projectroles_tags.py index c4862992..126f1d23 100644 --- a/projectroles/templatetags/projectroles_tags.py +++ b/projectroles/templatetags/projectroles_tags.py @@ -8,7 +8,7 @@ from projectroles.app_settings import AppSettingAPI from projectroles.models import RemoteProject, SODAR_CONSTANTS from projectroles.plugins import get_active_plugins -from projectroles.utils import AppLinkContent +from projectroles.utils import UserDropdownContent, AppLinkContent register = template.Library() @@ -270,6 +270,13 @@ def get_admin_warning(): return ret +@register.simple_tag +def get_user_links(request): + """Return user dropdown links""" + user_dropdown_content = UserDropdownContent() + return user_dropdown_content.get_user_links(request) + + @register.simple_tag def get_project_app_links(request, project=None): """Return sidebar links""" diff --git a/projectroles/utils.py b/projectroles/utils.py index 5862b09c..837b74ac 100644 --- a/projectroles/utils.py +++ b/projectroles/utils.py @@ -5,8 +5,9 @@ from django.urls import reverse from django.utils import timezone -from projectroles.models import SODAR_CONSTANTS +from projectroles.constants import get_sodar_constants from projectroles.plugins import get_active_plugins +from projectroles.models import SODAR_CONSTANTS # Settings SECRET_LENGTH = getattr(settings, 'PROJECTROLES_SECRET_LENGTH', 32) @@ -299,3 +300,60 @@ def get_project_app_links(self, request, project=None): } ) return ret + + +class UserDropdownContent: + """Class to generate user dropdown content""" + + def get_user_links(self, request): + links = [] + # Add site-wide apps links + site_apps = get_active_plugins('site_app') + for app in site_apps: + if not app.app_permission or request.user.has_perm( + app.app_permission + ): + links.append( + { + 'name': app.name, + 'url': reverse(app.entry_point_url_id), + 'label': app.title, + 'icon': app.icon, + 'active': request.path + == reverse(app.entry_point_url_id), + } + ) + # Add admin link + if request.user.is_superuser: + links.append( + { + 'name': 'admin', + 'url': reverse('admin:index'), + 'label': 'Django Admin', + 'icon': 'mdi:cogs', + 'active': request.path == reverse('admin:index'), + } + ) + # Add log out link + if request.user.is_authenticated: + links.append( + { + 'name': 'sign-out', + 'url': reverse('logout'), + 'label': 'Logout', + 'icon': 'mdi:logout-variant', + 'active': False, + } + ) + elif not getattr(settings, 'PROJECTROLES_KIOSK_MODE', False): + links.append( + { + 'name': 'sign-in', + 'url': reverse('login'), + 'label': 'Login', + 'icon': 'mdi:login-variant', + 'active': False, + } + ) + print(links) + return links From e6aae935fba7ee15e655d24445bb69f5d5167d8b Mon Sep 17 00:00:00 2001 From: gromdimon Date: Thu, 7 Mar 2024 16:27:17 +0100 Subject: [PATCH 2/7] wip --- .../projectroles/_site_titlebar_dropdown.html | 83 ------------------- projectroles/utils.py | 4 +- 2 files changed, 2 insertions(+), 85 deletions(-) diff --git a/projectroles/templates/projectroles/_site_titlebar_dropdown.html b/projectroles/templates/projectroles/_site_titlebar_dropdown.html index da5721b1..7494b79d 100644 --- a/projectroles/templates/projectroles/_site_titlebar_dropdown.html +++ b/projectroles/templates/projectroles/_site_titlebar_dropdown.html @@ -5,48 +5,6 @@ {% get_django_setting 'PROJECTROLES_KIOSK_MODE' as kiosk_mode %} {# Responsive replacement for user dropdown #} - -{# Admin link #} -{#{% if request.user.is_superuser %}#} -{#
  • #} -{# #} -{# Admin#} -{# #} -{#
    • #} -{#{% endif %}#} -{##} -{# Site-wide apps #} -{#{% for plugin in site_apps %}#} -{# {% has_perm plugin.app_permission request.user as can_view_app %}#} -{# {% if not plugin.app_permission or can_view_app %}#} -{#
  • #} -{# #} -{# {{ plugin.title }}#} -{#
    • #} -{# {% endif %}#} -{#{% endfor %}#} -{##} -{# Log out link #} -{#{% if request.user.is_authenticated %}#} -{#
  • #} -{# #} -{# Logout#} -{# #} -{#
    • #} -{#{% elif not kiosk_mode %}#} -{#
  • #} -{# #} -{# Login#} -{# #} -{#
    • #} -{#{% endif %}#} {% get_user_links request as dropdown_links %} {% for link in dropdown_links %}
  • @@ -84,47 +42,6 @@
    - {# Site-wide apps #} -{# {% for plugin in site_apps %}#} -{# {% has_perm plugin.app_permission request.user as can_view_app %}#} -{# {% if not plugin.app_permission or can_view_app %}#} -{# #} -{# {{ plugin.title }}#} -{# #} -{# {% endif %}#} -{# {% endfor %}#} -{# {% if site_apps|length > 0 %}#} -{#
    #} -{# {% endif %}#} -{##} - {# Admin link #} -{# {% if request.user.is_superuser %}#} -{# #} -{# Django Admin#} -{# #} -{#
    #} -{# {% endif %}#} -{##} - {# Log out / log in links #} -{# {% if request.user.is_authenticated %}#} -{# #} -{# Logout#} -{# #} -{# {% else %}#} -{# #} -{# Login#} -{# #} -{# {% endif %}#} - {% get_user_links request as dropdown_links %} {% for link in dropdown_links %} Date: Thu, 7 Mar 2024 16:31:59 +0100 Subject: [PATCH 3/7] cleanup --- .../templates/projectroles/_site_titlebar_dropdown.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projectroles/templates/projectroles/_site_titlebar_dropdown.html b/projectroles/templates/projectroles/_site_titlebar_dropdown.html index 7494b79d..cd843d1d 100644 --- a/projectroles/templates/projectroles/_site_titlebar_dropdown.html +++ b/projectroles/templates/projectroles/_site_titlebar_dropdown.html @@ -44,6 +44,9 @@ {% get_user_links request as dropdown_links %} {% for link in dropdown_links %} + {% if link.name == 'admin' or link.name == 'sign-out' or link.name == 'sign-in' %} +
    + {% endif %}     Date: Tue, 19 Mar 2024 20:10:42 +0100 Subject: [PATCH 4/7] Rebase dev --- projectroles/tests/test_templatetags.py | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index 4cbb563a..bcf91f79 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -725,3 +725,59 @@ def test_get_sidebar_links_timeline_view(self): self.assertEqual(app['active'], True) else: self.assertEqual(app['active'], False) + + def test_get_get_user_links(self): + """Test get_user_links() on the homepage""" + url = reverse('home') + req_factory = RequestFactory() + with self.login(self.user): + request = req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + self.assertEqual( + tags.get_user_links(request), + [ + { + 'name': 'appalerts', + 'url': '/alerts/app/list', + 'label': 'App Alerts', + 'icon': 'mdi:alert-octagram', + 'active': False, + }, + { + 'name': 'example_site_app', + 'url': '/examples/site/example', + 'label': 'Example Site App', + 'icon': 'mdi:rocket-launch-outline', + 'active': False, + }, + { + 'name': 'timeline_site', + 'url': '/timeline/site', + 'label': 'Site-Wide Events', + 'icon': 'mdi:clock-time-eight-outline', + 'active': False, + }, + { + 'name': 'tokens', + 'url': '/tokens/', + 'label': 'API Tokens', + 'icon': 'mdi:key-chain-variant', + 'active': False, + }, + { + 'name': 'userprofile', + 'url': '/user/profile', + 'label': 'User Profile', + 'icon': 'mdi:account-details', + 'active': False, + }, + { + 'name': 'sign-out', + 'url': '/logout/', + 'label': 'Logout', + 'icon': 'mdi:logout-variant', + 'active': False, + }, + ], + ) From 5e7b11d4244b055bee0a2f683d87ee34e1c3a9fa Mon Sep 17 00:00:00 2001 From: gromdimon Date: Tue, 19 Mar 2024 20:21:51 +0100 Subject: [PATCH 5/7] add tests --- .../projectroles/_site_titlebar_dropdown.html | 6 +++--- projectroles/tests/test_templatetags.py | 20 +++++++++++++++---- projectroles/utils.py | 3 +-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/projectroles/templates/projectroles/_site_titlebar_dropdown.html b/projectroles/templates/projectroles/_site_titlebar_dropdown.html index cd843d1d..ac2c2628 100644 --- a/projectroles/templates/projectroles/_site_titlebar_dropdown.html +++ b/projectroles/templates/projectroles/_site_titlebar_dropdown.html @@ -9,9 +9,9 @@ {% for link in dropdown_links %}
  • + {% if link.name == 'sign-in' %}text-white{% endif %}" + href="{{ link.url }}" + id="sodar-navbar-nav-link-{{ link.name }}"> {{ link.label }} {% endfor %} diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index bcf91f79..b6145cca 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -726,12 +726,11 @@ def test_get_sidebar_links_timeline_view(self): else: self.assertEqual(app['active'], False) - def test_get_get_user_links(self): - """Test get_user_links() on the homepage""" + def test_get_get_user_links_home(self): + """Test get_user_links() on the home view""" url = reverse('home') - req_factory = RequestFactory() with self.login(self.user): - request = req_factory.get(url) + request = self.req_factory.get(url) request.resolver_match = resolve(url) request.user = self.user self.assertEqual( @@ -781,3 +780,16 @@ def test_get_get_user_links(self): }, ], ) + + def test_get_user_links_userprofile(self): + """Test get_user_links() on the user profile view""" + url = reverse('userprofile:detail') + with self.login(self.user): + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + for app in tags.get_user_links(request): + if app['name'] == 'userprofile': + self.assertEqual(app['active'], True) + else: + self.assertEqual(app['active'], False) diff --git a/projectroles/utils.py b/projectroles/utils.py index 89945db8..0747c0e3 100644 --- a/projectroles/utils.py +++ b/projectroles/utils.py @@ -5,7 +5,6 @@ from django.urls import reverse from django.utils import timezone -from projectroles.constants import get_sodar_constants from projectroles.plugins import get_active_plugins from projectroles.models import SODAR_CONSTANTS @@ -303,7 +302,7 @@ def get_project_app_links(self, request, project=None): class UserDropdownContent: - """Class to generate user dropdown content""" + """Class for generating application links for the dropdown""" def get_user_links(self, request): """Return user links for the user dropdown""" From f8de9492b6789ff9caa9d19d7f71c6c0806948e3 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Wed, 27 Mar 2024 15:02:50 +0100 Subject: [PATCH 6/7] refactoring changes --- .../projectroles/_site_titlebar_dropdown.html | 4 +- .../templatetags/projectroles_tags.py | 6 +- projectroles/tests/test_templatetags.py | 115 +++++++++++++++++- projectroles/utils.py | 23 ++-- 4 files changed, 130 insertions(+), 18 deletions(-) diff --git a/projectroles/templates/projectroles/_site_titlebar_dropdown.html b/projectroles/templates/projectroles/_site_titlebar_dropdown.html index ac2c2628..9bc7920f 100644 --- a/projectroles/templates/projectroles/_site_titlebar_dropdown.html +++ b/projectroles/templates/projectroles/_site_titlebar_dropdown.html @@ -50,8 +50,8 @@ + href="{{ link.url }}" + id="sodar-navbar-link-{{ link.name }}"> {{ link.label }} {% endfor %} diff --git a/projectroles/templatetags/projectroles_tags.py b/projectroles/templatetags/projectroles_tags.py index 126f1d23..98650fe2 100644 --- a/projectroles/templatetags/projectroles_tags.py +++ b/projectroles/templatetags/projectroles_tags.py @@ -8,7 +8,7 @@ from projectroles.app_settings import AppSettingAPI from projectroles.models import RemoteProject, SODAR_CONSTANTS from projectroles.plugins import get_active_plugins -from projectroles.utils import UserDropdownContent, AppLinkContent +from projectroles.utils import AppLinkContent register = template.Library() @@ -273,8 +273,8 @@ def get_admin_warning(): @register.simple_tag def get_user_links(request): """Return user dropdown links""" - user_dropdown_content = UserDropdownContent() - return user_dropdown_content.get_user_links(request) + app_links = AppLinkContent() + return app_links.get_user_links(request) @register.simple_tag diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index b6145cca..e36c23cf 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -726,7 +726,7 @@ def test_get_sidebar_links_timeline_view(self): else: self.assertEqual(app['active'], False) - def test_get_get_user_links_home(self): + def test_get_user_links_home(self): """Test get_user_links() on the home view""" url = reverse('home') with self.login(self.user): @@ -781,6 +781,106 @@ def test_get_get_user_links_home(self): ], ) + def test_get_superuser_links_home(self): + """Test get_user_links() on the home view as superuser""" + url = reverse('home') + superuser = self.make_user('superuser') + superuser.is_superuser = True + superuser.save() + with self.login(superuser): + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = superuser + self.assertEqual( + tags.get_user_links(request), + [ + { + 'name': 'adminalerts', + 'url': '/alerts/adm/list', + 'label': 'Admin Alerts', + 'icon': 'mdi:alert', + 'active': False, + }, + { + 'name': 'appalerts', + 'url': '/alerts/app/list', + 'label': 'App Alerts', + 'icon': 'mdi:alert-octagram', + 'active': False, + }, + { + 'name': 'bgjobs_site', + 'url': '/bgjobs/list', + 'label': 'Site Background Jobs', + 'icon': 'mdi:server', + 'active': False, + }, + { + 'name': 'example_site_app', + 'url': '/examples/site/example', + 'label': 'Example Site App', + 'icon': 'mdi:rocket-launch-outline', + 'active': False, + }, + { + 'name': 'remotesites', + 'url': '/project/remote/sites', + 'label': 'Remote Site Access', + 'icon': 'mdi:cloud-sync', + 'active': False, + }, + { + 'name': 'siteinfo', + 'url': '/siteinfo/info', + 'label': 'Site Info', + 'icon': 'mdi:bar-chart', + 'active': False, + }, + { + 'name': 'timeline_site', + 'url': '/timeline/site', + 'label': 'Site-Wide Events', + 'icon': 'mdi:clock-time-eight-outline', + 'active': False, + }, + { + 'name': 'timeline_site_admin', + 'url': '/timeline/site/all', + 'label': 'All Timeline Events', + 'icon': 'mdi:web-clock', + 'active': False, + }, + { + 'name': 'tokens', + 'url': '/tokens/', + 'label': 'API Tokens', + 'icon': 'mdi:key-chain-variant', + 'active': False, + }, + { + 'name': 'userprofile', + 'url': '/user/profile', + 'label': 'User Profile', + 'icon': 'mdi:account-details', + 'active': False, + }, + { + 'name': 'admin', + 'url': '/admin/', + 'label': 'Django Admin', + 'icon': 'mdi:cogs', + 'active': False, + }, + { + 'name': 'sign-out', + 'url': '/logout/', + 'label': 'Logout', + 'icon': 'mdi:logout-variant', + 'active': False, + }, + ], + ) + def test_get_user_links_userprofile(self): """Test get_user_links() on the user profile view""" url = reverse('userprofile:detail') @@ -793,3 +893,16 @@ def test_get_user_links_userprofile(self): self.assertEqual(app['active'], True) else: self.assertEqual(app['active'], False) + + def test_get_user_links_remote_site(self): + """Test get_user_links() on the remote site view""" + url = reverse('projectroles:remote_site_create') + with self.login(self.user): + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + for app in tags.get_user_links(request): + if app['name'] == 'remote_site_app': + self.assertEqual(app['active'], True) + else: + self.assertEqual(app['active'], False) diff --git a/projectroles/utils.py b/projectroles/utils.py index 0747c0e3..b889e882 100644 --- a/projectroles/utils.py +++ b/projectroles/utils.py @@ -300,32 +300,31 @@ def get_project_app_links(self, request, project=None): ) return ret - -class UserDropdownContent: - """Class for generating application links for the dropdown""" - def get_user_links(self, request): """Return user links for the user dropdown""" - links = [] + ret = [] # Add site-wide apps links site_apps = get_active_plugins('site_app') for app in site_apps: if not app.app_permission or request.user.has_perm( app.app_permission ): - links.append( + ret.append( { 'name': app.name, 'url': reverse(app.entry_point_url_id), 'label': app.title, 'icon': app.icon, - 'active': request.path - == reverse(app.entry_point_url_id), + 'active': self._is_active_plugin( + app, + request.resolver_match.app_name, + request.resolver_match.url_name, + ), } ) # Add admin link if request.user.is_superuser: - links.append( + ret.append( { 'name': 'admin', 'url': reverse('admin:index'), @@ -336,7 +335,7 @@ def get_user_links(self, request): ) # Add log out / sign in link if request.user.is_authenticated: - links.append( + ret.append( { 'name': 'sign-out', 'url': reverse('logout'), @@ -346,7 +345,7 @@ def get_user_links(self, request): } ) elif not getattr(settings, 'PROJECTROLES_KIOSK_MODE', False): - links.append( + ret.append( { 'name': 'sign-in', 'url': reverse('login'), @@ -355,4 +354,4 @@ def get_user_links(self, request): 'active': False, } ) - return links + return ret From 66f34b5badad934f1f533d0d9f7642b17853dd3c Mon Sep 17 00:00:00 2001 From: gromdimon Date: Wed, 10 Apr 2024 15:41:37 +0200 Subject: [PATCH 7/7] second refactoring --- .../templatetags/projectroles_tags.py | 3 +- projectroles/tests/test_templatetags.py | 498 +++++++++--------- 2 files changed, 246 insertions(+), 255 deletions(-) diff --git a/projectroles/templatetags/projectroles_tags.py b/projectroles/templatetags/projectroles_tags.py index 98650fe2..e7ccdfb0 100644 --- a/projectroles/templatetags/projectroles_tags.py +++ b/projectroles/templatetags/projectroles_tags.py @@ -12,6 +12,7 @@ register = template.Library() +app_links = AppLinkContent() app_settings = AppSettingAPI() @@ -273,12 +274,10 @@ def get_admin_warning(): @register.simple_tag def get_user_links(request): """Return user dropdown links""" - app_links = AppLinkContent() return app_links.get_user_links(request) @register.simple_tag def get_project_app_links(request, project=None): """Return sidebar links""" - app_links = AppLinkContent() return app_links.get_project_app_links(request, project) diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index e36c23cf..8af7d582 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -66,6 +66,9 @@ def setUp(self): self.init_roles() # Init users self.user = self.make_user('user_owner') + self.superuser = self.make_user('user_superuser') + self.superuser.is_superuser = True + self.superuser.save() # Init category self.category = self.make_project( title='TestCategoryTop', type=PROJECT_TYPE_CATEGORY, parent=None @@ -623,286 +626,275 @@ def test_get_sidebar_app_legend(self): def test_get_sidebar_links_home(self): """Test get_sidebar_links() on the home view""" url = reverse('home') - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - self.assertEqual( - tags.get_project_app_links(request), - [], - ) + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + self.assertEqual( + tags.get_project_app_links(request), + [], + ) def test_get_sidebar_links_project_detail_view(self): """Test get_sidebar_links() on project detail view""" url = reverse( 'projectroles:detail', kwargs={'project': self.project.sodar_uuid} ) - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - self.assertEqual( - tags.get_project_app_links(request, self.project), - [ - { - 'name': 'project-detail', - 'url': f'/project/{self.project.sodar_uuid}', - 'label': 'Project Overview', - 'icon': 'mdi:cube', - 'active': True, - }, - { - 'name': 'app-plugin-bgjobs', - 'url': f'/bgjobs/list/{self.project.sodar_uuid}', - 'label': 'Background Jobs', - 'icon': 'mdi:server', - 'active': False, - }, - { - 'name': 'app-plugin-example_project_app', - 'url': f'/examples/project/{self.project.sodar_uuid}', - 'label': 'Example Project App', - 'icon': 'mdi:rocket-launch', - 'active': False, - }, - { - 'name': 'app-plugin-filesfolders', - 'url': f'/files/{self.project.sodar_uuid}', - 'label': 'Files', - 'icon': 'mdi:file', - 'active': False, - }, - { - 'name': 'app-plugin-timeline', - 'url': f'/timeline/{self.project.sodar_uuid}', - 'label': 'Timeline', - 'icon': 'mdi:clock-time-eight', - 'active': False, - }, - { - 'name': 'project-roles', - 'url': f'/project/members/{self.project.sodar_uuid}', - 'label': 'Members', - 'icon': 'mdi:account-multiple', - 'active': False, - }, - { - 'name': 'project-update', - 'url': f'/project/project/update/{self.project.sodar_uuid}', - 'label': 'Update Project', - 'icon': 'mdi:lead-pencil', - 'active': False, - }, - ], - ) + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + self.assertEqual( + tags.get_project_app_links(request, self.project), + [ + { + 'name': 'project-detail', + 'url': f'/project/{self.project.sodar_uuid}', + 'label': 'Project Overview', + 'icon': 'mdi:cube', + 'active': True, + }, + { + 'name': 'app-plugin-bgjobs', + 'url': f'/bgjobs/list/{self.project.sodar_uuid}', + 'label': 'Background Jobs', + 'icon': 'mdi:server', + 'active': False, + }, + { + 'name': 'app-plugin-example_project_app', + 'url': f'/examples/project/{self.project.sodar_uuid}', + 'label': 'Example Project App', + 'icon': 'mdi:rocket-launch', + 'active': False, + }, + { + 'name': 'app-plugin-filesfolders', + 'url': f'/files/{self.project.sodar_uuid}', + 'label': 'Files', + 'icon': 'mdi:file', + 'active': False, + }, + { + 'name': 'app-plugin-timeline', + 'url': f'/timeline/{self.project.sodar_uuid}', + 'label': 'Timeline', + 'icon': 'mdi:clock-time-eight', + 'active': False, + }, + { + 'name': 'project-roles', + 'url': f'/project/members/{self.project.sodar_uuid}', + 'label': 'Members', + 'icon': 'mdi:account-multiple', + 'active': False, + }, + { + 'name': 'project-update', + 'url': f'/project/project/update/{self.project.sodar_uuid}', + 'label': 'Update Project', + 'icon': 'mdi:lead-pencil', + 'active': False, + }, + ], + ) def test_get_sidebar_links_role_view(self): """Test get_sidebar_links() on the role view""" url = reverse( 'projectroles:roles', kwargs={'project': self.project.sodar_uuid} ) - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - for app in tags.get_project_app_links(request, self.project): - if app['name'] == 'project-roles': - self.assertEqual(app['active'], True) - else: - self.assertEqual(app['active'], False) + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + for app in tags.get_project_app_links(request, self.project): + if app['name'] == 'project-roles': + self.assertEqual(app['active'], True) + else: + self.assertEqual(app['active'], False) def test_get_sidebar_links_timeline_view(self): """Test get_sidebar_links() on the timeline view""" url = reverse( 'timeline:list_project', kwargs={'project': self.project.sodar_uuid} ) - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - for app in tags.get_project_app_links(request, self.project): - if app['name'] == 'app-plugin-timeline': - self.assertEqual(app['active'], True) - else: - self.assertEqual(app['active'], False) - - def test_get_user_links_home(self): + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + for app in tags.get_project_app_links(request, self.project): + if app['name'] == 'app-plugin-timeline': + self.assertEqual(app['active'], True) + else: + self.assertEqual(app['active'], False) + + def test_get_links_home_user(self): """Test get_user_links() on the home view""" url = reverse('home') - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - self.assertEqual( - tags.get_user_links(request), - [ - { - 'name': 'appalerts', - 'url': '/alerts/app/list', - 'label': 'App Alerts', - 'icon': 'mdi:alert-octagram', - 'active': False, - }, - { - 'name': 'example_site_app', - 'url': '/examples/site/example', - 'label': 'Example Site App', - 'icon': 'mdi:rocket-launch-outline', - 'active': False, - }, - { - 'name': 'timeline_site', - 'url': '/timeline/site', - 'label': 'Site-Wide Events', - 'icon': 'mdi:clock-time-eight-outline', - 'active': False, - }, - { - 'name': 'tokens', - 'url': '/tokens/', - 'label': 'API Tokens', - 'icon': 'mdi:key-chain-variant', - 'active': False, - }, - { - 'name': 'userprofile', - 'url': '/user/profile', - 'label': 'User Profile', - 'icon': 'mdi:account-details', - 'active': False, - }, - { - 'name': 'sign-out', - 'url': '/logout/', - 'label': 'Logout', - 'icon': 'mdi:logout-variant', - 'active': False, - }, - ], - ) - - def test_get_superuser_links_home(self): + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + self.assertEqual( + tags.get_user_links(request), + [ + { + 'name': 'appalerts', + 'url': '/alerts/app/list', + 'label': 'App Alerts', + 'icon': 'mdi:alert-octagram', + 'active': False, + }, + { + 'name': 'example_site_app', + 'url': '/examples/site/example', + 'label': 'Example Site App', + 'icon': 'mdi:rocket-launch-outline', + 'active': False, + }, + { + 'name': 'timeline_site', + 'url': '/timeline/site', + 'label': 'Site-Wide Events', + 'icon': 'mdi:clock-time-eight-outline', + 'active': False, + }, + { + 'name': 'tokens', + 'url': '/tokens/', + 'label': 'API Tokens', + 'icon': 'mdi:key-chain-variant', + 'active': False, + }, + { + 'name': 'userprofile', + 'url': '/user/profile', + 'label': 'User Profile', + 'icon': 'mdi:account-details', + 'active': False, + }, + { + 'name': 'sign-out', + 'url': '/logout/', + 'label': 'Logout', + 'icon': 'mdi:logout-variant', + 'active': False, + }, + ], + ) + + def test_get_links_home_superuser(self): """Test get_user_links() on the home view as superuser""" url = reverse('home') - superuser = self.make_user('superuser') - superuser.is_superuser = True - superuser.save() - with self.login(superuser): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = superuser - self.assertEqual( - tags.get_user_links(request), - [ - { - 'name': 'adminalerts', - 'url': '/alerts/adm/list', - 'label': 'Admin Alerts', - 'icon': 'mdi:alert', - 'active': False, - }, - { - 'name': 'appalerts', - 'url': '/alerts/app/list', - 'label': 'App Alerts', - 'icon': 'mdi:alert-octagram', - 'active': False, - }, - { - 'name': 'bgjobs_site', - 'url': '/bgjobs/list', - 'label': 'Site Background Jobs', - 'icon': 'mdi:server', - 'active': False, - }, - { - 'name': 'example_site_app', - 'url': '/examples/site/example', - 'label': 'Example Site App', - 'icon': 'mdi:rocket-launch-outline', - 'active': False, - }, - { - 'name': 'remotesites', - 'url': '/project/remote/sites', - 'label': 'Remote Site Access', - 'icon': 'mdi:cloud-sync', - 'active': False, - }, - { - 'name': 'siteinfo', - 'url': '/siteinfo/info', - 'label': 'Site Info', - 'icon': 'mdi:bar-chart', - 'active': False, - }, - { - 'name': 'timeline_site', - 'url': '/timeline/site', - 'label': 'Site-Wide Events', - 'icon': 'mdi:clock-time-eight-outline', - 'active': False, - }, - { - 'name': 'timeline_site_admin', - 'url': '/timeline/site/all', - 'label': 'All Timeline Events', - 'icon': 'mdi:web-clock', - 'active': False, - }, - { - 'name': 'tokens', - 'url': '/tokens/', - 'label': 'API Tokens', - 'icon': 'mdi:key-chain-variant', - 'active': False, - }, - { - 'name': 'userprofile', - 'url': '/user/profile', - 'label': 'User Profile', - 'icon': 'mdi:account-details', - 'active': False, - }, - { - 'name': 'admin', - 'url': '/admin/', - 'label': 'Django Admin', - 'icon': 'mdi:cogs', - 'active': False, - }, - { - 'name': 'sign-out', - 'url': '/logout/', - 'label': 'Logout', - 'icon': 'mdi:logout-variant', - 'active': False, - }, - ], - ) + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.superuser + self.assertEqual( + tags.get_user_links(request), + [ + { + 'name': 'adminalerts', + 'url': '/alerts/adm/list', + 'label': 'Admin Alerts', + 'icon': 'mdi:alert', + 'active': False, + }, + { + 'name': 'appalerts', + 'url': '/alerts/app/list', + 'label': 'App Alerts', + 'icon': 'mdi:alert-octagram', + 'active': False, + }, + { + 'name': 'bgjobs_site', + 'url': '/bgjobs/list', + 'label': 'Site Background Jobs', + 'icon': 'mdi:server', + 'active': False, + }, + { + 'name': 'example_site_app', + 'url': '/examples/site/example', + 'label': 'Example Site App', + 'icon': 'mdi:rocket-launch-outline', + 'active': False, + }, + { + 'name': 'remotesites', + 'url': '/project/remote/sites', + 'label': 'Remote Site Access', + 'icon': 'mdi:cloud-sync', + 'active': False, + }, + { + 'name': 'siteinfo', + 'url': '/siteinfo/info', + 'label': 'Site Info', + 'icon': 'mdi:bar-chart', + 'active': False, + }, + { + 'name': 'timeline_site', + 'url': '/timeline/site', + 'label': 'Site-Wide Events', + 'icon': 'mdi:clock-time-eight-outline', + 'active': False, + }, + { + 'name': 'timeline_site_admin', + 'url': '/timeline/site/all', + 'label': 'All Timeline Events', + 'icon': 'mdi:web-clock', + 'active': False, + }, + { + 'name': 'tokens', + 'url': '/tokens/', + 'label': 'API Tokens', + 'icon': 'mdi:key-chain-variant', + 'active': False, + }, + { + 'name': 'userprofile', + 'url': '/user/profile', + 'label': 'User Profile', + 'icon': 'mdi:account-details', + 'active': False, + }, + { + 'name': 'admin', + 'url': '/admin/', + 'label': 'Django Admin', + 'icon': 'mdi:cogs', + 'active': False, + }, + { + 'name': 'sign-out', + 'url': '/logout/', + 'label': 'Logout', + 'icon': 'mdi:logout-variant', + 'active': False, + }, + ], + ) def test_get_user_links_userprofile(self): """Test get_user_links() on the user profile view""" url = reverse('userprofile:detail') - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - for app in tags.get_user_links(request): - if app['name'] == 'userprofile': - self.assertEqual(app['active'], True) - else: - self.assertEqual(app['active'], False) + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + for app in tags.get_user_links(request): + if app['name'] == 'userprofile': + self.assertEqual(app['active'], True) + else: + self.assertEqual(app['active'], False) def test_get_user_links_remote_site(self): """Test get_user_links() on the remote site view""" url = reverse('projectroles:remote_site_create') - with self.login(self.user): - request = self.req_factory.get(url) - request.resolver_match = resolve(url) - request.user = self.user - for app in tags.get_user_links(request): - if app['name'] == 'remote_site_app': - self.assertEqual(app['active'], True) - else: - self.assertEqual(app['active'], False) + request = self.req_factory.get(url) + request.resolver_match = resolve(url) + request.user = self.user + for app in tags.get_user_links(request): + if app['name'] == 'remote_site_app': + self.assertEqual(app['active'], True) + else: + self.assertEqual(app['active'], False)