Fix linting and jest test for grid list component

galaxyproject · Nov 29, 2023 · 1911272 · 1911272
1 parent 7be5a4b
commit 1911272
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/client/src/components/Grid/GridList.test.js b/client/src/components/Grid/GridList.test.js
@@ -50,7 +50,7 @@ const testGrid = {
             key: "operation",
             title: "operation",
             type: "operations",
-            condition: jest.fn(),
+            condition: jest.fn(() => true),
             operations: [
                 {
                     title: "operation-title-1",

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
@@ -219,9 +219,9 @@ watch(operationMessage, () => {
         </div>
         <LoadingSpan v-if="loading" />
         <BAlert v-else-if="!isAvailable" variant="info" show>
-            <span v-if="searchTerm" v-localize>
-                No entries found for: <b>{{ searchTerm }}</b
-                >.
+            <span v-if="searchTerm">
+                <span v-localize>Nothing found with:</span>
+                <b>{{ searchTerm }}</b>
             </span>
             <span v-else v-localize> No entries found. </span>
         </BAlert>
@@ -249,9 +249,10 @@ watch(operationMessage, () => {
                     v-for="(fieldEntry, fieldIndex) in config.fields"
                     :key="fieldIndex"
                     class="px-2 py-3"
-                    :style="{ width: `${fieldEntry.width}%` }"
-                    :data-description="`grid cell ${rowIndex}-${fieldIndex}`">
-                    <div v-if="!fieldEntry.condition || fieldEntry.condition(rowData)">
+                    :style="{ width: `${fieldEntry.width}%` }">
+                    <div
+                        v-if="!fieldEntry.condition || fieldEntry.condition(rowData)"
+                        :data-description="`grid cell ${rowIndex}-${fieldIndex}`">
                         <GridOperations
                             v-if="fieldEntry.type == 'operations' && fieldEntry.operations"
                             :operations="fieldEntry.operations"

diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -26,11 +26,7 @@
 )
 from galaxy.security.validate_user_input import validate_password
 from galaxy.structured_app import StructuredApp
-from galaxy.util import (
-    nice_size,
-    pretty_print_time_interval,
-    sanitize_text,
-)
+from galaxy.util import pretty_print_time_interval
 from galaxy.util.search import (
     FilteredTerm,
     parse_filters_structured,