lfajardo
/
cloud_bbb
mirror of https://github.com/sualko/cloud_bbb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: show exact match first in sharing widget (#112)

pull/120/head
znerol 2021-01-25 18:39:35 +01:00 committed by GitHub
parent 10f9126d42
commit f2f9852bb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ts/Common/Api.ts
View File

@ -75,6 +75,11 @@ export interface ShareWith {
users: ShareWithOption[]; users: ShareWithOption[];
groups: ShareWithOption[]; groups: ShareWithOption[];
circles: ShareWithOption[]; circles: ShareWithOption[];
exact: {
users: ShareWithOption[];
groups: ShareWithOption[];
circles: ShareWithOption[];
}
} }
class Api { class Api {
@ -243,9 +248,14 @@ class Api {
}); });
return { return {
users: [],
groups: [],
circles: [],
exact: {
users: response.data.ocs.data.exact.users, users: response.data.ocs.data.exact.users,
groups: response.data.ocs.data.exact.groups, groups: response.data.ocs.data.exact.groups,
circles: response.data.ocs.data.exact.circles || [], circles: response.data.ocs.data.exact.circles || [],
},
}; };
} }
@ -264,9 +274,14 @@ class Api {
const data = response.data.ocs.data; const data = response.data.ocs.data;
return { return {
users: [...data.users, ...data.exact.users], users: data.users,
groups: [...data.groups, ...data.exact.groups], groups: data.groups,
circles: [...(data.circles || []), ...(data.exact.circles || [])], circles: data.circles || [],
exact: {
users: data.exact.users,
groups: data.exact.groups,
circles: data.exact.circles || [],
},
}; };
} }
} }

3
ts/Common/ShareSelection.tsx
View File

@ -63,6 +63,9 @@ const ShareSelection: React.FC<Props> = (props) => {
function renderSearchResults(options: ShareWith|undefined) { function renderSearchResults(options: ShareWith|undefined) {
const results = options ? [ const results = options ? [
...options.exact.users.filter(user => !excluded.userIds.includes(user.value.shareWith)),
...options.exact.groups.filter(group => !excluded.groupIds.includes(group.value.shareWith)),
...options.exact.circles.filter(circle => !excluded.circleIds.includes(circle.value.shareWith)),
...options.users.filter(user => !excluded.userIds.includes(user.value.shareWith)), ...options.users.filter(user => !excluded.userIds.includes(user.value.shareWith)),
...options.groups.filter(group => !excluded.groupIds.includes(group.value.shareWith)), ...options.groups.filter(group => !excluded.groupIds.includes(group.value.shareWith)),
...options.circles.filter(circle => !excluded.circleIds.includes(circle.value.shareWith)), ...options.circles.filter(circle => !excluded.circleIds.includes(circle.value.shareWith)),