Skip to content
Merged
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
4 changes: 4 additions & 0 deletions src/main/scala/com/campudus/tableaux/router/BaseRouter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ trait BaseRouter extends VertxAccess {
private def enrich(obj: DomainObject, returnType: ReturnType)(implicit user: TableauxUser): JsonObject = {
val resultJson = obj.toJson(returnType)
obj match {
case col: GroupColumn => {
val groupsWithPermissions = col.columns.map(groupCol => enrich(groupCol, returnType))
resultJson.mergeIn(Json.obj("groups" -> groupsWithPermissions))
}
case col: ConcatenateColumn => {
val concatsWithPermissions = col.columns.map(concatCol => enrich(concatCol, returnType))
resultJson.mergeIn(Json.obj("concats" -> concatsWithPermissions))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -762,4 +762,40 @@ class GroupColumnTest extends TableauxTestBase {
}
}
}

@Test
def retrieveGroupColumn_nestedColumnsContainPermissions(implicit c: TestContext): Unit = {
okTest {
val expectedPermission = Json.obj(
"editDisplayProperty" -> true,
"editStructureProperty" -> true,
"editCellValue" -> true,
"delete" -> true
)

for {
_ <- sendRequest("POST", "/tables", createTableJson)

textColumnId <- sendCreateColumnRequest(1, createTextColumnJson("textcolumn"))
booleanColumnId <- sendCreateColumnRequest(1, createBooleanColumnJson("booleancolumn"))

groupColumnId <- sendCreateColumnRequest(
1,
createGroupColumnJson("groupcolumn", Seq(textColumnId, booleanColumnId))
)

groupColumn <- sendRequest("GET", s"/tables/1/columns/$groupColumnId")
} yield {
assertJSONEquals(
Json.obj(
"groups" -> Json.arr(
Json.obj("id" -> textColumnId, "permission" -> expectedPermission),
Json.obj("id" -> booleanColumnId, "permission" -> expectedPermission)
)
),
groupColumn
)
}
}
}
}
Loading