[#5470] Redesign the router for realtime

pinpoint-apm · Apr 22, 2019 · 712e604 · 712e604
1 parent f53656e
commit 712e604
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 103 deletions.
diff --git a/...main/webapp/v2/src/app/core/components/scatter-chart/scatter-chart-container.component.ts b/...main/webapp/v2/src/app/core/components/scatter-chart/scatter-chart-container.component.ts
@@ -231,8 +231,9 @@ export class ScatterChartContainerComponent implements OnInit, OnDestroy {
  } else {
  this.urlRouteManagerService.openPage([
  UrlPath.SCATTER_FULL_SCREEN_MODE,
+ UrlPathId.REAL_TIME,
  this.newUrlStateNotificationService.getPathValue(UrlPathId.APPLICATION).getUrlStr(),
- UrlPathId.REAL_TIME
+ this.selectedAgent
  ]);
  }
  }

diff --git a/web/src/main/webapp/v2/src/app/routes/inspector-page/inspector-page.routing.ts b/web/src/main/webapp/v2/src/app/routes/inspector-page/inspector-page.routing.ts
@@ -6,44 +6,91 @@ import { AgentInspectorContentsContainerComponent } from 'app/core/components/ag
 import { EmptyInspectorContentsContainerComponent } from 'app/core/components/empty-inspector-contents/empty-inspector-contents-container.component';
 import { UrlRedirectorComponent } from 'app/shared/components/url-redirector/url-redirector.component';
 import { InspectorPageComponent } from './inspector-page.component';
+import { ServerTimeResolverService } from 'app/shared/services';
 
 export const routing: Routes = [
  {
  path: '',
  component: InspectorPageComponent,
  children: [
  {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD + '/:' + UrlPathId.END_TIME + '/:' + UrlPathId.AGENT_ID,
- data: {
- showRealTimeButton: false,
- enableRealTimeMode: false
- },
- component: AgentInspectorContentsContainerComponent
- },
- {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD + '/:' + UrlPathId.END_TIME,
- data: {
- showRealTimeButton: false,
- enableRealTimeMode: false
- },
- component: ApplicationInspectorContentsContainerComponent
- },
- {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD,
- data: {
- path: UrlPath.INSPECTOR
- },
- component: UrlRedirectorComponent
+ path: UrlPath.REAL_TIME,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ redirectTo: '/' + UrlPath.INSPECTOR
+ },
+ {
+ path: ':' + UrlPathId.APPLICATION,
+ resolve: {
+ serverTime: ServerTimeResolverService
+ },
+ data: {
+ showRealTimeButton: true,
+ enableRealTimeMode: true
+ },
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ component: ApplicationInspectorContentsContainerComponent
+ },
+ {
+ path: ':' + UrlPathId.AGENT_ID,
+ component: AgentInspectorContentsContainerComponent
+ }
+ ]
+ }
+ ]
  },
  {
  path: ':' + UrlPathId.APPLICATION,
- data: {
- path: UrlPath.INSPECTOR
- },
- component: UrlRedirectorComponent
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ data: {
+ path: UrlPath.INSPECTOR
+ },
+ component: UrlRedirectorComponent
+ },
+ {
+ path: ':' + UrlPathId.PERIOD,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ data: {
+ path: UrlPath.INSPECTOR
+ },
+ component: UrlRedirectorComponent
+ },
+ {
+ path: ':' + UrlPathId.END_TIME,
+ data: {
+ showRealTimeButton: true,
+ enableRealTimeMode: false
+ },
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ component: ApplicationInspectorContentsContainerComponent
+ },
+ {
+ path: ':' + UrlPathId.AGENT_ID,
+ component: AgentInspectorContentsContainerComponent
+ }
+ ]
+ }
+ ]
+ }
+ ]
  },
  {
  path: '',
+ pathMatch: 'full',
  component: EmptyInspectorContentsContainerComponent
  }
  ]

diff --git a/web/src/main/webapp/v2/src/app/routes/main-page/main-page.routing.ts b/web/src/main/webapp/v2/src/app/routes/main-page/main-page.routing.ts
@@ -13,47 +13,76 @@ export const routing: Routes = [
  component: MainPageComponent,
  children: [
  {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD + '/:' + UrlPathId.END_TIME,
- data: {
- showRealTimeButton: true,
- enableRealTimeMode: false
- },
- component: MainContentsContainerComponent
+ path: UrlPath.REAL_TIME,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ redirectTo: '/' + UrlPath.MAIN
+ },
+ {
+ path: ':' + UrlPathId.APPLICATION,
+ resolve: {
+ serverTime: ServerTimeResolverService
+ },
+ data: {
+ showRealTimeButton: true,
+ enableRealTimeMode: true
+ },
+ component: MainContentsContainerComponent
+ }
+ ]
  },
+ // ! URL 순서 바꾸면서 사용자들이 기존의 url로 접근했을때 redirect해주려고 임시로 추가해둠.
  {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPath.REAL_TIME,
- resolve: {
- serverTime: ServerTimeResolverService
- },
- data: {
- showRealTimeButton: true,
- enableRealTimeMode: true
- },
- component: MainContentsContainerComponent
- },
- {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD,
- data: {
- path: UrlPath.MAIN
- },
- component: UrlRedirectorComponent
+ path: ':' + UrlPathId.APPLICATION + '/' + UrlPathId.REAL_TIME,
+ pathMatch: 'full',
+ redirectTo: '/' + UrlPath.MAIN + '/' + UrlPath.REAL_TIME + '/:' + UrlPathId.APPLICATION
  },
  {
  path: ':' + UrlPathId.APPLICATION,
- data: {
- path: UrlPath.MAIN
- },
- component: UrlRedirectorComponent
+ children: [
+ // {
+ // path: UrlPath.REAL_TIME,
+ // pathMatch: 'full',
+ // redirectTo: '/' + UrlPath.MAIN + '/' + UrlPath.REAL_TIME + '/:' + UrlPathId.APPLICATION
+ // },
+ {
+ path: '',
+ pathMatch: 'full',
+ data: {
+ path: UrlPath.MAIN
+ },
+ component: UrlRedirectorComponent
+ },
+ {
+ path: ':' + UrlPathId.PERIOD,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ data: {
+ path: UrlPath.MAIN
+ },
+ component: UrlRedirectorComponent
+ },
+ {
+ path: ':' + UrlPathId.END_TIME,
+ data: {
+ showRealTimeButton: true,
+ enableRealTimeMode: false
+ },
+ component: MainContentsContainerComponent
+ }
+ ]
+ }
+ ]
  },
  {
  path: '',
- data: {
- showRealTimeButton: false,
- enableRealTimeMode: false
- },
+ pathMatch: 'full',
  component: EmptyContentsComponent
  }
  ]
  }
 ];
-
diff --git a/.../v2/src/app/routes/scatter-full-screen-mode-page/scatter-full-screen-mode-page.routing.ts b/.../v2/src/app/routes/scatter-full-screen-mode-page/scatter-full-screen-mode-page.routing.ts
@@ -12,50 +12,90 @@ export const routing: Routes = [
  component: ScatterFullScreenModePageComponent,
  children: [
  {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD + '/:' + UrlPathId.END_TIME + '/:' + UrlPathId.AGENT_ID,
- data: {
- showRealTimeButton: true,
- enableRealTimeMode: false
- },
- component: ScatterChartForFullScreenModeContainerComponent
+ path: UrlPath.REAL_TIME,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ redirectTo: '/' + UrlPath.MAIN
+ },
+ {
+ path: ':' + UrlPathId.APPLICATION,
+ resolve: {
+ serverTime: ServerTimeResolverService
+ },
+ data: {
+ showRealTimeButton: true,
+ enableRealTimeMode: true
+ },
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ component: ScatterChartForFullScreenModeContainerComponent
+ },
+ {
+ path: ':' + UrlPathId.AGENT_ID,
+ component: ScatterChartForFullScreenModeContainerComponent
+ }
+ ]
+ }
+ ]
  },
+ // ! URL 순서 바꾸면서 사용자들이 기존의 url로 접근했을때 redirect해주려고 임시로 추가해둠.
  {
  path: ':' + UrlPathId.APPLICATION + '/' + UrlPathId.REAL_TIME,
- resolve: {
- serverTime: ServerTimeResolverService
- },
- data: {
- showRealTimeButton: true,
- enableRealTimeMode: true
- },
- component: ScatterChartForFullScreenModeContainerComponent
- },
- {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD + '/:' + UrlPathId.END_TIME,
- data: {
- showRealTimeButton: true,
- enableRealTimeMode: false
- },
- component: ScatterChartForFullScreenModeContainerComponent
- },
- {
- path: ':' + UrlPathId.APPLICATION + '/:' + UrlPathId.PERIOD,
- data: {
- path: UrlPath.SCATTER_FULL_SCREEN_MODE
- },
- component: UrlRedirectorComponent
+ pathMatch: 'full',
+ redirectTo: '/' + UrlPath.SCATTER_FULL_SCREEN_MODE + '/' + UrlPath.REAL_TIME + '/:' + UrlPathId.APPLICATION,
  },
  {
  path: ':' + UrlPathId.APPLICATION,
- data: {
- path: UrlPath.SCATTER_FULL_SCREEN_MODE
- },
- component: UrlRedirectorComponent
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ data: {
+ path: UrlPath.SCATTER_FULL_SCREEN_MODE
+ },
+ component: UrlRedirectorComponent
+ },
+ {
+ path: ':' + UrlPathId.PERIOD,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ data: {
+ path: UrlPath.SCATTER_FULL_SCREEN_MODE
+ },
+ component: UrlRedirectorComponent
+ },
+ {
+ path: ':' + UrlPathId.END_TIME,
+ data: {
+ showRealTimeButton: true,
+ enableRealTimeMode: false
+ },
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ component: ScatterChartForFullScreenModeContainerComponent
+ },
+ {
+ path: ':' + UrlPathId.AGENT_ID,
+ component: ScatterChartForFullScreenModeContainerComponent
+ }
+ ]
+ }
+ ]
+ }
+ ]
  },
  {
  path: '',
- redirectTo: `/${UrlPath.MAIN}`,
- pathMatch: 'full'
+ pathMatch: 'full',
+ redirectTo: '/' + UrlPath.MAIN
  }
  ]
  }

diff --git a/web/src/main/webapp/v2/src/app/shared/components/url-redirector/url-redirector.component.ts b/web/src/main/webapp/v2/src/app/shared/components/url-redirector/url-redirector.component.ts
@@ -8,7 +8,6 @@ import { WebAppSettingDataService, UrlRouteManagerService } from 'app/shared/ser
  template: ''
 })
 export class UrlRedirectorComponent {
-
  constructor(
  private activatedRoute: ActivatedRoute,
  private webAppSettingDataService: WebAppSettingDataService,

diff --git a/web/src/main/webapp/v2/src/app/shared/services/new-url-state-notification.service.ts b/web/src/main/webapp/v2/src/app/shared/services/new-url-state-notification.service.ts
@@ -150,9 +150,7 @@ export class NewUrlStateNotificationService {
  return this.innerRouteData['serverTime'];
  }
  hasValue(...names: string[]): boolean {
- return names.reduce((previous: boolean, name: string) => {
- return previous && (this.urlState[name].curr === null ? false : true);
- }, true);
+ return names.every((name: string) => this.urlState[name].curr !== null);
  }
  getStartPath(): string {
  return this.startPath || UrlPath.MAIN;