Skip to content

Commit 80886e8

Browse files
authored
Skip meeting participants in invite list (#9981)
Signed-off-by: Anton Alexeyev <[email protected]>
1 parent 3195af9 commit 80886e8

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

plugins/contact-resources/src/components/SelectUsersPopup.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
export let placeholder: IntlString = presentation.string.Search
3232
export let selected: Ref<Employee>[] = []
3333
export let skipCurrentAccount = false
34+
export let skipAccounts: Ref<Employee>[] = []
3435
export let disableDeselectFor: Ref<Employee>[] = []
3536
export let showStatus = true
3637
export let skipInactive = false
@@ -91,6 +92,7 @@
9192
{showStatus}
9293
{disableDeselectFor}
9394
{skipCurrentAccount}
95+
{skipAccounts}
9496
{skipInactive}
9597
on:select={handleSelectionChanged}
9698
/>

plugins/contact-resources/src/components/UsersList.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
export let search: string = ''
2929
export let selected: Ref<Employee>[] = []
3030
export let skipCurrentAccount = false
31+
export let skipAccounts: Ref<Employee>[] = []
3132
export let disableDeselectFor: Ref<Employee>[] = []
3233
export let showStatus = true
3334
export let skipInactive = false
@@ -52,7 +53,7 @@
5253
? { $search: search }
5354
: { [searchField]: { $like: '%' + search + '%' } }
5455
: {}),
55-
...(skipCurrentAccount ? { _id: { $ne: me } } : {}),
56+
...{ _id: { $nin: skipCurrentAccount ? [...skipAccounts, me] : [...skipAccounts] } },
5657
...(skipInactive ? { active: true } : {}),
5758
...(skipOnlyLocal ? { personUuid: { $exists: true } } : {})
5859
},

plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
<script lang="ts">
1616
import { ButtonBaseSize, IconSize, ModernButton, showPopup } from '@hcengineering/ui'
1717
import { Employee } from '@hcengineering/contact'
18-
import { sendInvites } from '../../../meetings'
18+
import { currentMeetingRoom, sendInvites } from '../../../meetings'
1919
import love from '../../../plugin'
2020
import { SelectUsersPopup } from '@hcengineering/contact-resources'
2121
import { Ref } from '@hcengineering/core'
2222
import { createEventDispatcher } from 'svelte'
23+
import { infos } from '../../../stores'
2324
2425
export let employee: Employee | undefined = undefined
2526
export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
@@ -39,11 +40,13 @@
3940
}
4041
4142
function openSelectUsersPopup (): void {
43+
const skipAccounts = $infos.filter((p) => p.room === currentMeetingRoom).map((p) => p.person)
4244
showPopup(
4345
SelectUsersPopup,
4446
{
4547
okLabel: love.string.Invite,
4648
skipCurrentAccount: true,
49+
skipAccounts,
4750
skipInactive: true,
4851
showStatus: true
4952
},

0 commit comments

Comments
 (0)