Skip to content

Commit 413080a

Browse files
VladislavKostyukevichVladislavKostyukevich
committed
Fixes
1 parent 37a3774 commit 413080a

25 files changed

+149
-214
lines changed

‎e2e/pages/login.po/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class LogIn extends BasePage {
2424
}
2525

2626
async logInAs(userName: string, password: string) {
27-
await this.menuBar.clickLogo();
2827
if (await this.menuBar.isLogged()) {
2928
await this.menuBar.clickLogOut();
3029
}

‎e2e/specs/hooks.spec.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ beforeAll(async () => {
2222
throw new Error(`Backend is unavailable ${environment.host}`);
2323
}
2424
await logIn.navigateTo();
25-
await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
26-
await projectList.menuBar.administration();
27-
await userAdministration.create(usersTestData.autoAdmin);
28-
await userAdministration.create(usersTestData.localAdmin);
29-
await userAdministration.create(usersTestData.auditAdmin);
30-
await userAdministration.create(usersTestData.assignedAuditor);
31-
await userAdministration.create(usersTestData.localManager);
32-
await userAdministration.create(usersTestData.localEngineer);
33-
await userAdministration.create(usersTestData.manager);
34-
await userAdministration.create(usersTestData.projectTemp);
35-
await userAdministration.create(usersTestData.viewer);
36-
await userAdministration.menuBar.clickLogOut();
25+
// await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
26+
// await projectList.menuBar.administration();
27+
// await userAdministration.create(usersTestData.autoAdmin);
28+
// await userAdministration.create(usersTestData.localAdmin);
29+
// await userAdministration.create(usersTestData.auditAdmin);
30+
// await userAdministration.create(usersTestData.assignedAuditor);
31+
// await userAdministration.create(usersTestData.localManager);
32+
// await userAdministration.create(usersTestData.localEngineer);
33+
// await userAdministration.create(usersTestData.manager);
34+
// await userAdministration.create(usersTestData.projectTemp);
35+
// await userAdministration.create(usersTestData.viewer);
36+
// await userAdministration.menuBar.clickLogOut();
3737
});
3838

3939
beforeEach(async () => {
@@ -44,14 +44,14 @@ beforeEach(async () => {
4444
});
4545

4646
afterAll(async () => {
47-
await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
48-
await projectList.menuBar.administration();
49-
await userAdministration.remove(usersTestData.localAdmin.user_name);
50-
await userAdministration.remove(usersTestData.autoAdmin.user_name);
51-
await userAdministration.remove(usersTestData.localManager.user_name);
52-
await userAdministration.remove(usersTestData.localEngineer.user_name);
53-
await userAdministration.remove(usersTestData.manager.user_name);
54-
await userAdministration.remove(usersTestData.projectTemp.user_name);
55-
await userAdministration.remove(usersTestData.viewer.user_name);
56-
await userAdministration.menuBar.clickLogOut();
47+
// await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
48+
// await projectList.menuBar.administration();
49+
// await userAdministration.remove(usersTestData.localAdmin.user_name);
50+
// await userAdministration.remove(usersTestData.autoAdmin.user_name);
51+
// await userAdministration.remove(usersTestData.localManager.user_name);
52+
// await userAdministration.remove(usersTestData.localEngineer.user_name);
53+
// await userAdministration.remove(usersTestData.manager.user_name);
54+
// await userAdministration.remove(usersTestData.projectTemp.user_name);
55+
// await userAdministration.remove(usersTestData.viewer.user_name);
56+
// await userAdministration.menuBar.clickLogOut();
5757
});

‎src/app/app.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
class="nav-link dropdown-toggle">{{navigation.name}}
3636
<span *ngIf="navigation.children" class="caret"></span></a>
3737
<ul class="dropdown-menu">
38-
<li class="dropdown-item" *ngFor="let child of navigation.children">
39-
<a *ngIf="child.show" [routerLink]="child.link" [queryParams]="child.params">{{child.name}}</a>
38+
<li *ngFor="let child of navigation.children">
39+
<a class="dropdown-item" *ngIf="child.show" [routerLink]="child.link" [queryParams]="child.params">{{child.name}}</a>
4040
</li>
4141
</ul>
4242
</li>
@@ -46,7 +46,7 @@
4646
<li class="nav-item" [id]="navigation.id" *ngFor="let navigation of rightNavigations"
4747
[ngClass]="{'dropdown': navigation.children}">
4848

49-
<a class="nav-link"*ngIf="navigation.show && !navigation.children && !navigation.icon && navigation.link"
49+
<a class="nav-link" *ngIf="navigation.show && !navigation.children && !navigation.icon && navigation.link"
5050
[routerLink]="navigation.link" [queryParams]="navigation.params"
5151
[routerLinkActiveOptions]="navigation.routerOptions" routerLinkActive="active">{{navigation.name}}</a>
5252
<a class="nav-link" *ngIf="navigation.show && !navigation.children && navigation.icon && navigation.link"
@@ -69,9 +69,9 @@
6969
<span *ngIf="navigation.children" class="caret"></span></a>
7070
<ul class="dropdown-menu">
7171
<li *ngFor="let child of navigation.children">
72-
<a *ngIf="child.show && child.link" [routerLink]="child.link"
72+
<a class="dropdown-item" *ngIf="child.show && child.link" [routerLink]="child.link"
7373
[queryParams]="child.params">{{child.name}}</a>
74-
<a *ngIf="child.show && child.href" [href]="child.href">{{child.name}}</a>
74+
<a class="dropdown-item" *ngIf="child.show && child.href" [href]="child.href">{{child.name}}</a>
7575
</li>
7676
</ul>
7777
</li>

‎src/app/app.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ export class AppComponent {
9191
} else {
9292
this.currentProject = undefined;
9393
}
94-
9594
this.globaldata.announceCurrentProject(this.currentProject);
9695
}
9796

‎src/app/elements/color-dots/color-dots.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
'badge-warning': color === 2,
66
'badge-info': color === 4,
77
'badge-success': color === 5
8-
}" ><app-result-popover class="pop-over" [resultId]="entitiesId[i]"></app-result-popover></span>
9-
8+
}"></span>
9+
1010
</div>

‎src/app/elements/result-popover/result-popover.component.css‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/app/elements/result-popover/result-popover.component.html‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/app/elements/result-popover/result-popover.component.ts‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/app/elements/table/table.filter.component.css‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@
7979
height: 30px;
8080
}
8181

82-
.ft-header-button .glyphicon {
83-
margin-bottom: 2px;
84-
}
85-
8682
.tf-overflow {
8783
overflow: auto
8884
}

‎src/app/pages/general/authorization/Login.component.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@
3838
</svg>
3939
</div>
4040

41-
<div *ngIf="appSettings && appSettings.ldap_auth === 1 && appSettings.base_auth === 1"
42-
class="row justify-content-center align-items-center">
41+
<div class="row justify-content-center align-items-center">
4342

4443
<div id="login-column" class="col-md-4">
4544
<div id="login-box" class="col-md-12">
46-
<ul class="nav nav-tabs" id="myTab" role="tablist">
45+
<ul *ngIf="appSettings && appSettings.ldap_auth === 1 && appSettings.base_auth === 1" class="nav nav-tabs" id="myTab" role="tablist">
4746
<li class="nav-item" (click)="setLdap(true)">
4847
<a class="nav-link" id="ldap-tab" data-toggle="tab" href="#ldap" role="tab"
4948
[ngClass]="{'active': ldapLogin}" aria-controls="ldap" aria-selected="true">LDAP</a>

0 commit comments

Comments
 (0)