diff --git a/src/components/AdmitPendingMembersDialog.vue b/src/components/AdmitPendingMembersDialog.vue index 2021188b..144c7ab4 100644 --- a/src/components/AdmitPendingMembersDialog.vue +++ b/src/components/AdmitPendingMembersDialog.vue @@ -224,8 +224,8 @@ export default class AdmitPendingMembersDialog extends Vue { const selectedMembers = this.pendingMembersData.filter((member) => this.selectedMembers.includes(member.did), ); - const notSelectedMembers = this.pendingMembersData.filter((member) => - !this.selectedMembers.includes(member.did), + const notSelectedMembers = this.pendingMembersData.filter( + (member) => !this.selectedMembers.includes(member.did), ); let admittedCount = 0; diff --git a/src/components/MembersList.vue b/src/components/MembersList.vue index df1559e0..baa44ea1 100644 --- a/src/components/MembersList.vue +++ b/src/components/MembersList.vue @@ -304,7 +304,7 @@ export default class MembersList extends Vue { async refreshData(showPendingEvenIfAllWereIgnored = false) { // Force refresh both contacts and members - this.contacts = await this.$getAllContacts() + this.contacts = await this.$getAllContacts(); await this.fetchMembers(); @@ -462,7 +462,12 @@ export default class MembersList extends Vue { return this.contacts.find((contact) => contact.did === did); } - getPendingMembers(): { did: string; name: string; isContact: boolean; member: { memberId: string; }; }[] { + getPendingMembers(): { + did: string; + name: string; + isContact: boolean; + member: { memberId: string }; + }[] { return this.decryptedMembers .filter((member) => { // Exclude the current user @@ -482,7 +487,12 @@ export default class MembersList extends Vue { })); } - getNonContactMembers(): { did: string; name: string; isContact: boolean; member: { memberId: string; }; }[] { + getNonContactMembers(): { + did: string; + name: string; + isContact: boolean; + member: { memberId: string }; + }[] { return this.decryptedMembers .filter((member) => !this.getContactFor(member.did)) .map((member) => ({ @@ -499,18 +509,18 @@ export default class MembersList extends Vue { * Show the admit pending members dialog if conditions are met */ checkAndShowAdmitPendingDialog(showPendingEvenIfAllWereIgnored = false) { - const pendingMembers = - this.isOrganizer ? this.getPendingMembers() : this.getNonContactMembers(); + const pendingMembers = this.isOrganizer + ? this.getPendingMembers() + : this.getNonContactMembers(); if (pendingMembers.length === 0) { this.startAutoRefresh(); return; } if (!showPendingEvenIfAllWereIgnored) { // only show if there are pending members that have not been ignored - const pendingMembersNotIgnored = - pendingMembers.filter( - (member) => !this.previousMemberDidsIgnored.includes(member.did) - ); + const pendingMembersNotIgnored = pendingMembers.filter( + (member) => !this.previousMemberDidsIgnored.includes(member.did), + ); if (pendingMembersNotIgnored.length === 0) { this.startAutoRefresh(); // everyone waiting has been ignored @@ -520,21 +530,27 @@ export default class MembersList extends Vue { this.stopAutoRefresh(); this.pendingMembersData = pendingMembers; if (this.isOrganizer) { - (this.$refs.admitPendingMembersDialog as AdmitPendingMembersDialog).open(); + ( + this.$refs.admitPendingMembersDialog as AdmitPendingMembersDialog + ).open(); } else { this.visibleBulkVisibilityDialog = true; } } // Admit Pending Members Dialog methods - async closeAdmitPendingDialog(result: { notSelectedMemberDids: string[] } | undefined) { + async closeAdmitPendingDialog( + result: { notSelectedMemberDids: string[] } | undefined, + ) { this.pendingMembersData = []; this.previousMemberDidsIgnored = result?.notSelectedMemberDids || []; await this.refreshData(); } - async closeSetBulkVisibilityDialog(result: { notSelectedMemberDids: string[] } | undefined) { + async closeSetBulkVisibilityDialog( + result: { notSelectedMemberDids: string[] } | undefined, + ) { this.visibleBulkVisibilityDialog = false; this.pendingMembersData = []; this.previousMemberDidsIgnored = result?.notSelectedMemberDids || []; @@ -680,7 +696,6 @@ export default class MembersList extends Vue { } } - startAutoRefresh() { this.lastRefreshTime = Date.now(); this.countdownTimer = 10; diff --git a/src/components/SetBulkVisibilityDialog.vue b/src/components/SetBulkVisibilityDialog.vue index 06eaa4b2..e22281e4 100644 --- a/src/components/SetBulkVisibilityDialog.vue +++ b/src/components/SetBulkVisibilityDialog.vue @@ -213,8 +213,8 @@ export default class SetBulkVisibilityDialog extends Vue { const selectedMembers = this.membersData.filter((member) => this.selectedMembers.includes(member.did), ); - const notSelectedMembers = this.membersData.filter((member) => - !this.selectedMembers.includes(member.did), + const notSelectedMembers = this.membersData.filter( + (member) => !this.selectedMembers.includes(member.did), ); let successCount = 0; @@ -249,7 +249,9 @@ export default class SetBulkVisibilityDialog extends Vue { ); // Emit success event - this.$emit("close", { notSelectedMemberDids: notSelectedMembers.map((member) => member.did) }); + this.$emit("close", { + notSelectedMemberDids: notSelectedMembers.map((member) => member.did), + }); this.close(); } catch (error) { // eslint-disable-next-line no-console @@ -326,7 +328,9 @@ export default class SetBulkVisibilityDialog extends Vue { close() { this.resetSelection(); - this.$emit("close", { notSelectedMemberDids: this.membersData.map((member) => member.did) }); + this.$emit("close", { + notSelectedMemberDids: this.membersData.map((member) => member.did), + }); } cancel() {