Mrd/new nodes management system

.github/workflows/continuous-integration.yml

@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - mrd/new-nodes-management-system
   pull_request:
     branches:
       - main
+      - mrd/new-nodes-management-system
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

src/app/app.module.ts

@@ -107,6 +107,7 @@ import {I18nModule} from "./core/i18n/i18n.module";
 import {OriginDestinationComponent} from "./services/analytics/origin-destination/components/origin-destination.component";
 import {SbbToggleModule} from "@sbb-esta/angular/toggle";
 import {ToggleSwitchButtonComponent} from "./view/toggle-switch-button/toggle-switch-button.component";
+import {GlobalNodesManagementComponent} from "./view/editor-edit-tools-view-component/global-nodes-management/global-nodes-management.component";
 
 @NgModule({
   declarations: [
@@ -152,6 +153,7 @@ import {ToggleSwitchButtonComponent} from "./view/toggle-switch-button/toggle-sw
     NavigationBarComponent,
     EditorPropertiesViewComponent,
     EditorEditToolsViewComponent,
+    GlobalNodesManagementComponent,
     FilterableLabelDialogComponent,
     FilterableLabelFormComponent,
     NoteDialogComponent,

src/app/data-structures/business.data.structures.ts

@@ -173,6 +173,7 @@ export interface NodeDto {
   fullName: string; // full name of the trainrun eg. BN => Bern Wankdorf
   positionX: number; // coordinate X
   positionY: number; // coordinate Y
+  isCollapsed: boolean; // flag to collapse the node
 
   ports: PortDto[]; // all ports aligned to the node
   transitions: TransitionDto[]; // all tranisitons aligned to the node

src/app/models/node.model.ts

@@ -38,6 +38,7 @@ export class Node {
   private warnings: WarningDto[];
   private isSelected: boolean;
   private labelIds: number[];
+  private isCollapsed: boolean;
 
   constructor(
     {
@@ -56,6 +57,7 @@ export class Node {
       symmetryAxis,
       warnings,
       labelIds,
+      isCollapsed,
     }: NodeDto = {
       id: Node.incrementId(),
       betriebspunktName: $localize`:@@app.models.node.shortNameDefault:NEW`,
@@ -72,6 +74,7 @@ export class Node {
       symmetryAxis: null,
       warnings: null,
       labelIds: [],
+      isCollapsed: false,
     },
   ) {
     this.id = id;
@@ -93,6 +96,7 @@ export class Node {
     this.warnings = warnings;
     this.isSelected = false;
     this.labelIds = labelIds;
+    this.isCollapsed = isCollapsed;
 
     if (Node.currentId < this.id) {
       Node.currentId = this.id;
@@ -318,6 +322,14 @@ export class Node {
     return currentMaxIndex;
   }
 
+  getIsCollapsed(): boolean {
+    return this.isCollapsed;
+  }
+
+  setIsCollapsed(isCollapsed: boolean) {
+    this.isCollapsed = isCollapsed;
+  }
+
   computeTransitionRouting(transition: Transition) {
     const port1 = this.getPort(transition.getPortId1());
     const port2 = this.getPort(transition.getPortId2());
@@ -845,6 +857,7 @@ export class Node {
       symmetryAxis: this.symmetryAxis,
       warnings: this.warnings,
       labelIds: this.labelIds,
+      isCollapsed: this.isCollapsed,
     };
   }
 

src/app/sample-netzgrafik/netzgrafik.default.spec.ts

@@ -1,5 +1,6 @@
 import netzgrafikDefaultJson from "./netzgrafik_default.json";
 import {NetzgrafikDefault} from "./netzgrafik.default";
+import {NetzgrafikTestData} from "./test-data/netzgrafik";
 import {DataService} from "../services/data/data.service";
 import {LogPublishersService} from "../logger/log.publishers.service";
 import {LogService} from "../logger/log.service";
@@ -63,21 +64,119 @@ describe("NetzgrafikDefault", () => {
     );
   });
 
-  it("should load and serialize default netzgrafikDto (no trainruns) without changes", () => {
-    const inputDto = NetzgrafikDefault.getDefaultNetzgrafik();
+  // TODO: broken until the numberOfStops migration is completely done
+  // need to be replaced with tests importing a graph without any numberOfStops
+  describe("normal case", () => {
+    // needs to be updated to new format (no longer numberOfStops but the complete graph nodes + links)
+    it("should load and serialize default netzgrafikDto (no trainruns) without changes", () => {
+      const inputDto = NetzgrafikDefault.getDefaultNetzgrafik();
 
-    dataService.loadNetzgrafikDto(inputDto);
+      dataService.loadNetzgrafikDto(inputDto);
 
-    const outputJson = dataService.getNetzgrafikDto();
-    expect(JSON.stringify(inputDto, null, 2)).toEqual(JSON.stringify(outputJson, null, 2));
+      const outputJson = dataService.getNetzgrafikDto();
+      expect(JSON.stringify(inputDto, null, 2)).toEqual(JSON.stringify(outputJson, null, 2));
+    });
+
+    it("should load and serialize demo netzgrafikDto (complete variant) without changes", () => {
+      const inputDto = NetzgrafikDefault.getNetzgrafikDemoStandaloneGithub();
+
+      dataService.loadNetzgrafikDto(inputDto);
+
+      const outputJson = dataService.getNetzgrafikDto();
+
+      // The demo file should be up-to-date with numberOfStops: 0 and collapsed nodes
+      // already in place. No expansion should occur.
+      expect(JSON.stringify(inputDto, null, 2)).toEqual(JSON.stringify(outputJson, null, 2));
+    });
   });
 
-  it("should load and serialize demo netzgrafikDto (complete variant) without changes", () => {
-    const inputDto = NetzgrafikDefault.getNetzgrafikDemoStandaloneGithub();
+  describe("handling old files with numberOfStops", () => {
+    describe("2 nodes", () => {
+      // A -> B has 1 stop
+      it("should replace the numberOfStops: 1 with an equivalent graph portion", () => {
+        const inputDto = NetzgrafikTestData.getLegacyNtezgrafik2Nodes();
+
+        dataService.loadNetzgrafikDto(inputDto);
+
+        const outputJson = dataService.getNetzgrafikDto();
+
+        // we expect to have a new node between A and B
+        // the existing trainrunSection A -> B to now be A -> NEW
+        // and a new trainrunSection NEW -> B
+        const newNode = outputJson.nodes[2];
+        expect(newNode.betriebspunktName).toBe("NEW");
+        expect(newNode.positionX).toBe(1488);
+        expect(newNode.positionY).toBe(512);
+        expect(outputJson.trainrunSections[0].sourceNodeId).toBe(11);
+        expect(outputJson.trainrunSections[0].targetNodeId).toBe(newNode.id);
+        expect(outputJson.trainrunSections[1].sourceNodeId).toBe(newNode.id);
+        expect(outputJson.trainrunSections[1].targetNodeId).toBe(12);
+        expect(outputJson.trainrunSections[0].numberOfStops).toBe(0);
+        expect(outputJson.trainrunSections[1].numberOfStops).toBe(0);
+      });
+      it("should replace the numberOfStops: 3 with an equivalent graph portion", () => {
+        const inputDto = NetzgrafikTestData.getLegacyNtezgrafik2Nodes();
+        inputDto.trainrunSections[0].numberOfStops = 3;
+
+        dataService.loadNetzgrafikDto(inputDto);
+        // before
+        // A ------ B
+        // after
+        // A ------ C ------ D ------ E ------ B
+        const outputJson = dataService.getNetzgrafikDto();
+        const newNode1 = outputJson.nodes[2];
+        expect(newNode1.betriebspunktName).toBe("NEW");
+        expect(newNode1.positionX).toBe(1488);
+        expect(newNode1.positionY).toBe(512);
+        const newNode2 = outputJson.nodes[3];
+        expect(newNode2.betriebspunktName).toBe("NEW");
+        expect(newNode2.positionX).toBe(1576);
+        expect(newNode2.positionY).toBe(512);
+        const newNode3 = outputJson.nodes[4];
+        expect(newNode3.betriebspunktName).toBe("NEW");
+        expect(newNode3.positionX).toBe(1620);
+        expect(newNode3.positionY).toBe(512);
+        expect(outputJson.trainrunSections[0].sourceNodeId).toBe(11);
+        expect(outputJson.trainrunSections[0].targetNodeId).toBe(newNode1.id);
+        expect(outputJson.trainrunSections[1].sourceNodeId).toBe(newNode1.id);
+        expect(outputJson.trainrunSections[1].targetNodeId).toBe(newNode2.id);
+        expect(outputJson.trainrunSections[2].sourceNodeId).toBe(newNode2.id);
+        expect(outputJson.trainrunSections[2].targetNodeId).toBe(newNode3.id);
+        expect(outputJson.trainrunSections[3].sourceNodeId).toBe(newNode3.id);
+        expect(outputJson.trainrunSections[3].targetNodeId).toBe(12);
+        expect(outputJson.trainrunSections[0].numberOfStops).toBe(0);
+        expect(outputJson.trainrunSections[1].numberOfStops).toBe(0);
+        expect(outputJson.trainrunSections[2].numberOfStops).toBe(0);
+        expect(outputJson.trainrunSections[3].numberOfStops).toBe(0);
+      });
+    });
+    describe("3 nodes", () => {
+      // A -> B -> C
+      // each trainrunSection with 1 stop
+      it("should replace the numberOfStops: 1 with an equivalent graph portion for each section", () => {
+        const inputDto = NetzgrafikTestData.getLegacyNtezgrafik3Nodes();
+
+        dataService.loadNetzgrafikDto(inputDto);
 
-    dataService.loadNetzgrafikDto(inputDto);
+        const outputJson = dataService.getNetzgrafikDto();
 
-    const outputJson = dataService.getNetzgrafikDto();
-    expect(JSON.stringify(inputDto, null, 2)).toEqual(JSON.stringify(outputJson, null, 2));
+        const newNode1 = outputJson.nodes[3];
+        expect(newNode1.betriebspunktName).toBe("NEW");
+        expect(newNode1.positionX).toBe(1488);
+        expect(newNode1.positionY).toBe(512);
+        const newNode2 = outputJson.nodes[4];
+        expect(newNode2.betriebspunktName).toBe("NEW");
+        expect(newNode2.positionX).toBe(1808);
+        expect(newNode2.positionY).toBe(544);
+        expect(outputJson.trainrunSections[0].sourceNodeId).toBe(11);
+        expect(outputJson.trainrunSections[0].targetNodeId).toBe(newNode1.id);
+        expect(outputJson.trainrunSections[2].sourceNodeId).toBe(newNode1.id);
+        expect(outputJson.trainrunSections[2].targetNodeId).toBe(12);
+        expect(outputJson.trainrunSections[1].sourceNodeId).toBe(12);
+        expect(outputJson.trainrunSections[1].targetNodeId).toBe(newNode2.id);
+        expect(outputJson.trainrunSections[3].sourceNodeId).toBe(newNode2.id);
+        expect(outputJson.trainrunSections[3].targetNodeId).toBe(13);
+      });
+    });
   });
 });