Merge branch 'master' into fix-page-not-found

- Add titleI18n data to AlertIntegrationComponent route
- Remove unnecessary empty line in app-data.json
- Update BulletinComponent route to use correct titleI18n

web-app/src/app/routes/alert/alert-routing.module.ts

@@ -36,7 +36,7 @@ const routes: Routes = [
   { path: 'silence', component: AlertSilenceComponent },
   { path: 'group', component: AlertGroupConvergeComponent },
   { path: 'inhibit', component: AlertInhibitComponent },
-  { path: 'integration/:source', component: AlertIntegrationComponent }
+  { path: 'integration/:source', component: AlertIntegrationComponent, data: { titleI18n: 'menu.alert.integration' } }
 ];
 
 @NgModule({

web-app/src/app/routes/routes-routing.module.ts

@@ -20,7 +20,7 @@ const routes: Routes = [
     children: [
       { path: '', redirectTo: 'dashboard', pathMatch: 'full' },
       { path: 'dashboard', component: DashboardComponent, data: { titleI18n: 'menu.dashboard' } },
-      { path: 'bulletin', component: BulletinComponent, data: { titleI18n: 'menu.dashboard' } },
+      { path: 'bulletin', component: BulletinComponent, data: { titleI18n: 'menu.monitor.bulletin' } },
       { path: 'exception', loadChildren: () => import('./exception/exception.module').then(m => m.ExceptionModule) },
       { path: 'monitors', loadChildren: () => import('./monitor/monitor.module').then(m => m.MonitorModule) },
       { path: 'alert', loadChildren: () => import('./alert/alert.module').then(m => m.AlertModule) },

web-app/src/assets/app-data.json

@@ -148,7 +148,6 @@
           "icon": "anticon-calculator",
           "link": "/alert/setting"
         },
-
         {
           "text": "Integration",
           "i18n": "menu.alert.integration",