Skip to content

Commit e2692bd

Browse files
committed
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
# Conflicts: # package.json # projects/netgrif-components-core/package.json # projects/netgrif-components/package.json
2 parents 5c186c3 + e5ef00a commit e2692bd

File tree

7 files changed

+11
-7
lines changed

7 files changed

+11
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Full Changelog: [https://github.com/netgrif/components/commits/v6.2.4](https://g
99

1010
## [6.3.0](https://github.com/netgrif/components/releases/tag/v6.3.0) (2022-10-01)
1111

12+
### Fixed
13+
14+
- [NAE-1762] Public view URL encoding
15+
1216
### Added
1317

1418
- [NAE-1678] User impersonation

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netgrif/components-project",
3-
"version": "6.3.0-beta.2",
3+
"version": "6.3.0-beta.3",
44
"description": "Netgrif Application Engine Frontend project. Project includes angular libraries as base for NAE applications.",
55
"homepage": "https://components.netgrif.com",
66
"license": "SEE LICENSE IN LICENSE",

projects/nae-example-app/src/app/doc/public-workflow-view/public-workflow-view.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ export class PublicWorkflowViewComponent extends AbstractWorkflowViewComponent {
6666
}
6767

6868
handleClick(workflow: Net) {
69-
this._router.navigate([this._route.snapshot.url.join('/') + '/' + workflow.identifier]);
69+
this._router.navigate([this._route.snapshot.url.join('/') + '/' + btoa(workflow.identifier)]);
7070
}
7171
}

projects/netgrif-components-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netgrif/components-core",
3-
"version": "6.3.0-beta.2",
3+
"version": "6.3.0-beta.3",
44
"description": "Netgrif Application engine frontend core Angular library",
55
"homepage": "https://components.netgrif.com",
66
"license": "SEE LICENSE IN LICENSE",

projects/netgrif-components-core/src/lib/public/factories/get-net-and-create-case.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const getNetAndCreateCase = (router: Router,
1414
snackBarService: SnackBarService,
1515
translate: TranslateService,
1616
publicTaskLoadingService: PublicTaskLoadingService) => {
17-
process.getNet(route.snapshot.paramMap.get('petriNetId')).pipe(mergeMap(net => {
17+
process.getNet(atob(route.snapshot.paramMap.get('petriNetId'))).pipe(mergeMap(net => {
1818
if (net) {
1919
publicTaskLoadingService.setLoading$(true);
2020
const newCase = {

projects/netgrif-components-core/src/lib/resources/engine-endpoint/public/public-petri-net-resource.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class PublicPetriNetResourceService extends PetriNetResourceService {
4242
* **Request URL:** {{baseUrl}}/api/public/petrinet/{identifier}/{version}
4343
*/
4444
public getOne(identifier: string, version: string, params?: Params): Observable<PetriNetReference> {
45-
return this.provider.get$('public/petrinet/' + identifier + '/' + version, this.SERVER_URL, params)
45+
return this.provider.get$('public/petrinet/' + btoa(identifier) + '/' + version, this.SERVER_URL, params)
4646
.pipe(map(r => this.changeType(r, 'petriNetReferences')));
4747
}
4848

projects/netgrif-components/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netgrif/components",
3-
"version": "6.3.0-beta.2",
3+
"version": "6.3.0-beta.3",
44
"description": "Netgrif Application Engine frontend Angular components",
55
"homepage": "https://components.netgrif.com",
66
"license": "SEE LICENSE IN LICENSE",
@@ -29,7 +29,7 @@
2929
"nae frontend"
3030
],
3131
"peerDependencies": {
32-
"@netgrif/components-core": "6.3.0-beta.2",
32+
"@netgrif/components-core": "6.3.0-beta.3",
3333
"@angular-material-components/datetime-picker": "~7.0.1",
3434
"@angular-material-components/moment-adapter": "~7.0.0",
3535
"@angular/animations": "~13.3.1",

0 commit comments

Comments
 (0)