From c37ee12e575554fc64bcb8330af27b357e72a871 Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Wed, 14 Aug 2019 08:32:03 -0400
Subject: [PATCH] Bugfix/userdrawer changestatus (#2469)

* fix date formatting breaking user details popvoer

* update mutation return fields for user status changes
---
 .../components/UserStatus/BanUserMutation.ts  | 13 ++++++++++
 .../UserStatus/RemoveUserBanMutation.ts       |  8 +++++++
 .../RemoveUserSuspensionMutation.ts           | 15 ++++++++++++
 .../UserStatus/SuspendUserMutation.ts         | 24 +++++++++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/src/core/client/admin/components/UserStatus/BanUserMutation.ts b/src/core/client/admin/components/UserStatus/BanUserMutation.ts
index e79a4a0d3..ffbeaa2b7 100644
--- a/src/core/client/admin/components/UserStatus/BanUserMutation.ts
+++ b/src/core/client/admin/components/UserStatus/BanUserMutation.ts
@@ -25,6 +25,13 @@ const BanUserMutation = createMutation(
                 current
                 ban {
                   active
+                  history {
+                    active
+                    createdAt
+                    createdBy {
+                      username
+                    }
+                  }
                 }
               }
             }
@@ -49,6 +56,12 @@ const BanUserMutation = createMutation(
               )!.status.current.concat(GQLUSER_STATUS.BANNED),
               ban: {
                 active: true,
+                history: [
+                  {
+                    active: true,
+                    createdAt: new Date(),
+                  },
+                ],
               },
             },
           },
diff --git a/src/core/client/admin/components/UserStatus/RemoveUserBanMutation.ts b/src/core/client/admin/components/UserStatus/RemoveUserBanMutation.ts
index b10b0bdf0..2d15eea95 100644
--- a/src/core/client/admin/components/UserStatus/RemoveUserBanMutation.ts
+++ b/src/core/client/admin/components/UserStatus/RemoveUserBanMutation.ts
@@ -25,6 +25,13 @@ const RemoveUserBanMutation = createMutation(
                 current
                 ban {
                   active
+                  history {
+                    active
+                    createdAt
+                    createdBy {
+                      username
+                    }
+                  }
                 }
               }
             }
@@ -49,6 +56,7 @@ const RemoveUserBanMutation = createMutation(
               )!.status.current.filter(s => s !== GQLUSER_STATUS.BANNED),
               ban: {
                 active: false,
+                history: [],
               },
             },
           },
diff --git a/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts b/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts
index c8107e1bc..585c7c762 100644
--- a/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts
+++ b/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts
@@ -27,6 +27,16 @@ const RemoveUserSuspensionMutation = createMutation(
                 current
                 suspension {
                   active
+                  history {
+                    active
+                    from {
+                      start
+                      finish
+                    }
+                    createdBy {
+                      username
+                    }
+                  }
                 }
               }
             }
@@ -51,6 +61,11 @@ const RemoveUserSuspensionMutation = createMutation(
               )!.status.current.concat(GQLUSER_STATUS.SUSPENDED),
               suspension: {
                 active: false,
+                history: [
+                  {
+                    active: false,
+                  },
+                ],
               },
             },
           },
diff --git a/src/core/client/admin/components/UserStatus/SuspendUserMutation.ts b/src/core/client/admin/components/UserStatus/SuspendUserMutation.ts
index 7684f8692..c79e820c2 100644
--- a/src/core/client/admin/components/UserStatus/SuspendUserMutation.ts
+++ b/src/core/client/admin/components/UserStatus/SuspendUserMutation.ts
@@ -1,3 +1,4 @@
+import { DateTime } from "luxon";
 import { graphql } from "react-relay";
 import { Environment } from "relay-runtime";
 
@@ -15,6 +16,10 @@ let clientMutationId = 0;
 const SuspendUserMutation = createMutation(
   "suspendUser",
   (environment: Environment, input: MutationInput<MutationTypes>) => {
+    const now = new Date();
+    const finish = DateTime.fromJSDate(now).plus({
+      seconds: input.timeout,
+    });
     return commitMutationPromiseNormalized<MutationTypes>(environment, {
       mutation: graphql`
         mutation SuspendUserMutation($input: SuspendUserInput!) {
@@ -25,6 +30,16 @@ const SuspendUserMutation = createMutation(
                 current
                 suspension {
                   active
+                  history {
+                    active
+                    from {
+                      start
+                      finish
+                    }
+                    createdBy {
+                      username
+                    }
+                  }
                 }
               }
             }
@@ -49,6 +64,15 @@ const SuspendUserMutation = createMutation(
               )!.status.current.concat(GQLUSER_STATUS.SUSPENDED),
               suspension: {
                 active: true,
+                history: [
+                  {
+                    active: true,
+                    from: {
+                      start: now,
+                      finish,
+                    },
+                  },
+                ],
               },
             },
           },