[#noissue] Provide a different query-period for metric page

ga-ram · Oct 11, 2022 · 6454e6e · 6454e6e
1 parent 9f1bd6b
commit 6454e6e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.../core/components/host-group-and-host-list/host-group-and-host-list-container.component.ts b/.../core/components/host-group-and-host-list/host-group-and-host-list-container.component.ts
@@ -47,11 +47,10 @@ export class HostGroupAndHostListContainerComponent implements OnInit, OnDestroy
         private translateReplaceService: TranslateReplaceService,
     ) {}
 
-    // TODO: Add search input box
     ngOnInit() {
         this.initI18nText();
         this.newUrlStateNotificationService.onUrlStateChange$.pipe(
-            filter((urlService: NewUrlStateNotificationService) => urlService.hasValue(UrlPathId.HOST_GROUP) && urlService.isValueChanged(UrlPathId.HOST_GROUP)),
+            filter((urlService: NewUrlStateNotificationService) => urlService.hasValue(UrlPathId.HOST_GROUP) && (urlService.isValueChanged(UrlPathId.HOST_GROUP) || !urlService.hasValue(UrlPathId.HOST))),
             map((urlService: NewUrlStateNotificationService) => urlService.getPathValue(UrlPathId.HOST_GROUP)),
             tap((hostGroup: string) => this.selectedHostGroup = hostGroup),
             switchMap((hostGroup: string) => this.hostGroupAndHostListDataService.getHostList(hostGroup).pipe(

diff --git a/...in/angular/src/app/core/components/period-selector/period-selector-container.component.ts b/...in/angular/src/app/core/components/period-selector/period-selector-container.component.ts
@@ -32,7 +32,7 @@ export class PeriodSelectorContainerComponent implements OnInit, OnDestroy {
     hiddenComponent: boolean;
     selectedPeriod: Period;
     selectedEndTime: EndTime;
-    periodList: Array<Period>;
+    periodList: Period[];
     maxPeriod: number;
     isRealTimeMode: boolean;
     showRealTimeButton: boolean;

diff --git a/web/src/main/angular/src/app/shared/components/url-redirector/url-redirector.component.ts b/web/src/main/angular/src/app/shared/components/url-redirector/url-redirector.component.ts
@@ -18,11 +18,12 @@ export class UrlRedirectorComponent {
         // RouteInfoCollectorService를 통해 초기화 되는 UrlStateNotifactionService 의 URL 초기화 정보를 사용하면 안됨.
         this.activatedRoute.data.subscribe((urlData: any) => {
             const params = this.getUrlParams();
+
             if (params.period) {
                 this.urlRouteManagerService.move({
                     url: [
                         urlData['path'] || params.startPath,
-                        params.application,
+                        params.application || params.hostGroup,
                         params.period
                     ],
                     needServerTimeRequest: true
@@ -31,7 +32,7 @@ export class UrlRedirectorComponent {
                 this.urlRouteManagerService.move({
                     url: [
                         urlData['path'] || params.startPath,
-                        params.application,
+                        params.application || params.hostGroup,
                         this.webAppSettingDataService.getUserDefaultPeriod().getValueWithTime()
                     ],
                     needServerTimeRequest: true

diff --git a/web/src/main/angular/src/app/shared/services/component-default-setting-data.service.ts b/web/src/main/angular/src/app/shared/services/component-default-setting-data.service.ts
@@ -40,6 +40,16 @@ export class ComponentDefaultSettingDataService {
         ],
         [UrlPath.TRANSACTION_VIEW]: [
             new Period(20),
+        ],
+        [UrlPath.METRIC]: [
+            new Period(5, 'Last'),
+            new Period(20),
+            new Period(60),
+            new Period(720),
+            new Period(1440),
+            new Period(10080),
+            new Period(20160),
+            new Period(40320),
         ]
     };
     private maxPeriodTime = 60 * 24 * 2; // 2day