From c836349ccadffba277a1e851ea16015bd7f2cd8c Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 13 Sep 2019 10:19:32 +0300
Subject: [PATCH] refactor(setting-management): remove unneccessary codes

---
 .../components/setting-layout.component.html   |  2 --
 .../lib/components/setting-layout.component.ts |  8 --------
 .../lib/services/setting-management.service.ts | 18 +++---------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.html b/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.html
index 8465f75e65..379e368e9d 100644
--- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.html
+++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.html
@@ -47,8 +47,6 @@
               [id]="settingManagementService.selected.name + '-tab'"
               role="tabpanel"
             >
-              <h2>{{ settingManagementService.selected.name | abpLocalization }}</h2>
-              <hr class="my-4" />
               <router-outlet></router-outlet>
             </div>
           </div>
diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.ts b/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.ts
index 3096a2104b..1c9d702a01 100644
--- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.ts
+++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-layout.component.ts
@@ -26,12 +26,4 @@ export class SettingLayoutComponent {
   }
 
   ngOnDestroy() {}
-
-  ngAfterViewInit() {
-    timer(250).subscribe(() => {
-      if (!this.settingManagementService.settings.length) {
-        this.settingManagementService.setSettings();
-      }
-    });
-  }
 }
diff --git a/npm/ng-packs/packages/setting-management/src/lib/services/setting-management.service.ts b/npm/ng-packs/packages/setting-management/src/lib/services/setting-management.service.ts
index 9ca9199e68..e04019e3c3 100644
--- a/npm/ng-packs/packages/setting-management/src/lib/services/setting-management.service.ts
+++ b/npm/ng-packs/packages/setting-management/src/lib/services/setting-management.service.ts
@@ -15,21 +15,9 @@ export class SettingManagementService {
   private destroy$ = new Subject();
 
   constructor(private router: Router, private store: Store) {
-    let timeout: Subscription;
-    this.router.events
-      .pipe(
-        filter(event => event instanceof RouteConfigLoadEnd),
-        takeUntil(this.destroy$),
-      )
-      .subscribe(event => {
-        if (timeout) {
-          timeout.unsubscribe();
-          this.destroy$.next();
-        }
-        timeout = timer(150).subscribe(() => {
-          this.setSettings();
-        });
-      });
+    setTimeout(() => {
+      this.setSettings();
+    }, 0);
   }
 
   ngOnDestroy() {