Reorder API

Author: Thomas

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleElementRelationService.java

@@ -1,6 +1,7 @@
 package org.lowcoder.domain.bundle.service;
 
 import org.lowcoder.domain.bundle.model.BundleElement;
+import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -14,4 +15,6 @@ public interface BundleElementRelationService {
     Mono<Void> create(String bundleId, String elementId);
 
     Flux<BundleElement> getByElementIds(List<String> elementIds);
+
+    Mono<Void> updateElementPos(String bundleId, String elementId, long position);
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleElementRelationServiceImpl.java

@@ -49,4 +49,11 @@ public Flux<BundleElement> getByElementIds(List<String> elementIds) {
         return biRelationService.getByTargetIds(BUNDLE_ELEMENT, elementIds)
                 .map(biRelation -> new BundleElement(biRelation.getSourceId(), biRelation.getTargetId(), Integer.parseInt(biRelation.getExtParam1())));
     }
+
+    @Override
+    public Mono<Void> updateElementPos(String bundleId, String elementId, long position) {
+        return biRelationService.getBiRelation(BUNDLE_ELEMENT, bundleId, elementId)
+                .doOnNext(biRelation -> biRelation.setExtParam1(String.valueOf(position)))
+                .then();
+    }
 }

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java

@@ -4,6 +4,7 @@
 import com.google.common.base.MoreObjects;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
@@ -22,8 +23,11 @@ public class BiRelation extends HasIdAndAuditing {
     private String relation;
     private String state;
 
+    @Setter
     private String extParam1;
+    @Setter
     private String extParam2;
+    @Setter
     private String extParam3;
 
     public BiRelationBizType getBizType() {

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiService.java

@@ -11,9 +11,11 @@
 import org.lowcoder.domain.permission.model.ResourceAction;
 import org.lowcoder.domain.permission.model.ResourcePermission;
 import org.lowcoder.domain.permission.model.ResourceRole;
+import org.lowcoder.sdk.config.dynamic.Conf;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Set;
 
 public interface BundleApiService {
@@ -55,4 +57,6 @@ public interface BundleApiService {
     Mono<Boolean> setBundlePublicToMarketplace(String bundleId, BundleEndpoints.BundlePublicToMarketplaceRequest request);
 
     Mono<Boolean> setBundleAsAgencyProfile(String bundleId, boolean agencyProfile);
+
+    Mono<Void> reorder(String bundleId, List<String> elementIds);
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java

@@ -278,6 +278,29 @@ public Mono<Void> move(String applicationLikeId, @Nullable String targetBundleId
                 .then();
     }
 
+    /**
+     * Reorder the applications in bundle based on the position
+     * @param bundleId id of the bundle to sort elements
+     * @param elementIds ids of the elements in the bundle to sort
+     * @return nothing
+     */
+    @Override
+    public Mono<Void> reorder(String bundleId, List<String> elementIds) {
+        return sessionUserService.getVisitorId()
+                // check permissions
+                .delayUntil(userId -> resourcePermissionService.checkResourcePermissionWithError(userId, bundleId,
+                        MANAGE_BUNDLES))
+                .flatMap(b -> Flux.fromIterable(elementIds)
+                        .index() // This will provide a tuple of (index, elementId)
+                        .flatMap(tuple -> {
+                            long index = tuple.getT1();
+                            String elementId = tuple.getT2();
+                            return bundleElementRelationService.updateElementPos(bundleId, elementId, index);
+                        })
+                        .then())
+                .then();
+    }
+
     /**
      * get the sub elements of a bundle or root.
      *

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleController.java

@@ -106,6 +106,12 @@ public Mono<ResponseView<Void>> move(@PathVariable("id") String applicationLikeI
                 .then(Mono.fromSupplier(() -> ResponseView.success(null)));
     }
 
+    @Override
+    public Mono<ResponseView<Void>> reorder(@PathVariable("bundleId") String bundleId,
+                                            @RequestParam(value = "elementIds", required = true) List<String> elementIds) {
+        return bundleApiService.reorder(bundleId, elementIds)
+                .then(Mono.fromSupplier(() -> ResponseView.success(null)));
+    }
     @Override
     public Mono<ResponseView<Void>> updatePermission(@PathVariable String bundleId,
             @PathVariable String permissionId,

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleEndpoints.java

@@ -128,12 +128,22 @@ public Mono<ResponseView<List<?>>> getElements(@RequestParam(value = "id", requi
 			tags = TAG_BUNDLE_MANAGEMENT,
 		    operationId = "moveBundle",
 		    summary = "Move Bundle",
-		    description = "Relocate an Bundle Bundle to a different location in the Bundle hierarchy in Lowcoder using its unique ID."
+		    description = "Relocate an application to a different bundle in Lowcoder using its unique ID."
 	)
     @PutMapping("/move/{id}")
     public Mono<ResponseView<Void>> move(@PathVariable("id") String applicationLikeId,
             @RequestParam(value = "targetBundleId", required = false) String targetBundleId);
 
+	@Operation(
+			tags = TAG_BUNDLE_MANAGEMENT,
+			operationId = "reorderBundle",
+			summary = "Reorder Bundle",
+			description = "Reorder bundle."
+	)
+	@PutMapping("/{bundleId}/reorder")
+	public Mono<ResponseView<Void>> reorder(@PathVariable("bundleId") String bundleId,
+										 @RequestParam(value = "elementIds", required = true) List<String> elementIds);
+
 	@Operation(
 			tags = TAG_BUNDLE_PERMISSIONS,
 		    operationId = "updateBundlePermissions",