|
|
@@ -142,7 +142,7 @@ const i18n = useI18n()
|
|
|
|
|
|
/**
|
|
|
* Génère un AccessListItem à partir d'un Access
|
|
|
- * @param access
|
|
|
+ * @param userSearchItem
|
|
|
*/
|
|
|
const accessToItem = (userSearchItem: UserSearchItem): UserListItem => {
|
|
|
return {
|
|
|
@@ -167,8 +167,8 @@ const activeIds = computed(() => {
|
|
|
})
|
|
|
|
|
|
const queryActive = new Query(
|
|
|
- new OrderBy('name', ORDER_BY_DIRECTION.ASC),
|
|
|
- new PageFilter(ref(1), ref(10)),
|
|
|
+ new OrderBy('fullName', ORDER_BY_DIRECTION.ASC),
|
|
|
+ new PageFilter(ref(1), ref(20)),
|
|
|
new InArrayFilter('id', activeIds)
|
|
|
)
|
|
|
|
|
|
@@ -182,8 +182,8 @@ const {
|
|
|
* Query transmise à l'API lors des changements de filtre de recherche
|
|
|
*/
|
|
|
const querySearch = new Query(
|
|
|
- new OrderBy('name', ORDER_BY_DIRECTION.ASC),
|
|
|
- new PageFilter(ref(1), ref(100)),
|
|
|
+ new OrderBy('fullName', ORDER_BY_DIRECTION.ASC),
|
|
|
+ new PageFilter(ref(1), ref(20)),
|
|
|
new SearchFilter('fullName', nameFilter, SEARCH_STRATEGY.IPARTIAL)
|
|
|
)
|
|
|
|
|
|
@@ -210,7 +210,7 @@ const items: ComputedRef<Array<UserListItem>> = computed(() => {
|
|
|
const activeItems: UserListItem[] = collectionActive.value.items.map(accessToItem)
|
|
|
const searchedItems: UserListItem[] = collectionSearch.value.items
|
|
|
.map(accessToItem)
|
|
|
- .filter(item => !collectionActive.value.items.find(other => other.id === item.id))
|
|
|
+ .filter(item => !collectionActive.value!.items.find(other => other.id === item.id))
|
|
|
|
|
|
return activeItems.concat(searchedItems)
|
|
|
})
|