diff --git a/core/examples/luigi-sample-angular/src/app/project/settings/settings.component.ts b/core/examples/luigi-sample-angular/src/app/project/settings/settings.component.ts
index 0b7504f943..4f7a044fb4 100644
--- a/core/examples/luigi-sample-angular/src/app/project/settings/settings.component.ts
+++ b/core/examples/luigi-sample-angular/src/app/project/settings/settings.component.ts
@@ -17,19 +17,18 @@ export class SettingsComponent implements OnInit {
constructor(
private activatedRoute: ActivatedRoute,
private cdr: ChangeDetectorRef
- ) {}
+ ) { }
ngOnInit() {
this.activatedRoute.params.subscribe((params: Params) => {
this.projectId = params['projectId'];
});
this.luigiClient = LuigiClient;
- LuigiClient.addInitListener(() => {
+ LuigiClient.addInitListener((init) => {
this.hasBack = LuigiClient.linkManager().hasBack();
- this.nodeParams =
- Object.keys(LuigiClient.getNodeParams()).length > 0
- ? LuigiClient.getNodeParams()
- : null;
+ this.nodeParams = Object.keys(LuigiClient.getNodeParams()).length > 0
+ ? LuigiClient.getNodeParams()
+ : null;
this.cdr.detectChanges();
});
}
diff --git a/core/examples/luigi-sample-angular/src/assets/sampleconfig.js b/core/examples/luigi-sample-angular/src/assets/sampleconfig.js
index dbc9cfccbb..461a956b08 100644
--- a/core/examples/luigi-sample-angular/src/assets/sampleconfig.js
+++ b/core/examples/luigi-sample-angular/src/assets/sampleconfig.js
@@ -322,6 +322,11 @@ Luigi.setConfig({
viewUrl: '/sampleapp.html#/restricted',
constraints: ['unicorns']
},
+ {
+ pathSegment: 'settings',
+ label: 'Settings',
+ viewUrl: '/sampleapp.html#/settings'
+ },
{
pathSegment: 'ext',
label: 'External Page',
diff --git a/core/src/App.html b/core/src/App.html
index 48b97bcaf1..a6abd7023d 100644
--- a/core/src/App.html
+++ b/core/src/App.html
@@ -47,23 +47,7 @@
Routing.handleRouteChange(trimLeadingSlash(window.location.pathname), component, node, config);
};
- const addPreserveView = (component, data, config, node) => {
- if (data.params.preserveView) {
- const pv = component.get().preservedViews;
- pv.push({
- path: Routing.getNodePath(component.get().currentNode),
- nextPath: Routing.getNodePath(component.get().currentNode) + data.params.link,
- context: component.get().context
- });
- component.set({preservedViews: pv});
-
- // Resetting iframe config to null, since Routing.navigateTo will then create a new iframe
- // instead of using the existing instance for route.
- config.iframe = null;
- }
- };
-
- const handleNavigation = async (component, data, config, node) => {
+ const buildPath = (component, data) => {
let path = data.params.link;
if (data.params.fromClosestContext) { // from the closest navigation context
const node = [...component.get().navigationPath].reverse().find((n) => n.navigationContext && n.navigationContext.length > 0);
@@ -76,13 +60,33 @@
path = Routing.concatenatePath(Routing.getNodePath(component.get().currentNode), data.params.link);
}
- if (data.params.nodeParams) {
+ if (data.params.nodeParams && Object.keys(data.params.nodeParams).length) {
path += '?';
Object.entries(data.params.nodeParams).forEach(entry => {
path += (encodeURIComponent(Routing.getContentViewParamPrefix() + entry[0]) + '=' + encodeURIComponent(entry[1]) + '&');
});
}
+ return path;
+ };
+
+ const addPreserveView = (component, data, config, node) => {
+ if (data.params.preserveView) {
+ const pv = component.get().preservedViews;
+ const nextPath = buildPath(component, data);
+ pv.push({
+ path: Routing.getNodePath(component.get().currentNode),
+ nextPath: nextPath.startsWith('/') ? nextPath : '/' + nextPath,
+ context: component.get().context
+ });
+ component.set({preservedViews: pv});
+ // Resetting iframe config to null, since Routing.navigateTo will then create a new iframe
+ // instead of using the existing instance for route.
+ config.iframe = null;
+ }
+ };
+ const handleNavigation = async (component, data, config, node) => {
+ const path = buildPath(component, data);
const matchedPath = await Routing.matchPath(path);
if (matchedPath !== null) {
addPreserveView(component, data, config, node);