diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts
index 6412f14e797b9253b5b565b041a5528871b84d00..4617bd101a89ba65b00c2fab4b46941158c4b5a4 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts
@@ -1,7 +1,7 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { UiModule } from '@goofy-client/ui';
-import { UserIconComponent } from '@goofy-client/user-profile';
+import { UserIconContainerComponent } from '@goofy-client/user-profile';
import { VorgangSearchContainerComponent } from '@goofy-client/vorgang-shared-ui';
import { configureTestSuite } from 'ng-bullet';
import { MockComponent } from 'ng-mocks';
@@ -22,7 +22,7 @@ describe('HeaderComponent', () => {
HeaderComponent,
MockComponent(SettingsComponent),
MockComponent(VorgangSearchContainerComponent),
- MockComponent(UserIconComponent)
+ MockComponent(UserIconContainerComponent)
]
})
});
diff --git a/goofy-client/libs/user-profile-shared/src/index.ts b/goofy-client/libs/user-profile-shared/src/index.ts
index 657b4429b5bbe2a07b86fd421699c982f778023c..bf11023f3469c1764715183d8aa6f9ffffeb7dd9 100644
--- a/goofy-client/libs/user-profile-shared/src/index.ts
+++ b/goofy-client/libs/user-profile-shared/src/index.ts
@@ -1,2 +1,3 @@
export * from './lib/user-profile-shared.module';
+export * from './lib/user-profile.model';
export * from './lib/user-profile.service';
diff --git a/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.spec.ts b/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.spec.ts
index 6d338b051b83f28ae0113ac51cf96d11c7786e0c..7bd242c808e2dde908176d7bc1ec03b266b75810 100644
--- a/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.spec.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.spec.ts
@@ -1,25 +1,38 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { mock } from '@goofy-client/test-utils';
+import { UserProfileService } from '@goofy-client/user-profile-shared';
+import { MockComponent } from 'ng-mocks';
+import { UserIconComponent } from '../user-icon/user-icon.component';
import { UserIconContainerComponent } from './user-icon-container.component';
describe('UserIconContainerComponent', () => {
- let component: UserIconContainerComponent;
- let fixture: ComponentFixture<UserIconContainerComponent>;
+ let component: UserIconContainerComponent;
+ let fixture: ComponentFixture<UserIconContainerComponent>;
+
+ const userProfileService = mock(UserProfileService);
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [ UserIconContainerComponent ]
- })
- .compileComponents();
- });
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [
+ UserIconContainerComponent,
+ MockComponent(UserIconComponent)
+ ],
+ providers: [
+ {
+ provide: UserProfileService,
+ useValue: userProfileService
+ }
+ ]
+ }).compileComponents();
+ });
- beforeEach(() => {
- fixture = TestBed.createComponent(UserIconContainerComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
+ beforeEach(() => {
+ fixture = TestBed.createComponent(UserIconContainerComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
- it('should create', () => {
- expect(component).toBeTruthy();
- });
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
});
diff --git a/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.ts b/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.ts
index 5b17ae3a9ae2a01bafd6fd9efb721049142953d4..ec53ff086ae3e2384eb5bf91c4680e3ad08f074e 100644
--- a/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-icon-container/user-icon-container.component.ts
@@ -1,9 +1,8 @@
import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
import { createEmptyStateResource, StateResource } from '@goofy-client/tech-shared';
-import { UserProfileService } from '@goofy-client/user-profile-shared';
+import { UserProfileResource, UserProfileService } from '@goofy-client/user-profile-shared';
import { VorgangHeaderLinkRel, VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
import { hasLink } from '@ngxp/rest';
-import { UserProfileResource } from 'libs/user-profile-shared/src/lib/user-profile.model';
import { isNil } from 'lodash-es';
import { Observable, of } from 'rxjs';
diff --git a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
index 22f917db9bdc578212ec5af09a4b6a1ae9d1405c..8abc89e88a0cd670b7be6dae3924258c9f6fa8c9 100644
--- a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
+++ b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.html
@@ -1,16 +1,16 @@
- <div class="editor"
- [ngStyle]="{
- 'transform': 'scale(' + scaleFactor + ')',
- 'transform-origin': transformOrigin
- }"
- [matTooltipDisabled]="disableTooltip"
- matTooltip="{{ toolTip }}">
+<div class="editor"
+ [ngStyle]="{
+ 'transform': 'scale(' + scaleFactor + ')',
+ 'transform-origin': transformOrigin
+ }"
+ [matTooltipDisabled]="disableTooltip"
+ matTooltip="{{ toolTip }}">
- <ng-container *ngIf="userProfileStateResource.resource; else noUser">
- <span>{{ initials }}</span>
- </ng-container>
- <ng-template #noUser>
- <mat-icon>account_circle</mat-icon>
- </ng-template>
- <div class="picture"></div>
- </div>
\ No newline at end of file
+ <ng-container *ngIf="userProfileStateResource.resource; else noUser">
+ <span>{{ initials }}</span>
+ </ng-container>
+ <ng-template #noUser>
+ <mat-icon>account_circle</mat-icon>
+ </ng-template>
+ <div class="picture"></div>
+</div>
\ No newline at end of file
diff --git a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
index 3ebb930f731382090117d3484b80c09f015d4615..508863068122c582391c8a35e0b50cd3d85eefba 100644
--- a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.spec.ts
@@ -1,6 +1,8 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
+import { createStateResource } from '@goofy-client/tech-shared';
+import { createUserProfileResource } from '../../../../user-profile-shared/test/user-profile';
import { UserIconComponent } from './user-icon.component';
describe('UserIconComponent', () => {
@@ -20,6 +22,7 @@ describe('UserIconComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(UserIconComponent);
component = fixture.componentInstance;
+ component.userProfileStateResource = createStateResource(createUserProfileResource());
fixture.detectChanges();
});
diff --git a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
index e0348d0f8b8dc69f3da912af791a9563f6b3f52d..bedfb1d456246367b0f896c17b38ff7b56162803 100644
--- a/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
@@ -1,6 +1,6 @@
import { Component, Input, SimpleChanges } from '@angular/core';
import { StateResource } from '@goofy-client/tech-shared';
-import { UserProfileResource } from 'libs/user-profile-shared/src/lib/user-profile.model';
+import { UserProfileResource } from '@goofy-client/user-profile-shared';
import { isNil } from 'lodash';
@Component({
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts
index 3f9e8919eaaed2ce0a3a05f1acb22e5ca25731f4..3606faa094f7be8be32ee5b4f8fd0e12e308ff15 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { EnumToLabelPipe, HasLinkPipe } from '@goofy-client/tech-shared';
-import { UserIconComponent } from '@goofy-client/user-profile';
+import { UserIconContainerComponent } from '@goofy-client/user-profile';
import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared';
import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -17,7 +17,7 @@ describe('VorgangDetailHeaderComponent', () => {
await TestBed.configureTestingModule({
declarations: [
VorgangDetailHeaderComponent,
- MockComponent(UserIconComponent),
+ MockComponent(UserIconContainerComponent),
MockComponent(StatusDotComponent),
MockComponent(AktenzeichenComponent),
EnumToLabelPipe,
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts
index 8a1b07832f37e4342c0d5131064b3656f47ce707..0bad81d4d12fda75ef96838bd56aad60ad25a1cf 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts
@@ -9,7 +9,7 @@ import { MatIconTestingModule } from '@angular/material/icon/testing';
import { MatTooltipModule } from '@angular/material/tooltip';
import { RouterTestingModule } from '@angular/router/testing';
import { EnumToLabelPipe, FormatDateWithTimePipe, FormatListDatePipe, HasLinkPipe, ToResourceUriPipe } from '@goofy-client/tech-shared';
-import { UserIconComponent } from '@goofy-client/user-profile';
+import { UserIconContainerComponent } from '@goofy-client/user-profile';
import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared';
import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui';
import { WiedervorlageListInVorgangListContainerComponent } from '@goofy-client/wiedervorlage';
@@ -43,7 +43,7 @@ describe('VorgangListItemComponent', () => {
ToResourceUriPipe,
HasLinkPipe,
MockComponent(AktenzeichenComponent),
- MockComponent(UserIconComponent),
+ MockComponent(UserIconContainerComponent),
MockComponent(StatusDotComponent),
MockComponent(WiedervorlageListInVorgangListContainerComponent),
MockComponent(VorgangNextFristButton)