From ec99859590336d6ce71b8be9ba45727a1f63d96d Mon Sep 17 00:00:00 2001
From: Charles Morgan <sir3lit@gmail.com>
Date: Sat, 28 Nov 2020 14:48:35 -0500
Subject: [PATCH 1/3] Don't show delete button if its own user

Don't show the delete button if a sub-user is looking at sub-users, as they cannot delete themselves.
---
 resources/scripts/components/server/users/UserRow.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/scripts/components/server/users/UserRow.tsx b/resources/scripts/components/server/users/UserRow.tsx
index aa5e55a39..656a69510 100644
--- a/resources/scripts/components/server/users/UserRow.tsx
+++ b/resources/scripts/components/server/users/UserRow.tsx
@@ -61,7 +61,9 @@ export default ({ subuser }: Props) => {
                 }
             </Can>
             <Can action={'user.delete'}>
+                {subuser.uuid !== uuid &&
                 <RemoveSubuserButton subuser={subuser}/>
+                }
             </Can>
         </GreyRowBox>
     );

From 947fdf72ed12ddbf5aea3fd04d4d969ad78db2ee Mon Sep 17 00:00:00 2001
From: Charles Morgan <sir3lit@gmail.com>
Date: Sun, 29 Nov 2020 18:13:20 -0500
Subject: [PATCH 2/3] Update UserRow.tsx

---
 .../components/server/users/UserRow.tsx       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/scripts/components/server/users/UserRow.tsx b/resources/scripts/components/server/users/UserRow.tsx
index 656a69510..08adecd78 100644
--- a/resources/scripts/components/server/users/UserRow.tsx
+++ b/resources/scripts/components/server/users/UserRow.tsx
@@ -48,23 +48,23 @@ export default ({ subuser }: Props) => {
                 </p>
                 <p css={tw`text-2xs text-neutral-500 uppercase`}>Permissions</p>
             </div>
-            <Can action={'user.update'}>
-                {subuser.uuid !== uuid &&
-                <button
-                    type={'button'}
-                    aria-label={'Edit subuser'}
-                    css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
-                    onClick={() => setVisible(true)}
-                >
-                    <FontAwesomeIcon icon={faPencilAlt}/>
-                </button>
-                }
-            </Can>
-            <Can action={'user.delete'}>
-                {subuser.uuid !== uuid &&
-                <RemoveSubuserButton subuser={subuser}/>
-                }
-            </Can>
+            {subuser.uuid !== uuid &&
+                <Can action={'user.update'}>
+                    <button
+                        type={'button'}
+                        aria-label={'Edit subuser'}
+                        css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
+                        onClick={() => setVisible(true)}
+                    >
+                        <FontAwesomeIcon icon={faPencilAlt}/>
+                    </button>
+                </Can>
+            }
+            {subuser.uuid !== uuid &&
+                <Can action={'user.delete'}>
+                    <RemoveSubuserButton subuser={subuser}/>
+                </Can>
+            }
         </GreyRowBox>
     );
 };

From 76d671aa8aaf6b370f2a046613c339b1bf099bc7 Mon Sep 17 00:00:00 2001
From: Charles Morgan <sir3lit@gmail.com>
Date: Sun, 29 Nov 2020 19:35:16 -0500
Subject: [PATCH 3/3] Update UserRow.tsx

---
 .../components/server/users/UserRow.tsx       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/scripts/components/server/users/UserRow.tsx b/resources/scripts/components/server/users/UserRow.tsx
index 08adecd78..ec20baa8e 100644
--- a/resources/scripts/components/server/users/UserRow.tsx
+++ b/resources/scripts/components/server/users/UserRow.tsx
@@ -49,21 +49,21 @@ export default ({ subuser }: Props) => {
                 <p css={tw`text-2xs text-neutral-500 uppercase`}>Permissions</p>
             </div>
             {subuser.uuid !== uuid &&
-                <Can action={'user.update'}>
-                    <button
-                        type={'button'}
-                        aria-label={'Edit subuser'}
-                        css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
-                        onClick={() => setVisible(true)}
-                    >
-                        <FontAwesomeIcon icon={faPencilAlt}/>
-                    </button>
-                </Can>
-            }
-            {subuser.uuid !== uuid &&
-                <Can action={'user.delete'}>
-                    <RemoveSubuserButton subuser={subuser}/>
-                </Can>
+                <>
+                    <Can action={'user.update'}>
+                        <button
+                            type={'button'}
+                            aria-label={'Edit subuser'}
+                            css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
+                            onClick={() => setVisible(true)}
+                        >
+                            <FontAwesomeIcon icon={faPencilAlt} />
+                        </button>
+                    </Can>
+                    <Can action={'user.delete'}>
+                        <RemoveSubuserButton subuser={subuser} />
+                    </Can>
+                </>
             }
         </GreyRowBox>
     );