cleanup for v0.14.1 release (wip) (#1826)

bihealth · Dec 7, 2023 · 11ddb3c · 11ddb3c
1 parent eb7ece0
commit 11ddb3c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/ontologyaccess/templates/ontologyaccess/list.html b/ontologyaccess/templates/ontologyaccess/list.html
@@ -14,27 +14,23 @@
       width: 170px;
       white-space: nowrap;
     }
-
     table#sodar-oa-list-table thead tr th:nth-child(6),
     table#sodar-oa-list-table tbody tr td:nth-child(6) {
       width: 75px;
     }
-
     /* Responsive modifications */
     @media screen and (max-width: 1200px) {
       table#sodar-oa-list-table thead tr th:nth-child(5),
       table#sodar-oa-list-table tbody tr td:nth-child(5) {
         display: none;
       }
     }
-
     @media screen and (max-width: 1100px) {
       table#sodar-oa-list-table thead tr th:nth-child(4),
       table#sodar-oa-list-table tbody tr td:nth-child(4) {
         display: none;
       }
     }
-
     @media screen and (max-width: 650px) {
       table#sodar-oa-list-table thead tr th:nth-child(3),
       table#sodar-oa-list-table tbody tr td:nth-child(3) {
@@ -44,20 +40,17 @@
   </style>
 {% endblock css %}
 
-
 {% block projectroles %}
 
 <div class="row sodar-subtitle-container bg-white sticky-top">
   <h2><i class="iconify" data-icon="mdi:tags"></i> Ontology Access</h2>
-
   <a role="button" class="btn btn-primary ml-auto"
      href="{% url 'ontologyaccess:obo_import' %}">
-    <i class="iconify" data-icon="mdi:upload"></i> Import  Ontology
+    <i class="iconify" data-icon="mdi:upload"></i> Import Ontology
   </a>
 </div>
 
 <div class="container-fluid sodar-page-container">
-
   {% if object_list.count > 0 %}
     <div class="card" id="sodar-oa-alert-list">
       <div class="card-header">
@@ -109,15 +102,13 @@ <h4><i class="iconify" data-icon="mdi:tag"></i> OBO Format Ontologies</h4>
         </table>
       </div>
     </div>
-
   {% else %} {# if object_list.count == 0 #}
     <div class="container-fluid">
       <div class="alert alert-info" role="alert">
         No imported ontologies found.
       </div>
     </div>
   {% endif %}
-
 </div>
 
 {% endblock projectroles %}
diff --git a/ontologyaccess/templates/ontologyaccess/obo_import_form.html b/ontologyaccess/templates/ontologyaccess/obo_import_form.html
@@ -11,7 +11,6 @@
     input#id_term_url {
       font-family: monospace;
     }
-
     div.alert ul {
       margin-bottom: 0;
     }

diff --git a/samplesheets/plugins.py b/samplesheets/plugins.py
@@ -537,7 +537,6 @@ def get_project_list_value(self, column_id, project, user):
                 )
             )
 
-    # TODO: Add tests
     def validate_form_app_settings(self, app_settings, project=None, user=None):
         """
         Validate app settings form data and return a dict of errors.

diff --git a/samplesheets/templates/samplesheets/_details_card.html b/samplesheets/templates/samplesheets/_details_card.html
@@ -19,11 +19,9 @@
   table#sodar-ss-details-table tr td:nth-child(2) {
     width: 220px;
   }
-
   table#sodar-ss-details-table tr td:nth-child(3) {
     width: 110px;
   }
-
   /* Responsive modifications */
   @media screen and (max-width: 800px) {
     table#sodar-ss-details-table tr th:nth-child(2) {
@@ -37,11 +35,11 @@
 
 {% if not investigation %}
   <div class="card-body bg-faded font-italic text-center">
-    <p>No sample sheets available</p>
+    <p>No sample sheets available.</p>
   </div>
 {% elif investigation and not investigation.irods_status %}
   <div class="card-body bg-faded font-italic text-center">
-    <p>Sample sheets available, sample repository not created in iRODS</p>
+    <p>Sample sheets available, sample repository not created in iRODS.</p>
   </div>
 {% elif investigation and can_view_sheet %}
   <!-- Irodsbackend -->

diff --git a/samplesheets/templates/samplesheets/irods_requests.html b/samplesheets/templates/samplesheets/irods_requests.html
@@ -217,7 +217,7 @@ <h3>iRODS Delete Requests</h3>
     {% if is_contributor %}
       You don't have active iRODS delete requests for this project.
     {% else %}
-      No iRODS delete requests have been found for the sample sheets in this project.
+      No iRODS delete requests have been found for this project.
     {% endif %}
   </div>
 {% endif %}

diff --git a/samplesheets/tests/test_tasks_celery_taskflow.py b/samplesheets/tests/test_tasks_celery_taskflow.py
@@ -27,7 +27,7 @@
     CACHE_UPDATE_EVENT,
 )
 from samplesheets.tests.test_io import SampleSheetIOMixin, SHEET_DIR
-from samplesheets.tests.test_views import TestSheetRemoteSyncBase
+from samplesheets.tests.test_views import SheetRemoteSyncTestBase
 from samplesheets.tests.test_views_taskflow import (
     SampleSheetTaskflowMixin,
 )
@@ -154,7 +154,7 @@ def test_update_cache_no_user(self):
         self.assertEqual(ProjectEvent.objects.count(), 3)
 
 
-class TestSheetRemoteSyncTask(TestSheetRemoteSyncBase):
+class TestSheetRemoteSyncTask(SheetRemoteSyncTestBase):
     """Tests for periodic sample sheet sync task"""
 
     def setUp(self):

diff --git a/samplesheets/tests/test_views.py b/samplesheets/tests/test_views.py
@@ -1629,7 +1629,7 @@ def test_list_empty(self):
         self.assertEqual(len(response.context['object_list']), 0)
 
 
-class TestSheetRemoteSyncBase(
+class SheetRemoteSyncTestBase(
     ProjectMixin,
     RoleMixin,
     RoleAssignmentMixin,
@@ -1694,7 +1694,7 @@ def setUp(self):
         )
 
 
-class TestSheetRemoteSyncView(TestSheetRemoteSyncBase):
+class TestSheetRemoteSyncView(SheetRemoteSyncTestBase):
     """Tests for SheetRemoteSyncView"""
 
     def test_sync(self):