Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/CircleDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
{{ t('contacts', 'Add') }}
</Button>
</div>
<MemberList ref="memberList" :list="members" />
<MemberList ref="memberList" :list="members" :key="`member-list-${circle.id}`" />
</div>
</div>
</section>
Expand Down
114 changes: 95 additions & 19 deletions src/components/MemberList/MemberList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,37 @@
</template>
</NcEmptyContent>

<div v-else class="member-grid">
<MemberGridItem v-for="member in flatList"
:key="`member-grid-item-${member.id}`"
:member="member"
:is-team="!member.isUser" />
</div>
<template v-else>
<NcTextField v-if="flatList.length > 20"
v-model="searchQuery"
:label="t('contacts', 'Search among current members')"
trailing-button-icon="close"
:show-trailing-button="searchQuery !== ''"
@trailing-button-click="clearSearchField">
<IconSearch :size="20" />
</NcTextField>
<RecycleScroller ref="scroller"
class="member-scroller"
:items="filteredList"
:item-size="56"
:grid-items="gridItems"
:item-secondary-size="itemSecondarySize">
<template #default="{ item }">
<MemberGridItem :key="`member-grid-item-${item.id}`"
:member="item"
:is-team="!item.isUser" />
</template>
<template #empty v-if="!filteredList.length">
<div class="empty-search-results">
<NcEmptyContent :name="t('contacts', 'No results found')">
<template #icon>
<IconSearch :size="20" />
</template>
</NcEmptyContent>
</div>
</template>
</RecycleScroller>
</template>

<!-- member picker -->
<EntityPicker v-if="showPicker"
Expand All @@ -50,11 +75,19 @@
</template>

<script lang="ts">
import { NcEmptyContent } from '@nextcloud/vue'
import {
NcEmptyContent,
isMobile,

Check failure on line 80 in src/components/MemberList/MemberList.vue

View workflow job for this annotation

GitHub Actions / NPM lint

'isMobile' is defined but never used
NcLoadingIcon as IconLoading,
NcTextField
} from '@nextcloud/vue'
import { RecycleScroller } from 'vue-virtual-scroller'

Check failure on line 84 in src/components/MemberList/MemberList.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Unable to resolve path to module 'vue-virtual-scroller'
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'

Check failure on line 85 in src/components/MemberList/MemberList.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Unable to resolve path to module 'vue-virtual-scroller/dist/vue-virtual-scroller.css'

import MemberGridItem from './MemberGridItem.vue'
import EntityPicker from '../EntityPicker/EntityPicker.vue'
import IconContact from 'vue-material-design-icons/AccountMultipleOutline.vue'
import IconSearch from 'vue-material-design-icons/Magnify.vue'

import RouterMixin from '../../mixins/RouterMixin.js'

Expand All @@ -72,8 +105,12 @@
components: {
EntityPicker,
IconContact,
IconLoading,
IconSearch,
MemberGridItem,
NcEmptyContent,
RecycleScroller,
NcTextField,
},

mixins: [IsMobileMixin, RouterMixin],
Expand Down Expand Up @@ -101,6 +138,8 @@
pickerData: [],
pickerSelection: {},
pickerTypes: CIRCLES_MEMBER_GROUPING,
windowWidth: window.innerWidth,
searchQuery: '',
}
},

Expand Down Expand Up @@ -132,17 +171,59 @@
return [...teams, ...users]
},

filteredList() {
const query = this.searchQuery.toLowerCase()

return this.flatList.filter(member =>
!this.searchQuery || member.displayName.toLowerCase().includes(query)
)
},

hasMembers() {
return this.flatList.length > 0
},

gridItems() {
if (this.windowWidth < 768) {
// undefined means that the grid will be rendered as a list
return undefined
}

return 2
},

itemSecondarySize() {
if (this.windowWidth < 768) {
// undefined means that the grid will be rendered as a list
return undefined
}

// The maximum width of the member list is 500px,
// so with two columns, each column is 242px wide (with scroll)
return 242
},
},

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

window.addEventListener('resize', this.onResize)
},

beforeDestroy() {

Check failure on line 214 in src/components/MemberList/MemberList.vue

View workflow job for this annotation

GitHub Actions / NPM lint

The `beforeDestroy` lifecycle hook is deprecated. Use `beforeUnmount` instead
window.removeEventListener('resize', this.onResize)
},

methods: {
onResize() {
this.windowWidth = window.innerWidth
},

clearSearchField() {
this.searchQuery = ''
},

/**
* Show picker and fetch for recommendations
* Cache the circleId in case the url change or something
Expand Down Expand Up @@ -258,21 +339,16 @@
}
}

.member-grid {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 8px;

@media (max-width: 768px) {
grid-template-columns: 1fr;
}

@media (min-width: 1200px) {
grid-template-columns: repeat(3, 1fr);
}
.member-scroller {
height: 100%;
max-height: 200px;
}

.empty-content {
height: 100%;
}

.empty-search-results {
margin-top: 2rem;
}
</style>
5 changes: 4 additions & 1 deletion src/store/circles.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@
*/
deleteMemberFromCircle(state, member) {
// Circles dependencies are managed directly from the model
member.delete()
const singleId = member.singleId
if (member.circle._members[singleId]) {
Vue.delete(member.circle._members, singleId)

Check failure on line 91 in src/store/circles.js

View workflow job for this annotation

GitHub Actions / NPM lint

'Vue' is not defined
}
},

setCircleSettings(state, { circleId, settings }) {
Expand Down
Loading