From: guodan1 Date: Sat, 29 Sep 2018 02:45:40 +0000 (+0800) Subject: mgr/dashboard: Delete the old logout component X-Git-Tag: v14.0.1~121^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb13373adecbc11c64a5dae8de111993cd1f0d2c;p=ceph.git mgr/dashboard: Delete the old logout component Signed-off-by: guodan1 --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts index 045464c859cc..99594203b67b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts @@ -7,7 +7,6 @@ import { BsDropdownModule, PopoverModule, TabsModule } from 'ngx-bootstrap'; import { SharedModule } from '../../shared/shared.module'; import { LoginComponent } from './login/login.component'; -import { LogoutComponent } from './logout/logout.component'; import { RoleDetailsComponent } from './role-details/role-details.component'; import { RoleFormComponent } from './role-form/role-form.component'; import { RoleListComponent } from './role-list/role-list.component'; @@ -28,14 +27,12 @@ import { UserTabsComponent } from './user-tabs/user-tabs.component'; ], declarations: [ LoginComponent, - LogoutComponent, RoleDetailsComponent, RoleFormComponent, RoleListComponent, UserTabsComponent, UserListComponent, UserFormComponent - ], - exports: [LogoutComponent] + ] }) export class AuthModule {} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html deleted file mode 100644 index a12ff1777d4f..000000000000 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.scss deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts deleted file mode 100644 index b75279eb6159..000000000000 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; - -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { AuthModule } from '../auth.module'; -import { LogoutComponent } from './logout.component'; - -describe('LogoutComponent', () => { - let component: LogoutComponent; - let fixture: ComponentFixture; - - configureTestBed({ - imports: [RouterTestingModule, HttpClientTestingModule, AuthModule] - }); - - beforeEach(() => { - fixture = TestBed.createComponent(LogoutComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.ts deleted file mode 100644 index 36098d9e357e..000000000000 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; - -import { AuthService } from '../../../shared/api/auth.service'; - -@Component({ - selector: 'cd-logout', - templateUrl: './logout.component.html', - styleUrls: ['./logout.component.scss'] -}) -export class LogoutComponent implements OnInit { - constructor(private authService: AuthService, private router: Router) {} - - ngOnInit() {} - - logout() { - this.authService.logout(() => { - this.router.navigate(['/login']); - }); - } -}