diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts index a34174c..0670a18 100644 --- a/src/app/_modules/layout/header/header.component.ts +++ b/src/app/_modules/layout/header/header.component.ts @@ -3,6 +3,7 @@ import {PagesService} from "@app/_services/pages.service"; import {AuthenticationService, ListsService} from "@app/_services"; import {Router} from "@angular/router"; import {Subscription} from "rxjs"; +import { MenuService } from '@app/_services/menu.service'; @Component({ selector: 'header', @@ -24,7 +25,8 @@ export class HeaderComponent { private router: Router, private pagesService: PagesService, public authenticationService: AuthenticationService, - private listsService: ListsService + private listsService: ListsService, + private menuService: MenuService ) { } @@ -36,13 +38,11 @@ export class HeaderComponent { this.listsService.result('showSettingSite').next(false); } this.controlsSubscriptionMenu = this.listsService.controls('headerMenu').subscribe(controls => { - - this.fetchMenu(); }); this.resultSubscriptionMenu = this.listsService.result('headerMenu').subscribe(res => { this.menuItems = res?.data || []; }); - this.listsService.changed.subscribe(event=>this.fetchMenu()) + this.menuService.setPagesTree() } ngOnDestroy() { @@ -51,14 +51,6 @@ export class HeaderComponent { this.resultSubscriptionMenu?.unsubscribe(); } - - fetchMenu() { - let include = ['children.children.children.children','parents','children.parents']; - this.pagesService.root({include: include.join(',')}).subscribe(res => { - this.menuItems = res.data; - }); - } - settingsSite() { let showSettingSite = localStorage.getItem('showSettingSite'); showSettingSite = showSettingSite === 'yes' ? 'no' : 'yes'; diff --git a/src/app/_modules/objects/form/slider/slider-form.component.ts b/src/app/_modules/objects/form/slider/slider-form.component.ts index cba1d02..b77c414 100644 --- a/src/app/_modules/objects/form/slider/slider-form.component.ts +++ b/src/app/_modules/objects/form/slider/slider-form.component.ts @@ -2,6 +2,7 @@ import {Component} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {FormControl, FormGroup} from "@angular/forms"; import {FormsService, ListsService} from "@app/_services"; +import { MenuService } from '@app/_services/menu.service'; import { PagesService } from '@app/_services/pages.service'; @@ -32,7 +33,7 @@ export class SliderFormComponent { private formsService: FormsService, private listsService: ListsService, private pagesService: PagesService, - + private menuService: MenuService ) { } @@ -131,7 +132,7 @@ export class SliderFormComponent { window.open(res.asset.data.links[res.action || 'download'], "_blank"); } else { this.listsService.refresh(this.list); - if(this.type=='page')this.pagesService.changedPages(); + if(this.type=='page')this.menuService.setPagesTree(); this.close(); } }, error => { diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts index b0b0f81..d8c2d9c 100644 --- a/src/app/_modules/pages/menu/pages-menu.component.ts +++ b/src/app/_modules/pages/menu/pages-menu.component.ts @@ -1,6 +1,6 @@ import {Component, EventEmitter, Input, Output, OnInit} from '@angular/core'; import { Router } from '@angular/router'; -import { PagesService } from '@app/_services/pages.service'; +import { MenuService } from '@app/_services/menu.service'; @Component({ selector: 'pages-menu', @@ -16,7 +16,7 @@ export class PagesMenuComponent implements OnInit { private root = false; constructor( - private pagesService: PagesService, + private menuService: MenuService, private router: Router, ){ @@ -38,7 +38,7 @@ export class PagesMenuComponent implements OnInit { if (!this.items){ this.root = true; - this.pagesService.pagesTree.subscribe(res=>{ + this.menuService.pagesTree.subscribe(res=>{ this.items = res.data }); } diff --git a/src/app/_modules/pages/page/page.component.html b/src/app/_modules/pages/page/page.component.html index f9c2569..86ad120 100644 --- a/src/app/_modules/pages/page/page.component.html +++ b/src/app/_modules/pages/page/page.component.html @@ -2,14 +2,14 @@ -
Page type {{page?.type?.name}} is undefined
-Page type {{page?.type?.name}} is undefined
+