Browse Source

UI: Minor improvements

pull/8247/head
Igor Kulikov 4 years ago
parent
commit
1e47d5b3ff
  1. 8
      ui-ngx/src/app/core/services/menu.service.ts
  2. 1
      ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
  3. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts

8
ui-ngx/src/app/core/services/menu.service.ts

@ -15,7 +15,6 @@
/// ///
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AuthService } from '../auth/auth.service';
import { select, Store } from '@ngrx/store'; import { select, Store } from '@ngrx/store';
import { AppState } from '../core.state'; import { AppState } from '../core.state';
import { getCurrentOpenedMenuSections, selectAuth, selectIsAuthenticated } from '../auth/auth.selectors'; import { getCurrentOpenedMenuSections, selectAuth, selectIsAuthenticated } from '../auth/auth.selectors';
@ -37,7 +36,6 @@ export class MenuService {
homeSections$: Subject<Array<HomeSection>> = new BehaviorSubject<Array<HomeSection>>([]); homeSections$: Subject<Array<HomeSection>> = new BehaviorSubject<Array<HomeSection>>([]);
constructor(private store: Store<AppState>, constructor(private store: Store<AppState>,
private authService: AuthService,
private router: Router) { private router: Router) {
this.store.pipe(select(selectIsAuthenticated)).subscribe( this.store.pipe(select(selectIsAuthenticated)).subscribe(
(authenticated: boolean) => { (authenticated: boolean) => {
@ -180,8 +178,9 @@ export class MenuService {
{ {
id: guid(), id: guid(),
name: 'security.security', name: 'security.security',
type: 'link', type: 'toggle',
path: '/security-settings', path: '/security-settings',
height: '120px',
icon: 'security', icon: 'security',
pages: [ pages: [
{ {
@ -553,8 +552,9 @@ export class MenuService {
{ {
id: guid(), id: guid(),
name: 'security.security', name: 'security.security',
type: 'link', type: 'toggle',
path: '/security-settings', path: '/security-settings',
height: '40px',
icon: 'security', icon: 'security',
pages: [ pages: [
{ {

1
ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts

@ -278,7 +278,6 @@ const routes: Routes = [
}, },
{ {
path: 'security-settings', path: 'security-settings',
component: RouterTabsComponent,
data: { data: {
auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN], auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
breadcrumb: { breadcrumb: {

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts

@ -1456,7 +1456,7 @@ export class RuleChainPageComponent extends PageComponent
this.isDirtyValue = false; this.isDirtyValue = false;
this.isImport = false; this.isImport = false;
if (this.ruleChainType !== RuleChainType.EDGE) { if (this.ruleChainType !== RuleChainType.EDGE) {
this.router.navigateByUrl(`ruleChains/${this.ruleChain.id.id}`); this.router.navigateByUrl(`features/ruleChains/${this.ruleChain.id.id}`);
} else { } else {
this.router.navigateByUrl(`edgeManagement/ruleChains/${this.ruleChain.id.id}`); this.router.navigateByUrl(`edgeManagement/ruleChains/${this.ruleChain.id.id}`);
} }

Loading…
Cancel
Save