From 42f7a9e1588788743d0632019aa67d088a90dea2 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:11:04 +0000
Subject: [PATCH 1/2] refactor: remove members role col

---
 .../members/[[page]]/+page.svelte             | 58 ++++---------------
 1 file changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
index 939cef299..daff132c8 100644
--- a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
+++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
@@ -1,57 +1,31 @@
 <script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { page } from '$app/stores';
+    import { AvatarInitials, Heading, Pagination } from '$lib/components';
+    import { Dependencies, PAGE_LIMIT } from '$lib/constants';
+    import { Pill } from '$lib/elements';
+    import { Button } from '$lib/elements/forms';
     import {
-        TableHeader,
         TableBody,
-        TableCellHead,
         TableCell,
+        TableCellHead,
         TableCellText,
+        TableHeader,
         TableRow,
         TableScroll
     } from '$lib/elements/table';
-    import { AvatarInitials, Heading, Pagination } from '$lib/components';
-    import { Pill } from '$lib/elements';
-    import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
-    import { organization, members, newMemberModal } from '$lib/stores/organization';
-    import { sdkForConsole } from '$lib/stores/sdk';
-    import { page } from '$app/stores';
-    import { addNotification } from '$lib/stores/notifications';
-    import { invalidate } from '$app/navigation';
-    import { Dependencies, PAGE_LIMIT } from '$lib/constants';
-    import Delete from '../../deleteMember.svelte';
+    import { members, newMemberModal } from '$lib/stores/organization';
     import type { Models } from '@aw-labs/appwrite-console';
+    import Delete from '../../deleteMember.svelte';
     import type { PageData } from './$types';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
 
     export let data: PageData;
 
     let selectedMember: Models.Membership;
     let showDelete = false;
 
-    const url = `${$page.url.origin}/console/`;
     const deleted = () => invalidate(Dependencies.ACCOUNT);
-    const resend = async (member: Models.Membership) => {
-        try {
-            await sdkForConsole.teams.createMembership(
-                $organization.$id,
-                member.userEmail,
-                member.roles,
-                url,
-                member.userName
-            );
-            addNotification({
-                type: 'success',
-                message: `Invite has been sent to ${member.userEmail}`
-            });
-            trackEvent(Submit.MemberCreate);
-        } catch (error) {
-            addNotification({
-                type: 'error',
-                message: error
-            });
-            trackError(error, Submit.MemberCreate);
-        }
-    };
 </script>
 
 <Container>
@@ -69,7 +43,6 @@
             <TableHeader>
                 <TableCellHead width={140}>Name</TableCellHead>
                 <TableCellHead width={120}>Email</TableCellHead>
-                <TableCellHead width={90}>Role</TableCellHead>
                 <TableCellHead width={30} />
             </TableHeader>
             <TableBody>
@@ -87,17 +60,6 @@
                             </div>
                         </TableCell>
                         <TableCellText title="Email">{member.userEmail}</TableCellText>
-                        <TableCell title="Roles">
-                            {#if member.invited && !member.joined}
-                                <Button
-                                    secondary
-                                    event="invite_resend"
-                                    on:click={() => resend(member)}>Resend</Button>
-                            {:else}
-                                {member.roles}
-                            {/if}
-                        </TableCell>
-
                         <TableCell>
                             <button
                                 class="button is-only-icon is-text"

From 9e5a3baf208d8ea173b0e374a286a03e85abc929 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 15 Mar 2023 15:51:49 +0000
Subject: [PATCH 2/2] refactor: revert resend removal

---
 .../members/[[page]]/+page.svelte             | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
index daff132c8..e9dff9557 100644
--- a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
+++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
     import { page } from '$app/stores';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { AvatarInitials, Heading, Pagination } from '$lib/components';
     import { Dependencies, PAGE_LIMIT } from '$lib/constants';
     import { Pill } from '$lib/elements';
@@ -15,7 +16,9 @@
         TableScroll
     } from '$lib/elements/table';
     import { Container } from '$lib/layout';
-    import { members, newMemberModal } from '$lib/stores/organization';
+    import { addNotification } from '$lib/stores/notifications';
+    import { members, newMemberModal, organization } from '$lib/stores/organization';
+    import { sdkForConsole } from '$lib/stores/sdk';
     import type { Models } from '@aw-labs/appwrite-console';
     import Delete from '../../deleteMember.svelte';
     import type { PageData } from './$types';
@@ -24,8 +27,30 @@
 
     let selectedMember: Models.Membership;
     let showDelete = false;
-
+    const url = `${$page.url.origin}/console/`;
     const deleted = () => invalidate(Dependencies.ACCOUNT);
+    const resend = async (member: Models.Membership) => {
+        try {
+            await sdkForConsole.teams.createMembership(
+                $organization.$id,
+                member.userEmail,
+                member.roles,
+                url,
+                member.userName
+            );
+            addNotification({
+                type: 'success',
+                message: `Invite has been sent to ${member.userEmail}`
+            });
+            trackEvent(Submit.MemberCreate);
+        } catch (error) {
+            addNotification({
+                type: 'error',
+                message: error
+            });
+            trackError(error, Submit.MemberCreate);
+        }
+    };
 </script>
 
 <Container>
@@ -43,6 +68,7 @@
             <TableHeader>
                 <TableCellHead width={140}>Name</TableCellHead>
                 <TableCellHead width={120}>Email</TableCellHead>
+                <TableCellHead width={90} />
                 <TableCellHead width={30} />
             </TableHeader>
             <TableBody>
@@ -60,6 +86,14 @@
                             </div>
                         </TableCell>
                         <TableCellText title="Email">{member.userEmail}</TableCellText>
+                        <TableCell>
+                            {#if member.invited && !member.joined}
+                                <Button
+                                    secondary
+                                    event="invite_resend"
+                                    on:click={() => resend(member)}>Resend</Button>
+                            {/if}
+                        </TableCell>
                         <TableCell>
                             <button
                                 class="button is-only-icon is-text"