Merge branch 'master' into master

Author: Akshat55

src/ui-shell/ui-shell.stories.ts

@@ -19,19 +19,16 @@ export default {
 	decorators: [
 		applicationConfig({
 			providers: [
-				importProvidersFrom(RouterModule.forRoot(
-					[
-						{
-							path: "bar",
-							component: BarComponent
-						},
-						{
-							path: "foo",
-							component: FooComponent
-						}
-					],
-					{ useHash: true }
-				))
+				importProvidersFrom(RouterModule.forRoot([
+					{
+						path: "bar",
+						component: BarComponent
+					},
+					{
+						path: "foo",
+						component: FooComponent
+					}
+				], { useHash: true }))
 			]
 		}),
 		moduleMetadata({
@@ -200,10 +197,10 @@ const HeaderWithTemplate = (args) => ({
 });
 export const HeaderWithTemp = HeaderWithTemplate.bind({});
 HeaderWithTemp.storyName = "Header with template";
-Header.args = {
+HeaderWithTemp.args = {
 	hasHamburger: true
 };
-Header.argTypes = {
+HeaderWithTemp.argTypes = {
 	expanded: {
 		action: "Menu clicked!"
 	}
@@ -232,7 +229,7 @@ const HeaderRouterTemplate = (args) => ({
 	`
 });
 export const HeaderWithRouter = HeaderRouterTemplate.bind({});
-Header.argTypes = {
+HeaderWithRouter.argTypes = {
 	expanded: {
 		action: "Menu clicked!"
 	}
@@ -304,7 +301,7 @@ const SideNavigationRouterTemplate = (args) => ({
 				</cds-sidenav-menu>
 			</cds-sidenav>
 		</div>
-		<div>
+		<div style="margin-left: 18rem">
 			<router-outlet></router-outlet>
 		</div>
 	`
@@ -569,7 +566,7 @@ const ModelTemplate = (args) => ({
 	`
 });
 export const WithModel = ModelTemplate.bind({});
-SideNavigationRail.args = {
+WithModel.args = {
 	options: [
 		{
 			content: "Option 1",
@@ -617,7 +614,7 @@ SideNavigationRail.args = {
 		]
 	}]
 };
-SideNavigationRail.argTypes = {
+WithModel.argTypes = {
 	options: {
 		control: false
 	},