Skip to content

Commit 5336895

Browse files
authored
Fix : add default diagram positions when creating default grid layout (#842)
Signed-off-by: Ayoub LABIDI <[email protected]>
1 parent 12ac7a6 commit 5336895

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/main/java/org/gridsuite/study/server/service/StudyConfigService.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.gridsuite.study.server.RemoteServicesProperties;
1111
import org.gridsuite.study.server.StudyException;
1212
import org.gridsuite.study.server.dto.diagramgridlayout.DiagramGridLayout;
13+
import org.gridsuite.study.server.dto.diagramgridlayout.diagramlayout.DiagramPosition;
1314
import org.gridsuite.study.server.dto.diagramgridlayout.diagramlayout.NetworkAreaDiagramLayout;
1415
import org.gridsuite.study.server.repository.StudyEntity;
1516
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +50,8 @@ public class StudyConfigService {
4950
private static final String DIAGRAM_GRID_LAYOUT_URI = "/diagram-grid-layout";
5051
private static final String DIAGRAM_GRID_LAYOUT_WITH_ID_URI = DIAGRAM_GRID_LAYOUT_URI + UUID_PARAM;
5152

53+
private static final DiagramPosition DEFAULT_DIAGRAM_POSITION = new DiagramPosition(2, 2, 0, 0);
54+
5255
private final RestTemplate restTemplate;
5356

5457
@Setter
@@ -479,8 +482,12 @@ public UUID createGridLayoutFromNadDiagram(UUID sourceNadConfigUuid, UUID cloned
479482
if (sourceNadConfigUuid == null) {
480483
return null;
481484
}
485+
Map<String, DiagramPosition> diagramPositions = new HashMap<>();
486+
diagramPositions.put("lg", DEFAULT_DIAGRAM_POSITION);
482487
DiagramGridLayout diagramGridLayout = DiagramGridLayout.builder()
483488
.diagramLayouts(List.of(NetworkAreaDiagramLayout.builder()
489+
.diagramUuid(UUID.randomUUID())
490+
.diagramPositions(diagramPositions)
484491
.originalNadConfigUuid(sourceNadConfigUuid)
485492
.currentNadConfigUuid(clonedNadConfigUuid)
486493
.name(nadDiagramConfigName)

0 commit comments

Comments
 (0)