Adjust grid element type, relax grid user operation condition

galaxyproject · Dec 1, 2023 · db72fc3 · db72fc3
1 parent 9b40f78
commit db72fc3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/client/src/components/Grid/GridElements/GridBoolean.vue b/client/src/components/Grid/GridElements/GridBoolean.vue
@@ -2,7 +2,7 @@
 import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 
 interface Props {
-    value?: string;
+    value?: boolean;
 }
 
 defineProps<Props>();

diff --git a/client/src/components/Grid/GridElements/GridText.vue b/client/src/components/Grid/GridElements/GridText.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 interface Props {
-    text?: string;
+    text?: string | number;
 }
 defineProps<Props>();
 </script>

diff --git a/client/src/components/Grid/configs/adminUsers.test.js b/client/src/components/Grid/configs/adminUsers.test.js
@@ -7,8 +7,8 @@ describe("AdminUsers", () => {
         const fieldEmail = fields[0];
         expect(fieldEmail.key).toBe("email");
         expect(fieldEmail.type).toBe("operations");
-        for (const deleted of [true, false]) {
-            expect(fieldEmail.condition({ deleted })).toBe(!deleted);
+        for (const purged of [true, false]) {
+            expect(fieldEmail.condition({ purged })).toBe(!purged);
         }
         const ops = fieldEmail.operations;
         const titles = [

diff --git a/client/src/components/Grid/configs/adminUsers.ts b/client/src/components/Grid/configs/adminUsers.ts
@@ -66,7 +66,7 @@ const fields: FieldArray = [
         key: "email",
         title: "Email",
         type: "operations",
-        condition: (data: UserEntry) => !data.deleted && !data.purged,
+        condition: (data: UserEntry) => !data.purged,
         operations: [
             {
                 title: "Manage Information",