forge/Vervis
1
0
Fork 0
Code Pull requests Activity

UI: Browse: List team parents

Browse source
This commit is contained in:
Pere Lev 2024-05-12 21:46:34 +03:00
parent 74af2ea223
commit bef8a77d84
No known key found for this signature in database
GPG key ID: 5252C5C863E5E57D
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Vervis/Handler/Client.hs
View file

@ -408,10 +408,34 @@ getBrowseR = do
E.orderBy [E.asc $ person E.^. PersonId] E.orderBy [E.asc $ person E.^. PersonId]
return (person, actor) return (person, actor)
) )
<*> (E.select $ E.from $ \ (group `E.InnerJoin` actor) -> do <*> (do js <-
E.select $ E.from $ \ (group `E.InnerJoin` actor) -> do
E.on $ group E.^. GroupActor E.==. actor E.^. ActorId E.on $ group E.^. GroupActor E.==. actor E.^. ActorId
E.orderBy [E.asc $ group E.^. GroupId] E.orderBy [E.asc $ group E.^. GroupId]
return (group, actor) return (group, actor)
for js $ \ (j@(Entity groupID _), jactor) -> do
parents <- E.select $ E.from $ \ (deleg `E.InnerJoin` holder) -> do
E.on $ deleg E.^. SourceUsSendDelegatorSource E.==. holder E.^. SourceHolderGroupSource
E.where_ $ holder E.^. SourceHolderGroupGroup E.==. E.val groupID
return $ holder E.^. SourceHolderGroupSource
parents' <- for parents $ \ (E.Value sourceID) -> do
byKeyOrRaid <- bimap snd snd <$> getSourceTopic sourceID
bitraverse
(\case
Left _j -> error "I'm a group and I have a parent who is a local Project"
Right g -> do
actorID <- groupActor <$> getJust g
actor <- getJust actorID
return (g, actor)
)
(\ remoteActorID -> do
remoteActor <- getJust remoteActorID
remoteObject <- getJust $ remoteActorIdent remoteActor
inztance <- getJust $ remoteObjectInstance remoteObject
return (inztance, remoteObject, remoteActor)
)
byKeyOrRaid
return (j, jactor, parents')
) )
<*> (E.select $ E.from $ \ (repo `E.InnerJoin` actor) -> do <*> (E.select $ E.from $ \ (repo `E.InnerJoin` actor) -> do
E.on $ repo E.^. RepoActor E.==. actor E.^. ActorId E.on $ repo E.^. RepoActor E.==. actor E.^. ActorId

9
templates/browse.hamlet
View file

@ -81,10 +81,17 @@ $# #forgefed @ Libera Chat
<h2>Teams <h2>Teams
<ul> <ul>
$forall (Entity groupID _, Entity _ actor) <- groups $forall (Entity groupID _, Entity _ actor, parents) <- groups
<li> <li>
<a href=@{GroupR $ hashGroup groupID}> <a href=@{GroupR $ hashGroup groupID}>
&#{keyHashidText $ hashGroup groupID} #{actorName actor} &#{keyHashidText $ hashGroup groupID} #{actorName actor}
<ul>
$if not $ null parents
<li>Parents
<ul>
$forall p <- parents
<li>
^{groupLinkFedW p}
<h2>Repos <h2>Repos