feat: removing old filter ui implementation (#864) (#880)

varfish-org · May 10, 2023 · 2dabbef · 2dabbef
1 parent 041a036
commit 2dabbef
Show file tree

Hide file tree

Showing 123 changed files with 831 additions and 22,500 deletions.
diff --git a/cases/plugins.py b/cases/plugins.py
@@ -10,9 +10,9 @@ class ProjectAppPlugin(ProjectAppPluginPoint):
     title = "Cases"
     urls = urlpatterns
 
-    plugin_ordering = 100
+    plugin_ordering = 10
 
-    icon = "mdi:beta"
+    icon = "mdi:hospital-building"
 
     entry_point_url_id = "cases:entrypoint"
 

diff --git a/cases/vueapp/src/api/cases.js b/cases/vueapp/src/api/cases.js
@@ -57,7 +57,7 @@ export default {
   async loadProjectQcValues(csrfToken, projectUuid) {
     const response = await apiFetch(
       csrfToken,
-      `/variants/${projectUuid}/api-qc/`
+      `/variants/ajax/project/qc/${projectUuid}/`
     )
     return await response.json()
   },

diff --git a/cases/vueapp/src/main.js b/cases/vueapp/src/main.js
@@ -51,7 +51,7 @@ const routes = [
   },
   {
     name: 'variants-filter',
-    path: '/variants/filter/:case',
+    path: '/variants/filter/:case/:query?',
     component: FilterApp,
   },
   {

diff --git a/cases/vueapp/tests/unit/cases/api.spec.js b/cases/vueapp/tests/unit/cases/api.spec.js
@@ -80,7 +80,7 @@ describe('api', () => {
 
     expect(fetch.mock.calls.length).toEqual(1)
     expect(fetch.mock.calls[0]).toEqual([
-      '/variants/fake-project-uuid/api-qc/',
+      '/variants/ajax/project/qc/fake-project-uuid/',
       {
         body: null,
         credentials: 'same-origin',

diff --git a/config/settings/base.py b/config/settings/base.py
@@ -612,7 +612,8 @@
 # Allow showing and synchronizing local non-admin users
 PROJECTROLES_ALLOW_LOCAL_USERS = env.bool("PROJECTROLES_ALLOW_LOCAL_USERS", False)
 
-PROJECTROLES_HIDE_APP_LINKS = ["svs"]
+# Hide selected apps
+PROJECTROLES_HIDE_APP_LINKS = ["svs", "variants"]
 
 # Whether or not to sync from remote (disable only locally).
 VARFISH_PROJECTROLES_SYNC_REMOTE = env.bool("VARFISH_PROJECTROLES_SYNC_REMOTE", True)

diff --git a/config/urls.py b/config/urls.py
@@ -12,8 +12,6 @@
 from projectroles.views import HomeView as ProjectRolesHomeView
 from sentry_sdk import last_event_id
 
-from variants.views import KioskHomeView
-
 
 def handler500(request, *args, **argv):
     if request.user and "User" in str(type(request.user)):
@@ -40,16 +38,8 @@ def handler500(request, *args, **argv):
     url(r"^sso/admin/logout/$", django_saml2_auth.views.signout),
 ]
 
-# The functionality differs greatly depending on whether kiosk mode is enabled or not. However, the URL patterns
-# do not need to.
-if settings.KIOSK_MODE:
-    urlpatterns += [
-        url(r"^$", KioskHomeView.as_view(), name="kiosk-upload"),
-        url(r"^real-home/$", ProjectRolesHomeView.as_view(), name="home"),
-    ]
-else:
-    urlpatterns += [url(r"^$", ProjectRolesHomeView.as_view(), name="home")]
-    HomeView = ProjectRolesHomeView
+urlpatterns += [url(r"^$", ProjectRolesHomeView.as_view(), name="home")]
+HomeView = ProjectRolesHomeView
 
 urlpatterns += [
     url(r"^icons/", include("dj_iconify.urls")),

diff --git a/importer/templates/importer/import_case_detail.html b/importer/templates/importer/import_case_detail.html
@@ -8,7 +8,6 @@
 {% load json %}
 
 {% block navi_sub_project_extend %}
-  <li class="breadcrumb-item"><a href="{% url "variants:case-list" project=project.sodar_uuid %}">Cases</a></li>
   <li class="breadcrumb-item"><a href="{% url "bgjobs:list" project=project.sodar_uuid %}">Jobs</a></li>
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
@@ -65,7 +64,7 @@ <h4>
             <div class="col-10 p-1">
               {% with case=object.get_case %}
                 {% if case %}
-                  <a href="{% url 'variants:case-detail' project=object.project.sodar_uuid case=case.sodar_uuid %}">{{ object.case_name }}</a>
+                  <a href='{% url "cases:entrypoint" project=project.sodar_uuid %}/detail/{{ object.case_uuid }}'>{{ object.case_name }}</a>
                 {% else %}
                   {{ object.case_name }}
                 {% endif %}