From 5b824ccb17212b233267fbb4acee99c91b472039 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Sun, 17 Oct 2021 18:53:24 +0530
Subject: [PATCH] feat: minor ui improvements on invite flow

---
 .../components/teams/Invite.vue               | 83 +++++++++++++++++--
 packages/hoppscotch-app/locales/en.json       |  5 +-
 2 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/packages/hoppscotch-app/components/teams/Invite.vue b/packages/hoppscotch-app/components/teams/Invite.vue
index 33f4de0fa..a5a20e61f 100644
--- a/packages/hoppscotch-app/components/teams/Invite.vue
+++ b/packages/hoppscotch-app/components/teams/Invite.vue
@@ -1,7 +1,35 @@
 <template>
   <SmartModal v-if="show" :title="$t('team.invite')" @close="hideModal">
     <template #body>
-      <div class="flex flex-col px-2">
+      <div v-if="sendInvitesResult.length" class="flex flex-col px-4">
+        <div class="flex flex-col max-w-md justify-center items-center">
+          <SmartIcon class="h-6 text-accent w-6" name="users" />
+          <h3 class="my-2 text-center text-lg">
+            {{ $t("team.we_sent_invite_link") }}
+          </h3>
+          <p class="text-center">
+            {{ $t("team.we_sent_invite_link_description") }}
+          </p>
+        </div>
+        <div class="flex space-y-2 px-4 pt-8 flex-col">
+          <div
+            v-for="(invitee, index) in sendInvitesResult"
+            :key="`invitee-${index}`"
+            class="flex items-center"
+          >
+            <i
+              class="material-icons mr-4"
+              :class="
+                invitee.status === 'error' ? 'text-red-500' : 'text-green-500'
+              "
+            >
+              {{ invitee.status === "error" ? "error" : "check_circle" }}
+            </i>
+            <span class="flex truncate">{{ invitee.email }}</span>
+          </div>
+        </div>
+      </div>
+      <div v-else class="flex flex-col px-2">
         <div class="flex flex-1 justify-between items-center">
           <label for="memberList" class="pb-4 px-4">
             {{ $t("team.pending_invites") }}
@@ -121,7 +149,7 @@
             />
             <span>
               <tippy
-                :ref="`newMemberOptions-${index}`"
+                ref="newInviteeOptions"
                 interactive
                 trigger="click"
                 theme="popover"
@@ -150,15 +178,30 @@
                 </template>
                 <SmartItem
                   label="OWNER"
-                  @click.native="updateNewInviteeRole(index, 'OWNER')"
+                  @click.native="
+                    () => {
+                      updateNewInviteeRole(index, 'OWNER')
+                      newInviteeOptions[index].tippy().hide()
+                    }
+                  "
                 />
                 <SmartItem
                   label="EDITOR"
-                  @click.native="updateNewInviteeRole(index, 'EDITOR')"
+                  @click.native="
+                    () => {
+                      updateNewInviteeRole(index, 'EDITOR')
+                      newInviteeOptions[index].tippy().hide()
+                    }
+                  "
                 />
                 <SmartItem
                   label="VIEWER"
-                  @click.native="updateNewInviteeRole(index, 'VIEWER')"
+                  @click.native="
+                    () => {
+                      updateNewInviteeRole(index, 'VIEWER')
+                      newInviteeOptions[index].tippy().hide()
+                    }
+                  "
                 />
               </tippy>
             </span>
@@ -197,7 +240,27 @@
       </div>
     </template>
     <template #footer>
-      <span>
+      <p
+        v-if="sendInvitesResult.length"
+        class="flex flex-1 text-secondaryLight justify-between"
+      >
+        <SmartAnchor
+          class="link"
+          :label="`← \xA0 ${$t('team.invite_more')}`"
+          @click.native="
+            () => {
+              sendInvitesResult = []
+              newInvites = []
+            }
+          "
+        />
+        <SmartAnchor
+          class="link"
+          :label="`${$t('action.dismiss')}`"
+          @click.native="hideModal"
+        />
+      </p>
+      <span v-else>
         <ButtonPrimary :label="$t('team.invite')" @click.native="sendInvites" />
         <ButtonSecondary
           :label="$t('action.cancel')"
@@ -234,6 +297,8 @@ const {
 } = useContext()
 const t = i18n.t.bind(i18n)
 
+const newInviteeOptions = ref<any | null>(null)
+
 const props = defineProps({
   show: Boolean,
   editingteamID: { type: String, default: null },
@@ -303,7 +368,7 @@ const removeNewInvitee = (id: number) => {
   newInvites.value.splice(id, 1)
 }
 
-const result = ref<
+const sendInvitesResult = ref<
   Array<{
     email: Email
     status: "error" | "success"
@@ -335,7 +400,7 @@ const sendInvites = async () => {
     return
   }
 
-  result.value = await pipe(
+  sendInvitesResult.value = await pipe(
     A.sequence(T.task)(validationResult.value),
     T.chain(
       flow(
@@ -361,6 +426,8 @@ const sendInvites = async () => {
 }
 
 const hideModal = () => {
+  sendInvitesResult.value = []
+  newInvites.value = []
   emit("hide-modal")
 }
 </script>
diff --git a/packages/hoppscotch-app/locales/en.json b/packages/hoppscotch-app/locales/en.json
index 131e5d06b..9640e1b96 100644
--- a/packages/hoppscotch-app/locales/en.json
+++ b/packages/hoppscotch-app/locales/en.json
@@ -479,6 +479,7 @@
     "invalid_email_format": "Email format is invalid",
     "invalid_member_permission": "Please provide a valid permission to the team member",
     "invite": "Invite",
+    "invite_more": "Invite more",
     "invite_tooltip": "Invite people to this workspace",
     "invited_to_team": "{owner} invited you to join {team}",
     "join_beta": "Join the beta program to access teams.",
@@ -496,7 +497,9 @@
     "permissions": "Permissions",
     "saved": "Team saved",
     "select_a_team": "Select a team",
-    "title": "Teams"
+    "title": "Teams",
+    "we_sent_invite_link": "We sent an invite link to all invitees!",
+    "we_sent_invite_link_description": "Ask all invitees to check their inbox. Click on the link to join the team."
   },
   "test": {
     "failed": "test failed",