From 1438beb93b680e4bfa6d7cfbd178242add79d9a7 Mon Sep 17 00:00:00 2001 From: liyasthomas Date: Fri, 15 Oct 2021 08:15:43 +0530 Subject: [PATCH] chore: clean up --- .../hoppscotch-app/components/teams/Edit.vue | 142 ++---------------- .../components/teams/Invite.vue | 47 ------ .../hoppscotch-app/components/teams/Team.vue | 105 +++++++------ .../hoppscotch-app/components/teams/index.vue | 1 + 4 files changed, 73 insertions(+), 222 deletions(-) diff --git a/packages/hoppscotch-app/components/teams/Edit.vue b/packages/hoppscotch-app/components/teams/Edit.vue index 7553acf39..41a97bf6c 100644 --- a/packages/hoppscotch-app/components/teams/Edit.vue +++ b/packages/hoppscotch-app/components/teams/Edit.vue @@ -23,9 +23,13 @@
@@ -97,73 +101,7 @@
- - - - - - - - - -
- -
-
-
@@ -213,7 +155,6 @@ export default defineComponent({ return { rename: null, members: [], - newMembers: [], membersAdapter: new TeamMemberAdapter(null), } }, @@ -245,14 +186,6 @@ export default defineComponent({ this.members[id].role = role this.$refs[`memberOptions-${id}`][0].tippy().hide() }, - updateNewMemberRole(id, role) { - this.newMembers[id].value = role - this.$refs[`newMemberOptions-${id}`][0].tippy().hide() - }, - addTeamMember() { - const member = { key: "", value: "" } - this.newMembers.push(member) - }, removeExistingTeamMember(userID) { teamUtils .removeTeamMember(this.$apollo, userID, this.editingteamID) @@ -269,9 +202,6 @@ export default defineComponent({ console.error(e) }) }, - removeTeamMember(index) { - this.newMembers.splice(index, 1) - }, validateEmail(emailID) { if ( /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test( @@ -292,47 +222,6 @@ export default defineComponent({ }) return } - let invalidEmail = false - this.$data.newMembers.forEach((element) => { - if (!this.validateEmail(element.key)) { - this.$toast.error(this.$t("team.invalid_email_format"), { - icon: "error_outline", - }) - invalidEmail = true - } - }) - if (invalidEmail) return - let invalidPermission = false - this.$data.newMembers.forEach((element) => { - if (!element.value) { - this.$toast.error(this.$t("invalid_member_permission"), { - icon: "error_outline", - }) - invalidPermission = true - } - }) - if (invalidPermission) return - this.$data.newMembers.forEach((element) => { - // Call to the graphql mutation - teamUtils - .addTeamMemberByEmail( - this.$apollo, - element.value, - element.key, - this.editingteamID - ) - .then(() => { - this.$toast.success(this.$t("team.saved"), { - icon: "done", - }) - }) - .catch((e) => { - this.$toast.error(e, { - icon: "error_outline", - }) - console.error(e) - }) - }) this.members.forEach((element) => { teamUtils .updateTeamMemberRole( @@ -380,7 +269,6 @@ export default defineComponent({ }, hideModal() { this.rename = null - this.newMembers = [] this.$emit("hide-modal") }, }, diff --git a/packages/hoppscotch-app/components/teams/Invite.vue b/packages/hoppscotch-app/components/teams/Invite.vue index 5a50b11d4..ec6d982be 100644 --- a/packages/hoppscotch-app/components/teams/Invite.vue +++ b/packages/hoppscotch-app/components/teams/Invite.vue @@ -218,25 +218,11 @@ export default defineComponent({ }, data() { return { - rename: null, members: [], newMembers: [], membersAdapter: new TeamMemberAdapter(null), } }, - computed: { - editingTeamCopy() { - return this.editingTeam - }, - name: { - get() { - return this.editingTeam.name - }, - set(name) { - this.rename = name - }, - }, - }, watch: { editingteamID(teamID) { this.membersAdapter.changeTeamID(teamID) @@ -290,15 +276,6 @@ export default defineComponent({ return false }, saveTeam() { - if ( - this.$data.rename !== null && - this.$data.rename.replace(/\s/g, "").length < 6 - ) { - this.$toast.error(this.$t("team.name_length_insufficient"), { - icon: "error_outline", - }) - return - } let invalidEmail = false this.$data.newMembers.forEach((element) => { if (!this.validateEmail(element.key)) { @@ -360,33 +337,9 @@ export default defineComponent({ console.error(e) }) }) - if (this.$data.rename !== null) { - const newName = - this.name === this.$data.rename ? this.name : this.$data.rename - if (!/\S/.test(newName)) - return this.$toast.error(this.$t("empty.team_name"), { - icon: "error_outline", - }) - // Call to the graphql mutation - if (this.name !== this.rename) - teamUtils - .renameTeam(this.$apollo, newName, this.editingteamID) - .then(() => { - this.$toast.success(this.$t("team.saved"), { - icon: "done", - }) - }) - .catch((e) => { - this.$toast.error(this.$t("error.something_went_wrong"), { - icon: "error_outline", - }) - console.error(e) - }) - } this.hideModal() }, hideModal() { - this.rename = null this.newMembers = [] this.$emit("hide-modal") }, diff --git a/packages/hoppscotch-app/components/teams/Team.vue b/packages/hoppscotch-app/components/teams/Team.vue index 33bd27105..341e266e2 100644 --- a/packages/hoppscotch-app/components/teams/Team.vue +++ b/packages/hoppscotch-app/components/teams/Team.vue @@ -1,11 +1,8 @@ diff --git a/packages/hoppscotch-app/components/teams/index.vue b/packages/hoppscotch-app/components/teams/index.vue index 007340909..dd63efb2f 100644 --- a/packages/hoppscotch-app/components/teams/index.vue +++ b/packages/hoppscotch-app/components/teams/index.vue @@ -67,6 +67,7 @@ :editing-team="editingTeam" :editingteam-i-d="editingTeamID" @hide-modal="displayModalEdit(false)" + @invite-team="inviteTeam(editingTeam, editingTeamID)" />