From fc86835e8bb96612236fbf05b83db18472715287 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 1 Dec 2023 13:25:10 +0300 Subject: [PATCH] Adjust grid element type, relax grid user operation condition --- client/src/components/Grid/GridElements/GridBoolean.vue | 2 +- client/src/components/Grid/GridElements/GridText.vue | 2 +- client/src/components/Grid/configs/adminUsers.test.js | 4 ++-- client/src/components/Grid/configs/adminUsers.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/components/Grid/GridElements/GridBoolean.vue b/client/src/components/Grid/GridElements/GridBoolean.vue index 0135b601fa04..c98c590290a3 100644 --- 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(); diff --git a/client/src/components/Grid/GridElements/GridText.vue b/client/src/components/Grid/GridElements/GridText.vue index 7128471a6ccc..5b6ba76c81bf 100644 --- a/client/src/components/Grid/GridElements/GridText.vue +++ b/client/src/components/Grid/GridElements/GridText.vue @@ -1,6 +1,6 @@ diff --git a/client/src/components/Grid/configs/adminUsers.test.js b/client/src/components/Grid/configs/adminUsers.test.js index c336f45984b1..f10d62a77e2f 100644 --- 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 index 9f7663eeaf32..d4e0158e2817 100644 --- 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",