From 601cbd1bace210fd7738f30e7e5de0565356b772 Mon Sep 17 00:00:00 2001
From: Eduard Frankford <e.frankford@student.uibk.ac.at>
Date: Tue, 5 Apr 2022 10:56:59 +0200
Subject: [PATCH] changed layout of login field and auto checked privacy
statement
---
.../app/layouts/navbar/navbar.component.html | 24 +++++++++----------
.../app/layouts/navbar/navbar.component.ts | 4 ++--
.../javascript/e2e/account/account.spec.ts | 8 ++-----
.../e2e/page-objects/jhi-page-objects.ts | 6 ++++-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html
index bac8459f2..6359ee090 100644
--- a/src/main/webapp/app/layouts/navbar/navbar.component.html
+++ b/src/main/webapp/app/layouts/navbar/navbar.component.html
@@ -276,6 +276,17 @@
</button>
</div>
</div>
+ <br />
+ <div class="" style="padding-top: 10pt">
+ <label for="acceptTerms" class="form-check-label">
+ <input id="datapolicy" type="checkbox" [checked]="contentEditable" (change)="toggleEditable($event)" />
+ {{ 'login.form.acceptTerms1' | translate }}
+ <a jhitranslate="login.form.acceptTerms" href="/datapolicy">{{ 'login.form.acceptTerms2' | translate }}</a>
+ </label>
+ <div class="alert alert-danger" *ngIf="!contentEditable" jhiTranslate="login.messages.error.terms">
+ Please accept the datapolicy terms to be able to log in.
+ </div>
+ </div>
</li>
<li class="dropdown-divider"></li>
</ng-container>
@@ -322,17 +333,6 @@
>
Sign in
</button>
- <br />
- <div class="" style="padding-top: 10pt">
- <label for="acceptTerms" class="form-check-label">
- <input id="datapolicy" type="checkbox" (change)="toggleEditable($event)" />
- {{ 'login.form.acceptTerms1' | translate }}
- <a jhitranslate="login.form.acceptTerms" href="/datapolicy">{{ 'login.form.acceptTerms2' | translate }}</a>
- </label>
- <div class="alert alert-danger" *ngIf="!contentEditable" jhiTranslate="login.messages.error.terms">
- Please accept the datapolicy terms to be able to log in.
- </div>
- </div>
</form>
</li>
<li *ngSwitchCase="true">
@@ -376,7 +376,7 @@
</div>
<div class="col-12">
- <a (click)="logout()" id="logout">
+ <a routerLink="" (click)="logout()" id="logout" style="color: #212529">
<fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
<span jhiTranslate="global.menu.account.logout">Sign out</span>
</a>
diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts
index 05872bbc0..fb1972b5d 100644
--- a/src/main/webapp/app/layouts/navbar/navbar.component.ts
+++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts
@@ -29,7 +29,7 @@ export class NavbarComponent implements OnInit {
languages = LANGUAGES;
openAPIEnabled?: boolean;
version = '';
- contentEditable = false;
+ contentEditable = true;
oerLink?: String;
account: Account | null = null;
@@ -164,7 +164,7 @@ export class NavbarComponent implements OnInit {
logout(): void {
this.collapseNavbar();
this.loginService.logout();
- this.contentEditable = false;
+ this.contentEditable = true;
this.router.navigate(['']);
}
diff --git a/src/test/javascript/e2e/account/account.spec.ts b/src/test/javascript/e2e/account/account.spec.ts
index 7621b917d..199a0d2e7 100644
--- a/src/test/javascript/e2e/account/account.spec.ts
+++ b/src/test/javascript/e2e/account/account.spec.ts
@@ -65,14 +65,13 @@ describe('account', () => {
const alert = element(by.css('.alert-danger'));
const value2 = await alert.getAttribute('jhiTranslate');
expect(value2).to.eq(expect2);
- settingsPage = await navBarPage.getSettingsPage();
+ // settingsPage = await navBarPage.getSettingsPage();
});
it('should be able to update password', async () => {
passwordPage = await navBarPage.getPasswordPage();
expect(await passwordPage.getTitle()).to.eq('password.title');
-
await passwordPage.setCurrentPassword(password);
await passwordPage.setPassword('newpassword');
await passwordPage.setConfirmPassword('newpassword');
@@ -84,18 +83,15 @@ describe('account', () => {
expect(alertValue).to.eq(successMsg);
await navBarPage.autoSignOut();
- signInPage = await navBarPage.getSignInPage();
+ // signInPage = await navBarPage.getSignInPage();
await signInPage.autoSignInUsing(username, 'newpassword');
-
// change back to default
await navBarPage.clickOnPasswordMenu();
expect(await passwordPage.getTitle()).to.eq('password.title');
-
await passwordPage.setCurrentPassword('newpassword');
await passwordPage.setPassword(password);
await passwordPage.setConfirmPassword(password);
await passwordPage.save();
-
// wait for success message
const alertValue2 = await alert.getAttribute('jhiTranslate');
expect(alertValue2).to.eq(successMsg);
diff --git a/src/test/javascript/e2e/page-objects/jhi-page-objects.ts b/src/test/javascript/e2e/page-objects/jhi-page-objects.ts
index 494403782..24b8c9372 100644
--- a/src/test/javascript/e2e/page-objects/jhi-page-objects.ts
+++ b/src/test/javascript/e2e/page-objects/jhi-page-objects.ts
@@ -1,4 +1,5 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { A } from '@angular/cdk/keycodes';
import { element, by, ElementFinder, browser } from 'protractor';
/* eslint @typescript-eslint/no-use-before-define: 0 */
export class NavBarPage {
@@ -79,7 +80,7 @@ export class NavBarPage {
async getSignInPage(): Promise<SignInPage> {
await this.clickOnAccountMenu();
- await this.acceptDatapolicy();
+ // await this.acceptDatapolicy();
return new SignInPage();
}
@@ -166,10 +167,12 @@ export class PasswordPage {
title = element.all(by.css('h2')).first();
async setCurrentPassword(password: string): Promise<void> {
+ await this.currentPassword.clear();
await this.currentPassword.sendKeys(password);
}
async setPassword(password: string): Promise<void> {
+ await this.password.clear();
await this.password.sendKeys(password);
}
@@ -182,6 +185,7 @@ export class PasswordPage {
}
async setConfirmPassword(confirmPassword: string): Promise<void> {
+ await this.confirmPassword.clear();
await this.confirmPassword.sendKeys(confirmPassword);
}
--
GitLab