[NAB-358] Release 2.1.0

- fix duplicate action id bug

Author: mazarijuraj

src/app/modeler/actions-mode/action-editor/action-editor.service.ts

@@ -23,6 +23,8 @@ import {
 } from '@netgrif/petriflow';
 import {MasterItem} from './classes/master-item';
 import {EventType} from './event-type';
+import {SequenceGenerator} from '../../services/model/sequence-generator';
+import {ModelService} from '../../services/model/model.service';
 
 @Injectable({
     providedIn: 'root'
@@ -32,18 +34,17 @@ export class ActionEditorService {
     public editedActions: Array<ActionGroup>;
     public historySave: boolean;
     private _datarefMap: Map<string, DataRef>;
-    private _lastUsedId: number;
     private _currentlyEdited: Transition | DataVariable | PetriNet | Role;
 
-    constructor() {
+    constructor(
+        private _modelService: ModelService,
+    ) {
         this.editedActions = [];
-        this._lastUsedId = 0;
         this._datarefMap = new Map<string, DataRef>();
     }
 
     public nextId(): string {
-        this._lastUsedId++;
-        return String(this._lastUsedId);
+        return this._modelService.nextActionId();
     }
 
     public populateEditedActionsFromTransition(transition: Transition): void {
@@ -116,50 +117,10 @@ export class ActionEditorService {
     private loadAction(action: Action, actionType: ActionType, eventType: EventType, phase: EventPhase, parentDataRefId?: string): EditableAction {
         if (action.id === undefined || action.id === null) {
             action.id = this.nextId();
-        } else {
-            this.updateLastId(action.id);
         }
         return new EditableAction(action.id, actionType, false, action.definition, eventType, phase, parentDataRefId);
     }
 
-    private updateLastId(id: string): void {
-        const parsedId = parseInt(id, 10);
-        this._lastUsedId = Math.max(this._lastUsedId, isNaN(parsedId) ? 0 : parsedId);
-    }
-
-    public updateIds(model: PetriNet): void {
-        model.getProcessEvents().forEach(e => {
-            e.preActions.forEach(a => this.updateLastId(a.id));
-            e.postActions.forEach(a => this.updateLastId(a.id));
-        });
-        model.getCaseEvents().forEach(e => {
-            e.preActions.forEach(a => this.updateLastId(a.id));
-            e.postActions.forEach(a => this.updateLastId(a.id));
-        });
-        model.getRoles().forEach(r => {
-            r.getEvents().forEach(e => {
-                e.preActions.forEach(a => this.updateLastId(a.id));
-                e.postActions.forEach(a => this.updateLastId(a.id));
-            });
-        });
-        model.getTransitions().forEach(t => {
-            t.eventSource.getEvents().forEach(e => {
-                e.preActions.forEach(a => this.updateLastId(a.id));
-                e.postActions.forEach(a => this.updateLastId(a.id));
-            });
-            t.dataGroups.forEach(g => g.getDataRefs().forEach(d => d.getEvents().forEach(e => {
-                e.preActions.forEach(a => this.updateLastId(a.id));
-                e.postActions.forEach(a => this.updateLastId(a.id));
-            })));
-        });
-        model.getDataSet().forEach(d => {
-            d.getEvents().forEach(e => {
-                e.preActions.forEach(a => this.updateLastId(a.id));
-                e.postActions.forEach(a => this.updateLastId(a.id));
-            });
-        });
-    }
-
     public saveActionChange(changedAction: EditableAction) {
         this.saveAction(changedAction);
         changedAction.commitChanges();

src/app/modeler/services/model/model.service.ts

@@ -1,5 +1,6 @@
 import {Injectable} from '@angular/core';
 import {
+    Action,
     Arc,
     ArcType,
     Breakpoint,
@@ -44,6 +45,7 @@ export class ModelService {
     private _arcIdSequence = new SequenceGenerator('a');
     private _dataIdSequence = new SequenceGenerator('data');
     private _roleIdSequence = new SequenceGenerator('role');
+    private _actionIdSequence = new SequenceGenerator('action');
 
     private xmlArcTypeMapping: Map<XmlArcType, ArcType> = new Map([
         [XmlArcType.REGULAR, ArcType.REGULAR_PT],
@@ -76,6 +78,7 @@ export class ModelService {
         this._arcIdSequence.reset(newModel.getArcs());
         this._dataIdSequence.reset(newModel.getDataSet());
         this._roleIdSequence.reset(newModel.getRoles());
+        this._actionIdSequence.reset(this.collectActions(newModel));
     }
 
     get model(): PetriNet {
@@ -441,6 +444,45 @@ export class ModelService {
         return id;
     }
 
+    public nextActionId(): string {
+        return this._actionIdSequence.next();
+    }
+
+    private collectActions(newModel: PetriNet): Action[] {
+        const actions = new Array<Action>();
+        newModel.getCaseEvents().forEach(e => {
+            actions.push(...e.preActions);
+            actions.push(...e.postActions);
+        });
+        newModel.getProcessEvents().forEach(e => {
+            actions.push(...e.preActions);
+            actions.push(...e.postActions);
+        });
+        newModel.getRoles().forEach(r => {
+            r.getEvents().forEach(e => {
+                actions.push(...e.preActions);
+                actions.push(...e.postActions);
+            });
+        });
+        newModel.getTransitions().forEach(t => {
+            t.eventSource.getEvents().forEach(e => {
+                actions.push(...e.preActions);
+                actions.push(...e.postActions);
+            });
+            t.dataGroups.forEach(g => g.getDataRefs().forEach(d => d.getEvents().forEach(e => {
+                actions.push(...e.preActions);
+                actions.push(...e.postActions);
+            })));
+        });
+        newModel.getDataSet().forEach(d => {
+            d.getEvents().forEach(e => {
+                actions.push(...e.preActions);
+                actions.push(...e.postActions);
+            });
+        });
+        return actions;
+    }
+
     public alignModel(model = this.model): void {
         [...model.getPlaces(), ...model.getTransitions()].forEach(node => {
             node.x = this.alignPositionX(node.x);

src/app/modeler/services/model/sequence-generator.ts

@@ -1,4 +1,4 @@
-import {DataVariable, Element, Role} from '@netgrif/petriflow';
+import {Action, DataVariable, Element, Role} from '@netgrif/petriflow';
 
 export class SequenceGenerator {
     private _id = 0;
@@ -13,9 +13,9 @@ export class SequenceGenerator {
         return `${this._prefix}${this._id}`;
     }
 
-    public reset(collection: Array<Element | DataVariable | Role>): void {
+    public reset(collection: Array<Element | DataVariable | Role | Action>): void {
         this._id = collection.filter(e => e.id.startsWith(this._prefix))
-            .map(e => Number.parseInt(e.id.substring(1), 10))
+            .map(e => Number.parseInt(e.id.substring(this._prefix.length), 10))
             .filter(elementId => !isNaN(elementId))
             .reduce((a, b) => Math.max(a, b), 0);
     }