diff --git a/.gitignore b/.gitignore
index 3e26ea5..57fc171 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ Thumbs.db
.scannerwork/
out/
package-lock.json
+pnpm-lock.yaml
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
diff --git a/package.json b/package.json
index a50c9e0..318d7fa 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
"@netgrif/components": "7.0.0-beta.1",
"@netgrif/components-core": "7.0.0-beta.1",
"@netgrif/petri.svg": "1.1.1",
- "@netgrif/petriflow": "2.2.0",
+ "@netgrif/petriflow": "2.2.1",
"@netgrif/petriflow.svg": "1.1.1",
"@ngbracket/ngx-layout": "^17.0.1",
"@ngx-translate/core": "~15.0.0",
diff --git a/src/app/modeler/role-mode/role-detail/role-detail.component.html b/src/app/modeler/role-mode/role-detail/role-detail.component.html
index 6d576ba..efe170b 100644
--- a/src/app/modeler/role-mode/role-detail/role-detail.component.html
+++ b/src/app/modeler/role-mode/role-detail/role-detail.component.html
@@ -4,9 +4,11 @@
Id
-
- Id is required
- Transition with given id already exists
+
+ Id is required
+
+ Transition with given id already exists
+
@@ -21,9 +23,17 @@
+
+
+ Is Global
+
+
+
+
+
diff --git a/src/app/modeler/role-mode/role-detail/role-detail.component.ts b/src/app/modeler/role-mode/role-detail/role-detail.component.ts
index d4db8ee..4487718 100644
--- a/src/app/modeler/role-mode/role-detail/role-detail.component.ts
+++ b/src/app/modeler/role-mode/role-detail/role-detail.component.ts
@@ -13,13 +13,13 @@ import {ModelerUtils} from '../../modeler-utils';
@Component({
selector: 'nab-role-detail',
templateUrl: './role-detail.component.html',
- styleUrl: './role-detail.component.scss'
+ styleUrl: './role-detail.component.scss',
})
export class RoleDetailComponent implements OnDestroy {
public role: ChangedRole;
public shouldSave: boolean = false;
- public form: FormControl;
+ public roleIdForm: FormControl;
public constructor(
private _masterService: RoleMasterDetailService,
@@ -27,7 +27,7 @@ export class RoleDetailComponent implements OnDestroy {
private _router: Router,
private _actionMode: ActionsModeService,
private _actionsMasterDetail: ActionsMasterDetailService,
- protected _historyService: HistoryService
+ protected _historyService: HistoryService,
) {
this._masterService.getSelected$().subscribe(item => {
this.saveChange();
@@ -36,9 +36,9 @@ export class RoleDetailComponent implements OnDestroy {
}
this.role = new ChangedRole(item.clone());
});
- this.form = new FormControl('', [
+ this.roleIdForm = new FormControl('', [
Validators.required,
- this.validUnique()
+ this.validUnique(),
]);
}
@@ -75,6 +75,11 @@ export class RoleDetailComponent implements OnDestroy {
this.shouldSave = true;
}
+ changeGlobalFlag($event): void {
+ this.role.role.global = $event.checked;
+ this.shouldSave = true;
+ }
+
get item(): Role {
return this.service.getSelected();
}
diff --git a/src/app/modeler/services/model/model.service.ts b/src/app/modeler/services/model/model.service.ts
index 210ceef..ad51fa8 100644
--- a/src/app/modeler/services/model/model.service.ts
+++ b/src/app/modeler/services/model/model.service.ts
@@ -365,6 +365,7 @@ export class ModelService {
const role = this.model.getRole(newRole.id);
role.id = newRole.role.id;
role.title = newRole.role.title;
+ role.global = newRole.role.global;
this.model.removeRole(newRole.id);
this.model.addRole(role);