Skip to content

feat: create and add guests to teams #4606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leftybournes merged 1 commit into from
Aug 18, 2025
Merged

feat: create and add guests to teams #4606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 53 additions & 11 deletions src/components/EntityPicker/EntityPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,29 @@
<!-- Wrapper for content & navigation -->
<div class="entity-picker">
<!-- Search -->
<div class="entity-picker__search">
<div class="entity-picker__search-icon icon-search" />
<input ref="input"
v-model="searchQuery"
:placeholder="t('contacts', 'Search {types}', {types: searchPlaceholderTypes})"
class="entity-picker__search-input"
type="search"
@input="onSearch">
<div class="entity-picker__heading">
<h2 class="entity-picker__title">
{{ t('contacts', 'Invite members to team') }}
</h2>
</div>
<div class="entity-picker__search-container">
<div class="entity-picker__search">
<div class="entity-picker__search-icon icon-search" />
<input ref="input"
v-model="searchQuery"
:placeholder="t('contacts', 'Search {types}', {types: searchPlaceholderTypes})"
class="entity-picker__search-input"
type="search"
@input="onSearch">
</div>
<Button v-if="canInviteGuests"
type="button"
variant="tertiary-no-background"
:title="t('contacts', 'Add guest')"
:aria-label="t('contacts', 'Add guest')"
@click="onGuestButtonClick">
<IconAccountPlusOutline :size="20" />
</Button>
</div>

<!-- Loading -->
Expand Down Expand Up @@ -83,20 +98,25 @@
import debounce from 'debounce'
import VirtualList from 'vue-virtual-scroll-list'
import {
NcButton as Button,
NcEmptyContent as EmptyContent,
NcLoadingIcon as IconLoading,
NcModal as Modal,
} from '@nextcloud/vue'
import { subscribe } from '@nextcloud/event-bus'
import IconSearch from 'vue-material-design-icons/Magnify.vue'
import IconAccountPlusOutline from 'vue-material-design-icons/AccountPlusOutline.vue'
import EntityBubble from './EntityBubble.vue'
import EntitySearchResult from './EntitySearchResult.vue'

export default {
name: 'EntityPicker',

components: {
Button,
EmptyContent,
EntityBubble,
IconAccountPlusOutline,
IconSearch,
IconLoading,
Modal,
Expand Down Expand Up @@ -184,6 +204,7 @@ export default {

data() {
return {
canInviteGuests: !!window?.OCA?.Guests?.openGuestDialog,
searchQuery: '',
localSelection: {},
EntitySearchResult,
Expand Down Expand Up @@ -294,6 +315,10 @@ export default {
this.$refs.input.focus()
this.$refs.input.select()
})

if (this.canInviteGuests) {
subscribe('guests:user:created', this.addGuest)
}
},

methods: {
Expand Down Expand Up @@ -359,6 +384,12 @@ export default {
this.onPick(entity)
}
},

onGuestButtonClick() {
if (this.canInviteGuests) {
window?.OCA?.Guests?.openGuestDialog('contacts')
}
},
},

}
Expand Down Expand Up @@ -393,13 +424,25 @@ $icon-margin: math.div($clickable-area - $icon-size, 2);
min-height: $dialog-height;
height: 100%;
padding: $dialog-padding;
padding-top: 10px;
box-sizing: border-box;

&__title {
margin-top: 0px;
}

&__search {
position: relative;
display: flex;
align-items: center;
width: 95%;

&-container {
display: flex;
flex-flow: row nowrap;
column-gap: 12px;
}

&-input {
width: 100%;
height: $clickable-area - $entity-spacing !important;
Expand All @@ -419,7 +462,6 @@ $icon-margin: math.div($clickable-area - $icon-size, 2);
display: flex;
overflow-y: auto;
align-content: flex-start;
flex: 1 0 auto;
flex-wrap: wrap;
justify-content: flex-start;
// half a line height to know there is more lines
Expand All @@ -438,7 +480,7 @@ $icon-margin: math.div($clickable-area - $icon-size, 2);

&__options {
overflow-y: auto;
flex: 1 1 100%;
flex: 1 1 auto;
margin: $entity-spacing 0;
}

Expand Down Expand Up @@ -469,7 +511,7 @@ it back */
}

:deep(.modal-container__close) {
margin-top: 19px;
margin-top: 10px;
}

</style>
Expand Down
7 changes: 7 additions & 0 deletions src/components/MemberList/MemberList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

<!-- member picker -->
<EntityPicker v-if="showPicker"
ref="entityPicker"
:confirm-label="t('contacts', 'Add to {circle}', { circle: circle.displayName })"
:data-types="pickerTypes"
:data-set="filteredPickerData"
Expand Down Expand Up @@ -140,6 +141,7 @@ export default defineComponent({

mounted() {
subscribe('contacts:circles:append', this.onShowPicker)
subscribe('guests:user:created', this.onGuestCreated)
},

methods: {
Expand Down Expand Up @@ -237,6 +239,11 @@ export default defineComponent({
this.pickerData = []
this.pickerSelection = {}
},

async onGuestCreated(guest) {
const results = await getSuggestions(guest.username)
this.$refs.entityPicker.onClick(results[0])
},
},
})
</script>
Expand Down
Loading