Commit cdcc74e

authored

Merge pull request #1595 from lowcoder-org/fix/folder_move

Fix folder move from root to subfolder

2 parents d847f57 + 92fa58e commit cdcc74eCopy full SHA for cdcc74e

File tree

-1

lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home
- FolderController.java

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import org.lowcoder.api.util.GidService;`
`9`	`9`	`import org.lowcoder.domain.application.model.ApplicationType;`
`10`	`10`	`import org.lowcoder.domain.folder.model.Folder;`
	`11`	`+import org.lowcoder.domain.folder.model.FolderElement;`
`11`	`12`	`import org.lowcoder.domain.folder.service.FolderElementRelationService;`
`12`	`13`	`import org.lowcoder.domain.folder.service.FolderService;`
`13`	`14`	`import org.lowcoder.domain.permission.model.ResourceRole;`
`@@ -92,7 +93,7 @@ public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", require`
`92`	`93`	`@Override`
`93`	`94`	`public Mono<ResponseView<Void>> move(@PathVariable("id") String applicationLikeId,`
`94`	`95`	`@RequestParam(value = "targetFolderId", required = false) String targetFolderId) {`
`95`		`- return folderElementRelationService.getByElementIds(List.of(applicationLikeId)).next().flatMap(folderElement ->`
	`96`	`+ return folderElementRelationService.getByElementIds(List.of(applicationLikeId)).next().defaultIfEmpty(newFolderElement(null, null)).flatMap(folderElement ->`
`96`	`97`	`gidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId ->`
`97`	`98`	`folderApiService.move(applicationLikeId, objectId.orElse(null))`
`98`	`99`	`.then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId, folderElement.folderId(), objectId.orElse(null), APPLICATION_MOVE))`

Comments

(0)