Browse Source

fix: linting

pull/211/head
Trent Larson 1 week ago
parent
commit
39173a8db2
  1. 4
      src/components/AdmitPendingMembersDialog.vue
  2. 39
      src/components/MembersList.vue
  3. 12
      src/components/SetBulkVisibilityDialog.vue

4
src/components/AdmitPendingMembersDialog.vue

@ -224,8 +224,8 @@ export default class AdmitPendingMembersDialog extends Vue {
const selectedMembers = this.pendingMembersData.filter((member) => const selectedMembers = this.pendingMembersData.filter((member) =>
this.selectedMembers.includes(member.did), this.selectedMembers.includes(member.did),
); );
const notSelectedMembers = this.pendingMembersData.filter((member) => const notSelectedMembers = this.pendingMembersData.filter(
!this.selectedMembers.includes(member.did), (member) => !this.selectedMembers.includes(member.did),
); );
let admittedCount = 0; let admittedCount = 0;

39
src/components/MembersList.vue

@ -304,7 +304,7 @@ export default class MembersList extends Vue {
async refreshData(showPendingEvenIfAllWereIgnored = false) { async refreshData(showPendingEvenIfAllWereIgnored = false) {
// Force refresh both contacts and members // Force refresh both contacts and members
this.contacts = await this.$getAllContacts() this.contacts = await this.$getAllContacts();
await this.fetchMembers(); await this.fetchMembers();
@ -462,7 +462,12 @@ export default class MembersList extends Vue {
return this.contacts.find((contact) => contact.did === did); 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 return this.decryptedMembers
.filter((member) => { .filter((member) => {
// Exclude the current user // 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 return this.decryptedMembers
.filter((member) => !this.getContactFor(member.did)) .filter((member) => !this.getContactFor(member.did))
.map((member) => ({ .map((member) => ({
@ -499,17 +509,17 @@ export default class MembersList extends Vue {
* Show the admit pending members dialog if conditions are met * Show the admit pending members dialog if conditions are met
*/ */
checkAndShowAdmitPendingDialog(showPendingEvenIfAllWereIgnored = false) { checkAndShowAdmitPendingDialog(showPendingEvenIfAllWereIgnored = false) {
const pendingMembers = const pendingMembers = this.isOrganizer
this.isOrganizer ? this.getPendingMembers() : this.getNonContactMembers(); ? this.getPendingMembers()
: this.getNonContactMembers();
if (pendingMembers.length === 0) { if (pendingMembers.length === 0) {
this.startAutoRefresh(); this.startAutoRefresh();
return; return;
} }
if (!showPendingEvenIfAllWereIgnored) { if (!showPendingEvenIfAllWereIgnored) {
// only show if there are pending members that have not been ignored // only show if there are pending members that have not been ignored
const pendingMembersNotIgnored = const pendingMembersNotIgnored = pendingMembers.filter(
pendingMembers.filter( (member) => !this.previousMemberDidsIgnored.includes(member.did),
(member) => !this.previousMemberDidsIgnored.includes(member.did)
); );
if (pendingMembersNotIgnored.length === 0) { if (pendingMembersNotIgnored.length === 0) {
this.startAutoRefresh(); this.startAutoRefresh();
@ -520,21 +530,27 @@ export default class MembersList extends Vue {
this.stopAutoRefresh(); this.stopAutoRefresh();
this.pendingMembersData = pendingMembers; this.pendingMembersData = pendingMembers;
if (this.isOrganizer) { if (this.isOrganizer) {
(this.$refs.admitPendingMembersDialog as AdmitPendingMembersDialog).open(); (
this.$refs.admitPendingMembersDialog as AdmitPendingMembersDialog
).open();
} else { } else {
this.visibleBulkVisibilityDialog = true; this.visibleBulkVisibilityDialog = true;
} }
} }
// Admit Pending Members Dialog methods // Admit Pending Members Dialog methods
async closeAdmitPendingDialog(result: { notSelectedMemberDids: string[] } | undefined) { async closeAdmitPendingDialog(
result: { notSelectedMemberDids: string[] } | undefined,
) {
this.pendingMembersData = []; this.pendingMembersData = [];
this.previousMemberDidsIgnored = result?.notSelectedMemberDids || []; this.previousMemberDidsIgnored = result?.notSelectedMemberDids || [];
await this.refreshData(); await this.refreshData();
} }
async closeSetBulkVisibilityDialog(result: { notSelectedMemberDids: string[] } | undefined) { async closeSetBulkVisibilityDialog(
result: { notSelectedMemberDids: string[] } | undefined,
) {
this.visibleBulkVisibilityDialog = false; this.visibleBulkVisibilityDialog = false;
this.pendingMembersData = []; this.pendingMembersData = [];
this.previousMemberDidsIgnored = result?.notSelectedMemberDids || []; this.previousMemberDidsIgnored = result?.notSelectedMemberDids || [];
@ -680,7 +696,6 @@ export default class MembersList extends Vue {
} }
} }
startAutoRefresh() { startAutoRefresh() {
this.lastRefreshTime = Date.now(); this.lastRefreshTime = Date.now();
this.countdownTimer = 10; this.countdownTimer = 10;

12
src/components/SetBulkVisibilityDialog.vue

@ -213,8 +213,8 @@ export default class SetBulkVisibilityDialog extends Vue {
const selectedMembers = this.membersData.filter((member) => const selectedMembers = this.membersData.filter((member) =>
this.selectedMembers.includes(member.did), this.selectedMembers.includes(member.did),
); );
const notSelectedMembers = this.membersData.filter((member) => const notSelectedMembers = this.membersData.filter(
!this.selectedMembers.includes(member.did), (member) => !this.selectedMembers.includes(member.did),
); );
let successCount = 0; let successCount = 0;
@ -249,7 +249,9 @@ export default class SetBulkVisibilityDialog extends Vue {
); );
// Emit success event // Emit success event
this.$emit("close", { notSelectedMemberDids: notSelectedMembers.map((member) => member.did) }); this.$emit("close", {
notSelectedMemberDids: notSelectedMembers.map((member) => member.did),
});
this.close(); this.close();
} catch (error) { } catch (error) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
@ -326,7 +328,9 @@ export default class SetBulkVisibilityDialog extends Vue {
close() { close() {
this.resetSelection(); this.resetSelection();
this.$emit("close", { notSelectedMemberDids: this.membersData.map((member) => member.did) }); this.$emit("close", {
notSelectedMemberDids: this.membersData.map((member) => member.did),
});
} }
cancel() { cancel() {

Loading…
Cancel
Save