Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 14 additions & 4 deletions src/app/modeler/role-mode/role-detail/role-detail.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@

<mat-form-field fxFlex="45">
<mat-label>Id</mat-label>
<input matInput [(ngModel)]="role.role.id" (change)="changeId($event)" [formControl]="form">
<mat-error *ngIf="form.errors && form.errors.required">Id is required</mat-error>
<mat-error *ngIf="form.errors && form.errors.validUnique">Transition with given id already exists</mat-error>
<input matInput [(ngModel)]="role.role.id" (change)="changeId($event)" [formControl]="roleIdForm">
<mat-error *ngIf="roleIdForm.errors && roleIdForm.errors.required">Id is required</mat-error>
<mat-error *ngIf="roleIdForm.errors && roleIdForm.errors.validUnique">
Transition with given id already exists
</mat-error>
</mat-form-field>

<div fxFlex="2.5"></div>
Expand All @@ -21,9 +23,17 @@
<div fxLayout="row wrap" fxLayoutAlign="start center">
<div fxFlex="2.5"></div>

<div fxFlex="45">
<mat-checkbox [ngModel]="role.role.global" (change)="changeGlobalFlag($event)">
Is Global
</mat-checkbox>
</div>

<div fxFlex="2.5"></div>

<button mat-stroked-button color="primary" (click)="openActions()" mat-dialog-close>
<mat-icon>code</mat-icon>
<span>Edit Actions ({{numberOfActions()}})</span>
<span>Edit Actions ({{ numberOfActions() }})</span>
</button>

<div fxFlex></div>
Expand Down
15 changes: 10 additions & 5 deletions src/app/modeler/role-mode/role-detail/role-detail.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ 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,
private _modelService: ModelService,
private _router: Router,
private _actionMode: ActionsModeService,
private _actionsMasterDetail: ActionsMasterDetailService,
protected _historyService: HistoryService
protected _historyService: HistoryService,
) {
this._masterService.getSelected$().subscribe(item => {
this.saveChange();
Expand All @@ -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(),
]);
}

Expand Down Expand Up @@ -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();
}
Expand Down
1 change: 1 addition & 0 deletions src/app/modeler/services/model/model.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down