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

feat!: use local route for local router store #309

Merged
merged 11 commits into from
Aug 30, 2024
Merged

feat!: use local route for local router store #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ae8ae1
test: compare `LocalRouterStore` selectors to `ActivatedRoute` observ…
LayZeeDK Jul 3, 2024
dad953b
chore: install Spectacular 15.0
LayZeeDK Aug 30, 2023
338962d
test: use Spectacular feature harnesses
LayZeeDK Aug 30, 2023
99c938e
test: rename selector test suites
LayZeeDK Oct 22, 2023
8abdf9f
test: compare `GlobalRouterStore` selectors to NgRx Router Store sele…
LayZeeDK Sep 22, 2023
eeceb68
test: cover nested and componentless routes with route data
LayZeeDK Sep 23, 2023
4e1858e
test: cover nested and componentless routes with route parameters
LayZeeDK Oct 19, 2023
c14ffe9
test: cover route fragment
LayZeeDK Oct 29, 2023
ee72284
test: cover nested current route
LayZeeDK Jul 8, 2024
fae4fef
test: cover nested route URL
LayZeeDK Aug 19, 2024
cc98f5f
feat!: use local route for local router store
LayZeeDK Jul 3, 2024
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"@angular/compiler-cli": "15.0.4",
"@angular/language-service": "15.0.4",
"@ngrx/eslint-plugin": "15.0.0",
"@ngworker/spectacular": "15.0.0",
"@nrwl/cli": "15.3.3",
"@nrwl/eslint-plugin-nx": "15.3.3",
"@nrwl/jest": "15.3.3",
Expand Down
251 changes: 251 additions & 0 deletions ...outer-component-store/src/lib/global-router-store/componentless-nested-route-data.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
import { RouterConfigOptions, Routes } from '@angular/router';
import { firstValueFrom } from 'rxjs';
import { MinimalRouteData } from '../minimal-route-data';
import { RouterStore } from '../router-store';
import { GlobalRouterStore } from './global-router-store';
import { globalRouterStoreSetup } from './test-util/global-router-store-setup';
import {
GlobalRouterStoreTestChildComponent,
GlobalRouterStoreTestGrandchildComponent,
GlobalRouterStoreTestParentComponent,
} from './test-util/global-router-store-test-components';

const routes: Routes = [
{
path: '',
data: {
componentlessBeforeParent: 'componentless-route-data-before-parent',
shadowed: 'componentless-route-data-before-parent',
},
children: [
{
path: 'parent',
component: GlobalRouterStoreTestParentComponent,
data: {
parent: 'parent-route-data',
shadowed: 'parent-route-data',
},
children: [
{
path: '',
data: {
componentlessBeforeChild: 'componentless-route-data-before-child',
shadowed: 'componentless-route-data-before-child',
},
children: [
{
path: 'child',
component: GlobalRouterStoreTestChildComponent,
data: {
child: 'child-route-data',
shadowed: 'child-route-data',
},
children: [
{
path: '',
data: {
componentlessBeforeGrandchild:
'componentless-route-data-before-grandchild',
shadowed: 'componentless-route-data-before-grandchild',
},
children: [
{
path: 'grandchild',
component: GlobalRouterStoreTestGrandchildComponent,
data: {
grandchild: 'grandchild-route-data',
shadowed: 'grandchild-route-data',
},
},
],
},
],
},
],
},
],
},
],
},
];

describe(`${GlobalRouterStore.name} componentless nested route data`, () => {
describe(`Given three layers of routes with components and route data
And a componentless route with route data before each of them`, () => {
const paramsInheritanceStrategies: RouterConfigOptions['paramsInheritanceStrategy'][] =
['always', 'emptyOnly'];

describe.each(paramsInheritanceStrategies)(
' And the "%s" route parameter inheritance strategy is used',
(paramsInheritanceStrategy) => {
it.each(
[
GlobalRouterStoreTestParentComponent,
GlobalRouterStoreTestChildComponent,
GlobalRouterStoreTestGrandchildComponent,
].map((RoutedComponent) => ({ RoutedComponent }))
)(
` And ${RouterStore.name} is injected at $RoutedComponent.name
When the ${GlobalRouterStoreTestGrandchildComponent.name} route is activated
Then route data for the ${GlobalRouterStoreTestGrandchildComponent.name} route is emitted
And componentless route data before the ${GlobalRouterStoreTestGrandchildComponent.name} is emitted
And route data for the ${GlobalRouterStoreTestChildComponent.name} route is emitted
And componentless route data before the ${GlobalRouterStoreTestChildComponent.name} is emitted
And route data for the ${GlobalRouterStoreTestParentComponent.name} route is emitted
And componentless route data before the ${GlobalRouterStoreTestParentComponent.name} is emitted`,
async ({ RoutedComponent }) => {
expect.assertions(3);
const { componentStore, ngrxRouterStore, ngrxStore, routerStore } =
await globalRouterStoreSetup({
navigateTo: '/parent/child/grandchild',
paramsInheritanceStrategy,
RoutedComponent,
routes,
});

const expectedRouteData: MinimalRouteData = {
componentlessBeforeParent:
'componentless-route-data-before-parent',
parent: 'parent-route-data',
componentlessBeforeChild: 'componentless-route-data-before-child',
child: 'child-route-data',
componentlessBeforeGrandchild:
'componentless-route-data-before-grandchild',
grandchild: 'grandchild-route-data',
shadowed: 'grandchild-route-data',
};
await expect(
firstValueFrom(routerStore.routeData$)
).resolves.toEqual(expectedRouteData);
await expect(
firstValueFrom(ngrxStore.select(ngrxRouterStore.selectRouteData))
).resolves.toEqual(expectedRouteData);
await expect(
firstValueFrom(
componentStore.select({
componentlessBeforeParent: routerStore.selectRouteData(
'componentlessBeforeParent'
),
parent: routerStore.selectRouteData('parent'),
componentlessBeforeChild: routerStore.selectRouteData(
'componentlessBeforeChild'
),
child: routerStore.selectRouteData('child'),
componentlessBeforeGrandchild: routerStore.selectRouteData(
'componentlessBeforeGrandchild'
),
grandchild: routerStore.selectRouteData('grandchild'),
shadowed: routerStore.selectRouteData('shadowed'),
})
)
).resolves.toEqual(expectedRouteData);
}
);

it.each(
[
GlobalRouterStoreTestParentComponent,
GlobalRouterStoreTestChildComponent,
].map((RoutedComponent) => ({
RoutedComponent,
}))
)(
` And ${RouterStore.name} is injected at $RoutedComponent.name
When the ${GlobalRouterStoreTestChildComponent.name} route is activated
Then componentless route data before the ${GlobalRouterStoreTestGrandchildComponent.name} is emitted
And route data for the ${GlobalRouterStoreTestChildComponent.name} route is emitted
And componentless route data before the ${GlobalRouterStoreTestChildComponent.name} is emitted
And route data for the ${GlobalRouterStoreTestParentComponent.name} route is emitted
And componentless route data before the ${GlobalRouterStoreTestParentComponent.name} is emitted`,
async ({ RoutedComponent }) => {
expect.assertions(3);
const { componentStore, ngrxRouterStore, ngrxStore, routerStore } =
await globalRouterStoreSetup({
navigateTo: '/parent/child',
paramsInheritanceStrategy,
RoutedComponent,
routes,
});

const expectedRouteData: MinimalRouteData = {
componentlessBeforeParent:
'componentless-route-data-before-parent',
parent: 'parent-route-data',
componentlessBeforeChild: 'componentless-route-data-before-child',
child: 'child-route-data',
componentlessBeforeGrandchild:
'componentless-route-data-before-grandchild',
shadowed: 'componentless-route-data-before-grandchild',
};
await expect(
firstValueFrom(routerStore.routeData$)
).resolves.toEqual(expectedRouteData);
await expect(
firstValueFrom(ngrxStore.select(ngrxRouterStore.selectRouteData))
).resolves.toEqual(expectedRouteData);
await expect(
firstValueFrom(
componentStore.select({
componentlessBeforeParent: routerStore.selectRouteData(
'componentlessBeforeParent'
),
parent: routerStore.selectRouteData('parent'),
componentlessBeforeChild: routerStore.selectRouteData(
'componentlessBeforeChild'
),
child: routerStore.selectRouteData('child'),
componentlessBeforeGrandchild: routerStore.selectRouteData(
'componentlessBeforeGrandchild'
),
shadowed: routerStore.selectRouteData('shadowed'),
})
)
).resolves.toEqual(expectedRouteData);
}
);

it(` And ${RouterStore.name} is injected at ${GlobalRouterStoreTestParentComponent.name}
When the ${GlobalRouterStoreTestParentComponent.name} route is activated
Then componentless route data before the ${GlobalRouterStoreTestChildComponent.name} is emitted
And route data for the ${GlobalRouterStoreTestParentComponent.name} route is emitted
And componentless route data before the ${GlobalRouterStoreTestParentComponent.name} is emitted`, async () => {
expect.assertions(3);
const { componentStore, ngrxRouterStore, ngrxStore, routerStore } =
await globalRouterStoreSetup({
navigateTo: '/parent',
paramsInheritanceStrategy,
RoutedComponent: GlobalRouterStoreTestParentComponent,
routes,
});

const expectedRouteData: MinimalRouteData = {
componentlessBeforeParent: 'componentless-route-data-before-parent',
parent: 'parent-route-data',
componentlessBeforeChild: 'componentless-route-data-before-child',
shadowed: 'componentless-route-data-before-child',
};
await expect(firstValueFrom(routerStore.routeData$)).resolves.toEqual(
expectedRouteData
);
await expect(
firstValueFrom(ngrxStore.select(ngrxRouterStore.selectRouteData))
).resolves.toEqual(expectedRouteData);
await expect(
firstValueFrom(
componentStore.select({
componentlessBeforeParent: routerStore.selectRouteData(
'componentlessBeforeParent'
),
parent: routerStore.selectRouteData('parent'),
componentlessBeforeChild: routerStore.selectRouteData(
'componentlessBeforeChild'
),
shadowed: routerStore.selectRouteData('shadowed'),
})
)
).resolves.toEqual(expectedRouteData);
});
}
);
});
});
Loading
Loading