Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix leftnav nav-sync issue #1271

Merged
merged 9 commits into from
Apr 21, 2020
Merged

Fix leftnav nav-sync issue #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d56849
Merge remote-tracking branch 'upstream/master'
maxmarkus Apr 9, 2020
1afad99
Merge remote-tracking branch 'upstream/master'
maxmarkus Apr 15, 2020
a28b007
preventing withoutSync navigation when clicking on navigation
maxmarkus Apr 16, 2020
7dee852
always enable navSync when using navbar clicks
maxmarkus Apr 16, 2020
f70bfe5
added e2e tets for nav sync
maxmarkus Apr 16, 2020
68c09fe
Merge branch 'master' into 1258-fix-leftnav-navsync-issue
zarkosimic Apr 16, 2020
91086a3
Merge branch 'master' into 1258-fix-leftnav-navsync-issue
zarkosimic Apr 17, 2020
978def9
Merge branch 'master' into 1258-fix-leftnav-navsync-issue
maxmarkus Apr 20, 2020
10d54c6
Merge branch 'master' into 1258-fix-leftnav-navsync-issue
JohannesDoberer Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/App.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@
node.openNodeInModal === true ? {} : node.openNodeInModal
);
} else {
getComponentWrapper().set({ isNavigationSyncEnabled: true });
Routing.handleRouteClick(node, getComponentWrapper());
}
});
Expand Down
58 changes: 58 additions & 0 deletions test/e2e-test-application/e2e/tests/1-angular/navigation.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,64 @@ describe('Navigation', () => {

cy.get('[data-testid=modal-mf]').should('not.be.visible');
});

it('Nav sync - click sidenav', () => {
// projects page
cy.get('.fd-shellbar')
.contains('Projects')
.click();

//projects page
cy.get('.fd-app__sidebar')
.contains('Project Two')
.click();

cy.get('.fd-app__sidebar')
.contains('Nav Sync')
.click();

cy.expectPathToBe('/projects/pr2/nav-sync/one');

['four', 'three', 'two', 'three', 'two'].forEach(label => {
cy.get('.fd-app__sidebar')
.contains(label)
.click();

cy.expectPathToBe('/projects/pr2/nav-sync/' + label);

cy.getIframeBody().then($iframeBody => {
cy.wrap($iframeBody)
.find('.fd-list-group__item')
.contains('Current pathsegment: ' + label);
});
});
});
it('Nav sync - use synched nav', () => {
// projects page
cy.get('.fd-shellbar')
.contains('Projects')
.click();

//projects page
cy.get('.fd-app__sidebar')
.contains('Project Two')
.click();

cy.get('.fd-app__sidebar')
.contains('Nav Sync')
.click();

cy.expectPathToBe('/projects/pr2/nav-sync/one');

['two', 'three', 'four', 'one'].forEach((label, index) => {
cy.getIframeBody().then($iframeBody => {
cy.wrap($iframeBody)
.find('.fd-link')
.click();
});
cy.expectPathToBe('/projects/pr2/nav-sync/' + label);
});
});
});
describe('Horizontal Tab Navigation', () => {
context('Desktop', () => {
Expand Down