From 42a6b73e7f8a5f2e9a5eda21905cb5d33d402e63 Mon Sep 17 00:00:00 2001
From: christophercr <christophercr@gmail.com>
Date: Mon, 8 Oct 2018 10:58:38 +0200
Subject: [PATCH] feat(stark-ui): integrate translation support in AppMenu
 component

ISSUES CLOSED: #755
---
 .../components/app-menu-config.intf.ts        |  8 +++++
 .../components/app-menu-entry.intf.ts         | 28 ++++++++++++++++
 .../components/app-menu-group.intf.ts         |  3 ++
 .../components/app-menu-item.component.html   | 18 +++++++---
 .../components/app-menu-item.component.ts     |  2 +-
 .../components/app-menu-section.intf.ts       |  9 +++++
 .../components/app-menu.component.html        |  6 ++--
 .../components/app-menu.component.spec.ts     |  4 +--
 .../app-menu/components/app-menu.component.ts | 33 ++++++++++++-------
 .../components/app-sidebar.component.spec.ts  |  4 +--
 .../components/breadcrumb.component.spec.ts   |  3 +-
 .../date-range-picker.component.spec.ts       |  2 +-
 .../components/date-range-picker.component.ts |  2 +-
 showcase/src/app/app.component.html           |  2 +-
 .../app/demo/menu/demo-menu.component.html    |  4 +--
 .../src/assets/examples/menu/sections.html    |  2 +-
 showcase/src/assets/examples/menu/simple.html |  2 +-
 starter/src/app/app.component.html            |  2 +-
 18 files changed, 101 insertions(+), 33 deletions(-)

diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu-config.intf.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu-config.intf.ts
index c83169ef6f..251cd2c860 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu-config.intf.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu-config.intf.ts
@@ -1,9 +1,17 @@
 import { StarkMenuGroup } from "./app-menu-group.intf";
 import { StarkMenuSection } from "./app-menu-section.intf";
+
 /**
  * StarkMenuConfig interface
  */
 export interface StarkMenuConfig {
+	/**
+	 * Array of menu groups to include in the menu.
+	 */
 	menuGroups?: StarkMenuGroup[];
+
+	/**
+	 * Array of menu sections to include in the menu. The menu sections provide a way to group a set of menu groups.
+	 */
 	menuSections?: StarkMenuSection[];
 }
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu-entry.intf.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu-entry.intf.ts
index 3cc8964382..c684c98b0f 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu-entry.intf.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu-entry.intf.ts
@@ -2,11 +2,39 @@
  * StarkMenuEntry interface
  */
 export interface StarkMenuEntry {
+	/**
+	 * Id of the container of the menu group/entry
+	 */
 	id: string;
+
+	/**
+	 * Icon to display next to the menu group/entry label.
+	 */
 	icon?: string;
+
+	/**
+	 * Text to be displayed as the label in the header of the menu group/entry
+	 * (dynamically translated via the Translate service if the provided text is defined in the translation keys).
+	 */
 	label: string;
+
+	/**
+	 * Whether the menu group/entry should be visible or not.
+	 */
 	isVisible: boolean;
+
+	/**
+	 * Whether the menu group/entry should be enabled for user interaction or not.
+	 */
 	isEnabled: boolean;
+
+	/**
+	 * Name of the Router state that will be navigated to when the header of the menu group/entry is clicked.
+	 */
 	targetState?: string;
+
+	/**
+	 * Params object to be passed to the Router state defined as targetState.
+	 */
 	targetStateParams?: { [param: string]: any };
 }
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu-group.intf.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu-group.intf.ts
index a00dd84ede..081ffae489 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu-group.intf.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu-group.intf.ts
@@ -4,5 +4,8 @@ import { StarkMenuEntry } from "./app-menu-entry.intf";
  * StarkMenuGroup interface
  */
 export interface StarkMenuGroup extends StarkMenuEntry {
+	/**
+	 * Array of entries described by StarkMenuGroup objects
+	 */
 	entries?: StarkMenuGroup[];
 }
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.html b/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.html
index 169a8c35fe..47d6d4436e 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.html
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.html
@@ -1,9 +1,19 @@
-<mat-list-item *ngIf="menuGroup.isVisible" [id]="menuGroup.id" [ngClass]="'stark-app-menu-item-level-'+level.toString()" [class.active]="isActive" [class.stark-disabled]="!menuGroup.isEnabled" [disableRipple]="!menuGroup.isEnabled" (click)="onClick()">
-	<mat-icon *ngIf="menuGroup.icon" [color]="isActive?'primary':''" starkSvgViewBox [svgIcon]="menuGroup.icon" class="stark-small-icon"></mat-icon>
-	<span matLine>{{ menuGroup.label }}</span>
+<mat-list-item *ngIf="menuGroup.isVisible"
+			   [id]="menuGroup.id"
+			   [ngClass]="'stark-app-menu-item-level-'+level.toString()"
+			   [class.active]="isActive" [class.stark-disabled]="!menuGroup.isEnabled"
+			   [disableRipple]="!menuGroup.isEnabled" (click)="onClick()">
+	<mat-icon *ngIf="menuGroup.icon"
+			  [color]="isActive ? 'primary' : ''"
+			  starkSvgViewBox [svgIcon]="menuGroup.icon"
+			  class="stark-small-icon"></mat-icon>
+	<span matLine translate>{{ menuGroup.label }}</span>
 </mat-list-item>
 <mat-expansion-panel *ngIf="menuGroup.entries" #menuGroupsPanel>
 	<mat-nav-list>
-		<stark-app-menu-item *ngFor="let entry of menuGroup.entries; trackBy: trackMenuItem" [level]="level+1" [menuGroup]="entry" (activated)="onActivate()" (deactivated)="onDeactivate()"></stark-app-menu-item>
+		<stark-app-menu-item *ngFor="let entry of menuGroup.entries; trackBy: trackMenuItem"
+							 [level]="level+1"
+							 [menuGroup]="entry" (activated)="onActivate()"
+							 (deactivated)="onDeactivate()"></stark-app-menu-item>
 	</mat-nav-list>
 </mat-expansion-panel>
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.ts
index b268127fd6..eab8681994 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu-item.component.ts
@@ -20,7 +20,7 @@ import {
 	StarkRoutingService,
 	StarkRoutingTransitionHook
 } from "@nationalbankbelgium/stark-core";
-import { AbstractStarkUiComponent } from "./../../../common/classes/abstract-component";
+import { AbstractStarkUiComponent } from "../../../common/classes/abstract-component";
 import { StarkMenuGroup } from "./app-menu-group.intf";
 
 /**
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu-section.intf.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu-section.intf.ts
index 1f4490bb50..ef3b20ce8a 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu-section.intf.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu-section.intf.ts
@@ -1,8 +1,17 @@
 import { StarkMenuGroup } from "./app-menu-group.intf";
+
 /**
  * StarkMenuSection interface
  */
 export interface StarkMenuSection {
+	/**
+	 * Text to be displayed as the label in the header of the menu section
+	 * (dynamically translated via the Translate service if the provided text is defined in the translation keys).
+	 */
 	label: string;
+
+	/**
+	 * Array of menu groups to include in this section.
+	 */
 	menuGroups: StarkMenuGroup[];
 }
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu.component.html b/packages/stark-ui/src/modules/app-menu/components/app-menu.component.html
index 1f5eef9507..9123b6fd93 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu.component.html
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu.component.html
@@ -1,14 +1,14 @@
 <nav>
 	<ng-container *ngIf="hasSections">
-		<section *ngFor="let section of parentMenuConfig.menuSections; trackBy: trackSection">
-			<h2 class="stark-section-title">{{ section.label }}</h2>
+		<section *ngFor="let section of menuConfig.menuSections; trackBy: trackSection">
+			<h2 class="stark-section-title" translate>{{ section.label }}</h2>
 			<mat-nav-list *ngFor="let menuGroup of section.menuGroups">
 				<stark-app-menu-item [level]="1" [menuGroup]="menuGroup"></stark-app-menu-item>
 			</mat-nav-list>
 		</section>
 	</ng-container>
 	<ng-container *ngIf="!hasSections">
-		<mat-nav-list *ngFor="let menuGroup of parentMenuConfig.menuGroups">
+		<mat-nav-list *ngFor="let menuGroup of menuConfig.menuGroups; trackBy: trackMenuGroup">
 			<stark-app-menu-item [level]="1" [menuGroup]="menuGroup"></stark-app-menu-item>
 		</mat-nav-list>
 	</ng-container>
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu.component.spec.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu.component.spec.ts
index 0a3b0bcdeb..925d4f42d3 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu.component.spec.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu.component.spec.ts
@@ -42,8 +42,8 @@ describe("StarkAppMenuComponent", () => {
 	});
 
 	describe("sections", () => {
-		it("should have a section when menuSections property of parentMenuConfig is set", () => {
-			component.parentMenuConfig = {
+		it("should have a section when menuSections property of menuConfig is set", () => {
+			component.menuConfig = {
 				menuSections: [
 					{
 						label: "Section",
diff --git a/packages/stark-ui/src/modules/app-menu/components/app-menu.component.ts b/packages/stark-ui/src/modules/app-menu/components/app-menu.component.ts
index 7041d3889e..ef445c1698 100644
--- a/packages/stark-ui/src/modules/app-menu/components/app-menu.component.ts
+++ b/packages/stark-ui/src/modules/app-menu/components/app-menu.component.ts
@@ -1,8 +1,9 @@
 import { Component, Inject, Input, OnInit, ViewEncapsulation, ElementRef, Renderer2 } from "@angular/core";
 import { STARK_LOGGING_SERVICE, STARK_ROUTING_SERVICE, StarkLoggingService, StarkRoutingService } from "@nationalbankbelgium/stark-core";
-import { AbstractStarkUiComponent } from "./../../../common/classes/abstract-component";
+import { AbstractStarkUiComponent } from "../../../common/classes/abstract-component";
 import { StarkMenuSection } from "./app-menu-section.intf";
 import { StarkMenuConfig } from "./app-menu-config.intf";
+import { StarkMenuGroup } from "./app-menu-group.intf";
 
 /**
  * Name of the component
@@ -22,20 +23,21 @@ const componentName: string = "stark-app-menu";
 })
 export class StarkAppMenuComponent extends AbstractStarkUiComponent implements OnInit {
 	/**
-	 * Configuration of the component
+	 * @internal
+	 * @ignore
+	 */
+	private _menuConfig: StarkMenuConfig;
+
+	/**
+	 * Configuration of the menu
 	 */
-	private _parentMenuConfig: StarkMenuConfig;
 	@Input()
-	public set parentMenuConfig(parentMenuConfig: StarkMenuConfig) {
-		this._parentMenuConfig = parentMenuConfig;
-		if (this._parentMenuConfig.hasOwnProperty("menuSections")) {
-			this.hasSections = true;
-		} else {
-			this.hasSections = false;
-		}
+	public set menuConfig(menuConfig: StarkMenuConfig) {
+		this._menuConfig = menuConfig;
+		this.hasSections = this._menuConfig.hasOwnProperty("menuSections");
 	}
-	public get parentMenuConfig(): StarkMenuConfig {
-		return this._parentMenuConfig;
+	public get menuConfig(): StarkMenuConfig {
+		return this._menuConfig;
 	}
 
 	/**
@@ -73,4 +75,11 @@ export class StarkAppMenuComponent extends AbstractStarkUiComponent implements O
 	public trackSection(index: number, _section: StarkMenuSection): number {
 		return index;
 	}
+
+	/**
+	 * @ignore
+	 */
+	public trackMenuGroup(index: number, _menuGroup: StarkMenuGroup): number {
+		return index;
+	}
 }
diff --git a/packages/stark-ui/src/modules/app-sidebar/components/app-sidebar.component.spec.ts b/packages/stark-ui/src/modules/app-sidebar/components/app-sidebar.component.spec.ts
index 3d4edd3ff1..31e9c09745 100644
--- a/packages/stark-ui/src/modules/app-sidebar/components/app-sidebar.component.spec.ts
+++ b/packages/stark-ui/src/modules/app-sidebar/components/app-sidebar.component.spec.ts
@@ -5,8 +5,8 @@ import { MatSidenavModule } from "@angular/material/sidenav";
 import { STARK_LOGGING_SERVICE } from "@nationalbankbelgium/stark-core";
 import { MockStarkLoggingService } from "@nationalbankbelgium/stark-core/testing";
 import { StarkAppSidebarComponent } from "./app-sidebar.component";
-import { MockAppSidebarService } from "./../testing/app-sidebar.mock";
-import { STARK_APP_SIDEBAR_SERVICE } from "./../services/app-sidebar.service.intf";
+import { MockAppSidebarService } from "../testing/app-sidebar.mock";
+import { STARK_APP_SIDEBAR_SERVICE } from "../services/app-sidebar.service.intf";
 import { BreakpointState } from "@angular/cdk/layout";
 
 describe("AppSidebarComponent", () => {
diff --git a/packages/stark-ui/src/modules/breadcrumb/components/breadcrumb.component.spec.ts b/packages/stark-ui/src/modules/breadcrumb/components/breadcrumb.component.spec.ts
index 984c1ace2a..2baad1b89f 100644
--- a/packages/stark-ui/src/modules/breadcrumb/components/breadcrumb.component.spec.ts
+++ b/packages/stark-ui/src/modules/breadcrumb/components/breadcrumb.component.spec.ts
@@ -10,7 +10,8 @@ import { TranslateModule } from "@ngx-translate/core";
 import { MockStarkRoutingService, MockStarkLoggingService } from "@nationalbankbelgium/stark-core/testing";
 import { By } from "@angular/platform-browser";
 import Spy = jasmine.Spy;
-import { StarkBreadcrumbPath } from "@nationalbankbelgium/stark-ui";
+import { StarkBreadcrumbPath } from "./breadcrumb-path.intf";
+
 @Component({
 	selector: `host-component`,
 	template: `<stark-breadcrumb
diff --git a/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.spec.ts b/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.spec.ts
index 511fc48996..1d3e68800b 100644
--- a/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.spec.ts
+++ b/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.spec.ts
@@ -6,7 +6,7 @@ import { MAT_MOMENT_DATE_FORMATS, MomentDateAdapter } from "@angular/material-mo
 import { TranslateModule, TranslateService } from "@ngx-translate/core";
 import { STARK_LOGGING_SERVICE, STARK_ROUTING_SERVICE } from "@nationalbankbelgium/stark-core";
 import { MockStarkLoggingService, MockStarkRoutingService } from "@nationalbankbelgium/stark-core/testing";
-import { StarkDatePickerModule } from "./../../date-picker";
+import { StarkDatePickerModule } from "../../date-picker";
 import { StarkDateRangePickerComponent } from "./date-range-picker.component";
 import { StarkDateRangePickerEvent } from "./date-range-picker-event.intf";
 
diff --git a/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.ts b/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.ts
index e9a4c02ee6..e40c97dc92 100644
--- a/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.ts
+++ b/packages/stark-ui/src/modules/date-range-picker/components/date-range-picker.component.ts
@@ -1,7 +1,7 @@
 import { Component, ElementRef, EventEmitter, Inject, Input, OnInit, Output, Renderer2, ViewChild, ViewEncapsulation } from "@angular/core";
 import { STARK_LOGGING_SERVICE, StarkLoggingService } from "@nationalbankbelgium/stark-core";
 import moment from "moment";
-import { StarkDatePickerFilter, StarkDatePickerComponent } from "./../../date-picker/components/date-picker.component";
+import { StarkDatePickerFilter, StarkDatePickerComponent } from "../../date-picker/components/date-picker.component";
 import { AbstractStarkUiComponent } from "../../../common/classes/abstract-component";
 import { StarkDateRangePickerEvent } from "./date-range-picker-event.intf";
 
diff --git a/showcase/src/app/app.component.html b/showcase/src/app/app.component.html
index ae662eccf7..36142cd178 100644
--- a/showcase/src/app/app.component.html
+++ b/showcase/src/app/app.component.html
@@ -2,7 +2,7 @@
 	<stark-app-sidebar>
 		<ng-container stark-app-sidenav-menu>
 			<stark-app-logo></stark-app-logo>
-			<stark-app-menu [parentMenuConfig]="mainMenu"></stark-app-menu>
+			<stark-app-menu [menuConfig]="mainMenu"></stark-app-menu>
 		</ng-container>
 		<ng-container stark-app-sidenav-left>
 			<div class="stark-app-sidenav-top m1 center">
diff --git a/showcase/src/app/demo/menu/demo-menu.component.html b/showcase/src/app/demo/menu/demo-menu.component.html
index 4f58f4fd12..d4dd993063 100644
--- a/showcase/src/app/demo/menu/demo-menu.component.html
+++ b/showcase/src/app/demo/menu/demo-menu.component.html
@@ -2,14 +2,14 @@ <h1 class="mat-display-2" translate>SHOWCASE.DEMO.MENU.TITLE</h1>
 <section class="stark-section">
 	<example-viewer [extensions]="['HTML', 'TS']" filesPath="menu/sections" exampleTitle="SHOWCASE.DEMO.MENU.SECTIONS">
 		<div fxLayout fxLayoutAlign="center">
-			<stark-app-menu fxFlex="250px" [parentMenuConfig]="menuWithSections"></stark-app-menu>
+			<stark-app-menu fxFlex="250px" [menuConfig]="menuWithSections"></stark-app-menu>
 		</div>
 	</example-viewer>
 </section>
 <section class="stark-section">
 	<example-viewer [extensions]="['HTML', 'TS']" filesPath="menu/simple" exampleTitle="SHOWCASE.DEMO.MENU.SIMPLE">
 		<div fxLayout fxLayoutAlign="center">
-			<stark-app-menu fxFlex="250px" [parentMenuConfig]="simpleMenu"></stark-app-menu>
+			<stark-app-menu fxFlex="250px" [menuConfig]="simpleMenu"></stark-app-menu>
 		</div>
 	</example-viewer>
 </section>
diff --git a/showcase/src/assets/examples/menu/sections.html b/showcase/src/assets/examples/menu/sections.html
index bc6ff347ef..4203bd044f 100644
--- a/showcase/src/assets/examples/menu/sections.html
+++ b/showcase/src/assets/examples/menu/sections.html
@@ -1 +1 @@
-<stark-app-menu [parentMenuConfig]="menuWithSections"></stark-app-menu>
\ No newline at end of file
+<stark-app-menu [menuConfig]="menuWithSections"></stark-app-menu>
diff --git a/showcase/src/assets/examples/menu/simple.html b/showcase/src/assets/examples/menu/simple.html
index 4dbbad3059..08c917d355 100644
--- a/showcase/src/assets/examples/menu/simple.html
+++ b/showcase/src/assets/examples/menu/simple.html
@@ -1 +1 @@
-<stark-app-menu [parentMenuConfig]="simpleMenu"></stark-app-menu>
\ No newline at end of file
+<stark-app-menu [menuConfig]="simpleMenu"></stark-app-menu>
diff --git a/starter/src/app/app.component.html b/starter/src/app/app.component.html
index f32384d65d..5d82b16ad3 100644
--- a/starter/src/app/app.component.html
+++ b/starter/src/app/app.component.html
@@ -2,7 +2,7 @@
 	<stark-app-sidebar>
 		<ng-container stark-app-sidenav-menu>
 			<stark-app-logo></stark-app-logo>
-			<stark-app-menu [parentMenuConfig]="mainMenu"></stark-app-menu>
+			<stark-app-menu [menuConfig]="mainMenu"></stark-app-menu>
 		</ng-container>
 		<div stark-app-sidenav-content>
 			<header class="stark-app-header">