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

Removed automatic Crumb Trail truncation #112

Merged
merged 18 commits into from
Jan 17, 2017
Merged

Removed automatic Crumb Trail truncation #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
80d7f6c
Removed crumb trail repeated state truncation
grahammendick Jan 15, 2017
9de78ba
Switched truncate params around
grahammendick Jan 15, 2017
3dd30e9
Updated truncate definitely typed params
grahammendick Jan 15, 2017
be98aa6
Removed custom crumb trail truncation
grahammendick Jan 15, 2017
1970d9f
Updated definitely typed version
grahammendick Jan 15, 2017
eb93728
Removed custom trail from truncation tests
grahammendick Jan 15, 2017
b1ca12b
Removed duplicate tests
grahammendick Jan 15, 2017
32363c2
Revert "Removed duplicate tests"
grahammendick Jan 15, 2017
e5d166c
Added custom trail navigation tests
grahammendick Jan 15, 2017
82634a8
Added more custom trail navigation tests
grahammendick Jan 15, 2017
e451212
Added more custom trail navigation tests
grahammendick Jan 15, 2017
73e6c87
Added more custom trail navigation tests
grahammendick Jan 15, 2017
439652a
Added more custom trail navigation tests
grahammendick Jan 15, 2017
2291e87
Converted navigation data custom trail tests
grahammendick Jan 15, 2017
03618dc
Converted more navigation data custom trail tests
grahammendick Jan 15, 2017
89355ee
Converted more navigation data custom trail tests
grahammendick Jan 15, 2017
3e2aa98
Converted more navigation data custom trail tests
grahammendick Jan 15, 2017
e82ba2a
Copied latest definitely typed into plugins
grahammendick Jan 17, 2017
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
2 changes: 1 addition & 1 deletion Navigation/src/StateHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class StateHandler {
crumbs = crumbs.slice();
if (nextCrumb)
crumbs.push(nextCrumb);
crumbs = state.truncateCrumbTrail(state, crumbs, { ...state.defaults, ...navigationData });
crumbs = state.truncateCrumbTrail(state, { ...state.defaults, ...navigationData }, crumbs);
for(var i = 0; i < crumbs.length; i++)
crumbTrail.push(crumbs[i].crumblessUrl)
}
Expand Down
10 changes: 2 additions & 8 deletions Navigation/src/config/State.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,8 @@ class State implements StateInfo {
return true;
}

truncateCrumbTrail(state: State, crumbs: Crumb[], data: any): Crumb[] {
var newCrumbs: Crumb[] = [];
for (var i = 0; i < crumbs.length; i++) {
if (crumbs[i].state === state)
break;
newCrumbs.push(crumbs[i]);
}
return newCrumbs;
truncateCrumbTrail(state: State, data: any, crumbs: Crumb[]): Crumb[] {
return crumbs;
}
}
export default State;
130 changes: 92 additions & 38 deletions Navigation/test/FluentNavigationTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe('Fluent', function () {
.navigate('s')
.navigate('s')
.url;
assert.strictEqual(url, '/r');
assert.strictEqual(url, '/r?crumb=%2Fr');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -179,7 +179,7 @@ describe('Fluent', function () {
.navigate('s1')
.refresh()
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -398,7 +398,7 @@ describe('Fluent', function () {
.navigateBack(1)
.refresh()
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -438,7 +438,7 @@ describe('Fluent', function () {
.refresh()
.navigate('s3')
.url;
assert.strictEqual(url, '/r3?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(url, '/r3?crumb=%2Fr0&crumb=%2Fr1&crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -508,14 +508,28 @@ describe('Fluent', function () {
{ key: 's', route: 'r', trackCrumbTrail: true },
]);
var state = stateNavigator.states['s'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
state.truncateCrumbTrail = (state, data, crumbs) => [];
var url = stateNavigator.fluent()
.navigate('s')
.navigate('s')
.url;
assert.strictEqual(url, '/r?crumb=%2Fr');
assert.strictEqual(url, '/r');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});

describe('Transition State State', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's0', route: 'r0' },
{ key: 's1', route: 'r1', trackCrumbTrail: true }
]);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.navigate('s1')
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand All @@ -527,28 +541,22 @@ describe('Fluent', function () {
{ key: 's1', route: 'r1', trackCrumbTrail: true }
]);
var state = stateNavigator.states['s1'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
state.truncateCrumbTrail = (state, data, crumbs) => crumbs.slice(-1);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.navigate('s1')
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(url, '/r1?crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});

describe('State State Back Custom Trail', function () {
describe('State State Back', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's', route: 'r', trackCrumbTrail: true }
]);
var state = stateNavigator.states['s'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
var url = stateNavigator.fluent()
.navigate('s')
.navigate('s')
Expand All @@ -559,16 +567,12 @@ describe('Fluent', function () {
});
});

describe('State State Back Custom Trail', function () {
describe('Transition State State Back', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's0', route: 'r0' },
{ key: 's1', route: 'r1', trackCrumbTrail: true }
]);
var state = stateNavigator.states['s1'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
Expand All @@ -580,6 +584,25 @@ describe('Fluent', function () {
});
});

describe('State State Back Two', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's0', route: 'r0' },
{ key: 's1', route: 'r1', trackCrumbTrail: true },
{ key: 's2', route: 'r2', trackCrumbTrail: true }
]);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.navigate('s1')
.navigate('s2')
.navigateBack(2)
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});

describe('State State Back Two Custom Trail', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
Expand All @@ -588,16 +611,34 @@ describe('Fluent', function () {
{ key: 's2', route: 'r2', trackCrumbTrail: true }
]);
var state = stateNavigator.states['s1'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
state.truncateCrumbTrail = (state, data, crumbs) => crumbs.slice(0, 1);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.navigate('s1')
.navigate('s2')
.navigateBack(2)
.url;
assert.strictEqual(url, '/r0');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});

describe('State State Back One By One', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's0', route: 'r0' },
{ key: 's1', route: 'r1', trackCrumbTrail: true },
{ key: 's2', route: 'r2', trackCrumbTrail: true }
]);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.navigate('s1')
.navigate('s2')
.navigateBack(1)
.navigateBack(1)
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
Expand All @@ -611,9 +652,7 @@ describe('Fluent', function () {
{ key: 's2', route: 'r2', trackCrumbTrail: true }
]);
var state = stateNavigator.states['s1'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
state.truncateCrumbTrail = (state, data, crumbs) => crumbs.slice(0, 1);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
Expand All @@ -622,7 +661,7 @@ describe('Fluent', function () {
.navigateBack(1)
.navigateBack(1)
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r0');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -680,7 +719,7 @@ describe('Fluent', function () {
.navigate('s1')
.refresh()
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -765,7 +804,7 @@ describe('Fluent', function () {
.navigate('s1')
.refresh()
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -866,8 +905,8 @@ describe('Fluent', function () {
var url1 = fluent1
.refresh()
.url;
assert.strictEqual(url0, '/r1?crumb=%2Fr0');
assert.strictEqual(url1, '/r3?crumb=%2Fr2');
assert.strictEqual(url0, '/r1?crumb=%2Fr0&crumb=%2Fr1');
assert.strictEqual(url1, '/r3?crumb=%2Fr2&crumb=%2Fr3');
assert.strictEqual(stateNavigator0.stateContext.url, null);
assert.strictEqual(stateNavigator1.stateContext.url, null);
});
Expand Down Expand Up @@ -987,23 +1026,38 @@ describe('Fluent', function () {
});
});

describe('Refresh Back', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's0', route: 'r0' },
{ key: 's1', route: 'r1', trackCrumbTrail: true }
]);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.refresh()
.navigateBack(1)
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});

describe('Refresh Back Custom Trail', function () {
it('should navigate', function() {
var stateNavigator = new StateNavigator([
{ key: 's0', route: 'r0' },
{ key: 's1', route: 'r1', trackCrumbTrail: true }
]);
var state = stateNavigator.states['s1'];
state.truncateCrumbTrail = (state, crumbs) => {
return crumbs;
};
state.truncateCrumbTrail = (state, data, crumbs) => crumbs.slice(0, 1);
var url = stateNavigator.fluent()
.navigate('s0')
.navigate('s1')
.refresh()
.navigateBack(1)
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r0');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down Expand Up @@ -1042,7 +1096,7 @@ describe('Fluent', function () {
.navigate('s3')
.navigate('s1')
.url;
assert.strictEqual(url, '/r1?crumb=%2Fr0');
assert.strictEqual(url, '/r1?crumb=%2Fr0&crumb=%2Fr1&crumb=%2Fr2&crumb=%2Fr3');
assert.strictEqual(stateNavigator.stateContext.url, null);
});
});
Expand Down
Loading