[NAB-327] - Release 4.0.0

src/app/dialogs/dialog-model-edit/dialog-model-edit.component.html

@@ -5,6 +5,13 @@ <h2 mat-dialog-title>Edit model</h2>
         <input type="text" matInput [(ngModel)]="model.model.id" [formControl]="idCtrl">
         <mat-error *ngIf="idCtrl.errors && idCtrl.errors.required">Id is required</mat-error>
     </mat-form-field>
+    <mat-form-field fxFlex>
+        <mat-label>Version</mat-label>
+        <input type="text" matInput [(ngModel)]="model.model.version" [formControl]="versionCtrl">
+<!--        TODO: should be version required? -->
+<!--        <mat-error *ngIf="versionCtrl.errors && versionCtrl.errors.required">Version is required</mat-error>-->
+        <mat-error *ngIf="versionCtrl.errors && versionCtrl.errors.format">Version must be in format Major.Minor.Patch</mat-error>
+    </mat-form-field>
     <mat-form-field fxFlex>
         <mat-label>Title</mat-label>
         <input type="text" matInput [(ngModel)]="model.model.title.value" [formControl]="titleCtrl">
@@ -37,7 +44,7 @@ <h2 mat-dialog-title>Edit model</h2>
         <span>Permissions ({{this.modelService.numberOfPermissions()}})</span>
     </button>
     <button mat-flat-button color="primary" [mat-dialog-close]="model"
-            [disabled]="idCtrl.invalid || initialsCtrl.invalid || titleCtrl.invalid">
+            [disabled]="idCtrl.invalid || versionCtrl.invalid || initialsCtrl.invalid || titleCtrl.invalid">
         <mat-icon>done</mat-icon>
         <span>Save</span>
     </button>

src/app/dialogs/dialog-model-edit/dialog-model-edit.component.ts

@@ -1,11 +1,11 @@
-import {Component, Inject, OnInit} from '@angular/core';
+import {Component, Inject} from '@angular/core';
 import {ChangedPetriNet} from './changed-petri-net';
 import {MAT_DIALOG_DATA, MatDialog} from '@angular/material/dialog';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {Router} from '@angular/router';
 import {DialogManageRolesComponent, RoleRefType} from '../dialog-manage-roles/dialog-manage-roles.component';
 import {DataType} from '@netgrif/petriflow';
-import {FormControl, Validators} from '@angular/forms';
+import {FormControl, ValidatorFn, Validators} from '@angular/forms';
 
 @Component({
     selector: 'nab-dialog-model-edit',
@@ -16,6 +16,7 @@ export class DialogModelEditComponent {
 
     public model: ChangedPetriNet;
     public idCtrl: FormControl;
+    public versionCtrl: FormControl;
     public titleCtrl: FormControl;
     public initialsCtrl: FormControl;
 
@@ -27,6 +28,10 @@ export class DialogModelEditComponent {
     ) {
         this.model = data;
         this.idCtrl = new FormControl('', [Validators.required]);
+        this.versionCtrl = new FormControl('', [
+            // Validators.required,
+            this.validVersion()
+        ]);
         this.titleCtrl = new FormControl('', [Validators.required]);
         this.initialsCtrl = new FormControl('', [Validators.required]);
     }
@@ -48,4 +53,17 @@ export class DialogModelEditComponent {
         // TODO: NAB-327 open process view
         this.router.navigate(['modeler/actions']);
     }
+
+    private validVersion(): ValidatorFn {
+        return (fc: FormControl): { [key: string]: any } | null => {
+            const version = fc.value as string;
+            if (!version || version.length === 0) {
+                return null;
+            }
+            if (version.match(/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/)) {
+                return null;
+            }
+            return ({format: true})
+        };
+    }
 }

src/app/modeler/edit-mode/context-menu/menu-items/model/edit-model-menu-item.ts

@@ -14,7 +14,9 @@ export class EditModelMenuItem extends MenuItem {
                     width: '50%',
                     data: new ChangedPetriNet(tool.model.id, tool.model.clone())
                 }, (changedModel: ChangedPetriNet) => {
-                    tool.modelService.updateModel(changedModel);
+                    if (changedModel != undefined) {
+                        tool.modelService.updateModel(changedModel);
+                    }
                 });
             }
         );

src/app/modeler/services/model/model-config.ts

@@ -1,6 +1,7 @@
 export class ModelConfig {
     public static FILE_NAME = 'newmodel.xml';
     public static IDENTIFIER = 'new_model';
+    public static VERSION = '1.0.0';
     public static TITLE = 'New Model';
     public static ICON = 'device_hub';
     public static INITIALS = 'NEW';

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

@@ -68,6 +68,7 @@ export class ModelService implements ModelSource {
     newModel(): PetriNet {
         const model = new PetriNet();
         model.id = ModelConfig.IDENTIFIER;
+        model.version = ModelConfig.VERSION;
         model.title = new I18nString(ModelConfig.TITLE);
         model.initials = ModelConfig.INITIALS;
         model.icon = ModelConfig.ICON;

src/assets/mortgage_simple.xml

@@ -1,6 +1,7 @@
 <document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="https://netgrif.github.io/petriflow/petriflow.schema.xsd">
     <id>mortgage</id>
+    <version>1.0.0</version>
     <initials>MTG</initials>
     <title>Mortgage</title>
     <defaultRole>true</defaultRole>