mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
feat(webapp): change order of groups to new first
This commit is contained in:
parent
8c900cd246
commit
43a96826e4
@ -15,7 +15,7 @@ export default {
|
|||||||
Query: {
|
Query: {
|
||||||
Group: async (_object, params, context, _resolveInfo) => {
|
Group: async (_object, params, context, _resolveInfo) => {
|
||||||
const { isMember, id, slug, first, offset } = params
|
const { isMember, id, slug, first, offset } = params
|
||||||
let pagination = ''
|
let pagination = '', orderBy = 'ORDER BY group.createdAt DESC'
|
||||||
if (first !== undefined && offset !== undefined) pagination = `SKIP ${offset} LIMIT ${first}`
|
if (first !== undefined && offset !== undefined) pagination = `SKIP ${offset} LIMIT ${first}`
|
||||||
const matchParams = { id, slug }
|
const matchParams = { id, slug }
|
||||||
removeUndefinedNullValuesFromObject(matchParams)
|
removeUndefinedNullValuesFromObject(matchParams)
|
||||||
@ -29,6 +29,7 @@ export default {
|
|||||||
WITH group, membership
|
WITH group, membership
|
||||||
WHERE (group.groupType IN ['public', 'closed']) OR (group.groupType = 'hidden' AND membership.role IN ['usual', 'admin', 'owner'])
|
WHERE (group.groupType IN ['public', 'closed']) OR (group.groupType = 'hidden' AND membership.role IN ['usual', 'admin', 'owner'])
|
||||||
RETURN group {.*, myRole: membership.role}
|
RETURN group {.*, myRole: membership.role}
|
||||||
|
${orderBy}
|
||||||
${pagination}
|
${pagination}
|
||||||
`
|
`
|
||||||
} else {
|
} else {
|
||||||
@ -39,6 +40,7 @@ export default {
|
|||||||
WITH group
|
WITH group
|
||||||
WHERE group.groupType IN ['public', 'closed']
|
WHERE group.groupType IN ['public', 'closed']
|
||||||
RETURN group {.*, myRole: NULL}
|
RETURN group {.*, myRole: NULL}
|
||||||
|
${orderBy}
|
||||||
${pagination}
|
${pagination}
|
||||||
`
|
`
|
||||||
} else {
|
} else {
|
||||||
@ -48,6 +50,7 @@ export default {
|
|||||||
WITH group, membership
|
WITH group, membership
|
||||||
WHERE (group.groupType IN ['public', 'closed']) OR (group.groupType = 'hidden' AND membership.role IN ['usual', 'admin', 'owner'])
|
WHERE (group.groupType IN ['public', 'closed']) OR (group.groupType = 'hidden' AND membership.role IN ['usual', 'admin', 'owner'])
|
||||||
RETURN group {.*, myRole: membership.role}
|
RETURN group {.*, myRole: membership.role}
|
||||||
|
${orderBy}
|
||||||
${pagination}
|
${pagination}
|
||||||
`
|
`
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user