From fa0a36a563bde0a5053eb49ef52de86be718a6c8 Mon Sep 17 00:00:00 2001 From: Janik Endtner Date: Fri, 2 Feb 2024 16:54:20 +0100 Subject: [PATCH 1/4] #789 some details from testing --- .../application-top-bar.component.html | 9 +++++++-- .../application-top-bar.component.ts | 18 +++++++++++++++++- .../add-member-to-team-dialog.component.html | 8 +++++++- .../team-management-banner.component.html | 4 ++-- frontend/src/assets/i18n/de.json | 2 +- frontend/src/style/styles.scss | 4 +++- 6 files changed, 37 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.html b/frontend/src/app/components/application-top-bar/application-top-bar.component.html index f2647904e1..ea46766922 100644 --- a/frontend/src/app/components/application-top-bar/application-top-bar.component.html +++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.html @@ -5,15 +5,20 @@
+ + +
+ +
diff --git a/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html b/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html index 0133e04a59..3c0d25609a 100644 --- a/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html +++ b/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html @@ -1,7 +1,7 @@
- Zurück zu OKR's + Zurück zur OKR Übersicht
@@ -19,7 +19,7 @@

Teamverwaltung

> Add key-result button - Team hinzufügen + Team erfassen
diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json index d0219e84a2..85ef4b0c05 100644 --- a/frontend/src/assets/i18n/de.json +++ b/frontend/src/assets/i18n/de.json @@ -99,7 +99,7 @@ "WEITERE": "+ {{overflow}} weitere", "INPUT_PLACEHOLDER": "Nach Team oder Member suchen", "TEAMS": "Teams", - "USERS": "Users" + "USERS": "Members" }, "PAGINATOR": { "MEMBERS_PRO_SEITE": "Members pro Seite", diff --git a/frontend/src/style/styles.scss b/frontend/src/style/styles.scss index d4fba73b71..597c6c8ea4 100644 --- a/frontend/src/style/styles.scss +++ b/frontend/src/style/styles.scss @@ -320,9 +320,11 @@ table.okr-table { border: none; box-shadow: none; tr { - height: 40px; + $table-height: 40px; + height: $table-height; > td { + height: $table-height; border: none; background-color: $light-grey; } From c29c55b40b52d55f4e6a655aa7c2b17f96a4478d Mon Sep 17 00:00:00 2001 From: Janik Endtner Date: Mon, 5 Feb 2024 07:51:16 +0100 Subject: [PATCH 2/4] #789 fix cypress tests --- frontend/cypress/e2e/teammanagement.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/cypress/e2e/teammanagement.cy.ts b/frontend/cypress/e2e/teammanagement.cy.ts index d43544ab68..5f6951a78d 100644 --- a/frontend/cypress/e2e/teammanagement.cy.ts +++ b/frontend/cypress/e2e/teammanagement.cy.ts @@ -21,7 +21,7 @@ describe('Team management tests', () => { it('Opens teammanagement dialog', () => { //Check if overview contains correct titles of teammanagement cy.contains('Teamverwaltung'); - cy.contains('Team hinzufügen'); + cy.contains('Team erfassen'); cy.contains('Alle Teams'); }); @@ -132,7 +132,7 @@ describe('Team management tests', () => { it('Search mixed', () => { cy.get('app-team-management-banner').getByTestId('teamManagementSearch').click().type('puz', { delay: 1 }); - cy.contains('.mat-mdc-autocomplete-panel .mat-mdc-optgroup-label', 'Users'); + cy.contains('.mat-mdc-autocomplete-panel .mat-mdc-optgroup-label', 'Members'); cy.contains('.mat-mdc-autocomplete-panel .mat-mdc-optgroup-label', 'Teams'); cy.contains('.mat-mdc-autocomplete-panel mat-option', 'Paco Eggimann (peggimann@puzzle.ch)'); cy.contains('.mat-mdc-autocomplete-panel mat-option', 'Paco Egiman (egiman@puzzle.ch)'); From 6cda5948b46d4523fe25777465157a4dead303ce Mon Sep 17 00:00:00 2001 From: e560704 Date: Fri, 12 Apr 2024 08:46:33 +0200 Subject: [PATCH 3/4] #789 remove print statement --- .../application-top-bar.component.ts | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts index a681e07182..177060967f 100644 --- a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts +++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; -import { OAuthService } from 'angular-oauth2-oidc'; -import { filter, map, Observable, of, switchMap } from 'rxjs'; -import { ConfigService } from '../../config.service'; -import { NavigationEnd, Router } from '@angular/router'; -import { UserService } from '../../services/user.service'; -import { getFullNameFromUser } from '../../shared/types/model/User'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit} from '@angular/core'; +import {OAuthService} from 'angular-oauth2-oidc'; +import {filter, map, Observable, of, switchMap} from 'rxjs'; +import {ConfigService} from '../../config.service'; +import {NavigationEnd, Router} from '@angular/router'; +import {UserService} from '../../services/user.service'; +import {getFullNameFromUser} from '../../shared/types/model/User'; @Component({ selector: 'app-application-top-bar', @@ -57,11 +57,6 @@ export class ApplicationTopBarComponent implements OnInit { }); } - show() { - console.log(this.router.url); - return true; - } - private initTeamManagementVisible() { this.teamManagementVisible$ = this.router.events.pipe( filter((e): e is NavigationEnd => e instanceof NavigationEnd), From 9b0efbe54b55db99478d286f689e3fa14c516409 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 12 Apr 2024 06:47:22 +0000 Subject: [PATCH 4/4] [FM] Automated formating frontend --- .../application-top-bar.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts index 177060967f..cbe977d715 100644 --- a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts +++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts @@ -1,10 +1,10 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit} from '@angular/core'; -import {OAuthService} from 'angular-oauth2-oidc'; -import {filter, map, Observable, of, switchMap} from 'rxjs'; -import {ConfigService} from '../../config.service'; -import {NavigationEnd, Router} from '@angular/router'; -import {UserService} from '../../services/user.service'; -import {getFullNameFromUser} from '../../shared/types/model/User'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; +import { OAuthService } from 'angular-oauth2-oidc'; +import { filter, map, Observable, of, switchMap } from 'rxjs'; +import { ConfigService } from '../../config.service'; +import { NavigationEnd, Router } from '@angular/router'; +import { UserService } from '../../services/user.service'; +import { getFullNameFromUser } from '../../shared/types/model/User'; @Component({ selector: 'app-application-top-bar',