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
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

Full Changelog: [https://github.com/netgrif/components/commits/v6.2.5](https://github.com/netgrif/components/commits/v6.2.5)
Full Changelog: [https://github.com/netgrif/components/commits/v6.2.6](https://github.com/netgrif/components/commits/v6.2.6)

## [6.2.6](https://github.com/netgrif/components/releases/tag/v6.2.6) (2022-12-12)

### Fixed

- [NAE-1799] Multilevel process identifier handling in 6.2.x for public view
- [NAE-1800] Operations on date fields in advanced search are not rendered correctly

## [6.2.5](https://github.com/netgrif/components/releases/tag/v6.2.5) (2022-12-05)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netgrif/components-project",
"version": "6.2.5",
"version": "6.2.6",
"description": "Netgrif Application Engine Frontend project. Project includes angular libraries as base for NAE applications.",
"homepage": "https://components.netgrif.com",
"license": "SEE LICENSE IN LICENSE",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export class PublicWorkflowViewComponent extends AbstractWorkflowViewComponent {
}

handleClick(workflow: Net) {
this._router.navigate([this._route.snapshot.url.join('/') + '/' + workflow.identifier]);
this._router.navigate([this._route.snapshot.url.join('/') + '/' + btoa(workflow.identifier)]);

}
}
2 changes: 1 addition & 1 deletion projects/netgrif-components-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netgrif/components-core",
"version": "6.2.5",
"version": "6.2.6",
"description": "Netgrif Application engine frontend core Angular library",
"homepage": "https://components.netgrif.com",
"license": "SEE LICENSE IN LICENSE",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const getNetAndCreateCase = (router: Router,
snackBarService: SnackBarService,
translate: TranslateService,
publicTaskLoadingService: PublicTaskLoadingService) => {
process.getNet(route.snapshot.paramMap.get('petriNetId')).pipe(mergeMap(net => {
process.getNet(atob(route.snapshot.paramMap.get('petriNetId'))).pipe(mergeMap(net => {
if (net) {
publicTaskLoadingService.setLoading$(true);
const newCase = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class PublicPetriNetResourceService extends PetriNetResourceService {
* **Request URL:** {{baseUrl}}/api/public/petrinet/{identifier}/{version}
*/
public getOne(identifier: string, version: string, params?: Params): Observable<PetriNetReference> {
return this.provider.get$('public/petrinet/' + identifier + '/' + version, this.SERVER_URL, params)
return this.provider.get$('public/petrinet/' + btoa(identifier) + '/' + version, this.SERVER_URL, params)
.pipe(map(r => this.changeType(r, 'petriNetReferences')));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export abstract class AbstractSingleTaskViewComponent extends AbstractViewWithHe
public loading$: Observable<boolean>;
private transitionId: string;
private subRoute: Subscription | undefined;
protected subPanelData: Subscription;
protected subPanelData: Subscription | undefined;

protected constructor(protected taskViewService: TaskViewService,
activatedRoute: ActivatedRoute) {
Expand All @@ -30,7 +30,6 @@ export abstract class AbstractSingleTaskViewComponent extends AbstractViewWithHe
this.subRoute = this._activatedRoute.paramMap.subscribe(paramMap => {
if (!!(paramMap?.['params']?.[TaskConst.TRANSITION_ID])) {
this.transitionId = paramMap['params'][TaskConst.TRANSITION_ID];
this.subPanelData.unsubscribe();
this.subPanelData = this.taskViewService.tasks$.subscribe(tasks => {
if (!!tasks && tasks.length > 0) {
this.taskPanelData.next(this.resolveTransitionTask(tasks));
Expand All @@ -43,7 +42,9 @@ export abstract class AbstractSingleTaskViewComponent extends AbstractViewWithHe

ngOnDestroy() {
super.ngOnDestroy();
this.subRoute.unsubscribe();
if (!!this.subRoute) {
this.subRoute.unsubscribe();
}
if (!!this.subPanelData) {
this.subPanelData.unsubscribe();
}
Expand Down
4 changes: 2 additions & 2 deletions projects/netgrif-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netgrif/components",
"version": "6.2.5",
"version": "6.2.6",
"description": "Netgrif Application Engine frontend Angular components",
"homepage": "https://components.netgrif.com",
"license": "SEE LICENSE IN LICENSE",
Expand Down Expand Up @@ -29,7 +29,7 @@
"nae frontend"
],
"peerDependencies": {
"@netgrif/components-core": "6.2.5",
"@netgrif/components-core": "6.2.6",
"@angular-material-components/datetime-picker": "~7.0.1",
"@angular-material-components/moment-adapter": "~7.0.0",
"@angular/animations": "~13.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ export class <%= classify(className) %>Component extends AbstractWorkflowViewCom
}

handleClick(workflow: Net) {
this._router.navigate([this._route.snapshot.url.join('/') + '/' + workflow.identifier]);
this._router.navigate([this._route.snapshot.url.join('/') + '/' + btoa(workflow.identifier)]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@
[disabled]="!editable"
(keydown.enter)="searchDatepicker.close()"
(focus)="editInput(); searchDatepicker.open()"
(blur)="confirmInput()"
#operandInput>
<mat-datepicker-toggle matPrefix [for]="searchDatepicker"></mat-datepicker-toggle>
<mat-datepicker #searchDatepicker></mat-datepicker>
<mat-datepicker
#searchDatepicker
(closed)="confirmInput()"></mat-datepicker>
</mat-form-field>
</ng-template>

Expand Down