From d8a8f47cb841abd972aec8ffbcef802485a4915e Mon Sep 17 00:00:00 2001
From: Sofie Hofmann <29145005+sofie29@users.noreply.github.com>
Date: Wed, 25 Aug 2021 11:28:40 +0200
Subject: [PATCH] TSK-1720: Sort Workbasket Distribution Targets by type and
 name

---
 ...t-distribution-targets-list.component.html |  2 +-
 ...istribution-targets-list.component.spec.ts | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html
index 75dff1f6e..3da6d449e 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html
+++ b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html
@@ -33,7 +33,7 @@
        [scrollWindow]="false" *ngIf="distributionTargets?.length > 0">
     <mat-selection-list #workbasket [multiple]="true">
       <mat-list-option class="workbasket-distribution-targets__workbaskets-item"
-                       *ngFor="let workbasket of distributionTargets | orderBy: ['type', 'description']"
+                       *ngFor="let workbasket of distributionTargets | orderBy: ['type', 'name']"
                        [selected]="workbasket.selected"
                        (click)="workbasket.selected = !workbasket.selected"
                        [value]="workbasket.workbasketId">
diff --git a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts
index 40f2724d6..837053f70 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts
+++ b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { Component, DebugElement, Input, Pipe, PipeTransform } from '@angular/core';
 import { WorkbasketDistributionTargetsListComponent } from './workbasket-distribution-targets-list.component';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
@@ -39,26 +39,28 @@ describe('WorkbasketDistributionTargetsListComponent', () => {
   let debugElement: DebugElement;
   let component: WorkbasketDistributionTargetsListComponent;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        MatIconModule,
-        MatToolbarModule,
-        MatListModule,
-        MatTooltipModule,
-        InfiniteScrollModule,
-        BrowserAnimationsModule
-      ],
-      declarations: [WorkbasketDistributionTargetsListComponent, FilterStub, SpinnerStub, IconTypeStub, OrderByMock],
-      providers: []
-    }).compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          MatIconModule,
+          MatToolbarModule,
+          MatListModule,
+          MatTooltipModule,
+          InfiniteScrollModule,
+          BrowserAnimationsModule
+        ],
+        declarations: [WorkbasketDistributionTargetsListComponent, FilterStub, SpinnerStub, IconTypeStub, OrderByMock],
+        providers: []
+      }).compileComponents();
 
-    fixture = TestBed.createComponent(WorkbasketDistributionTargetsListComponent);
-    debugElement = fixture.debugElement;
-    component = fixture.componentInstance;
-    component.distributionTargets = workbasketReadStateMock.paginatedWorkbasketsSummary.workbaskets;
-    component.side = Side.AVAILABLE;
-  }));
+      fixture = TestBed.createComponent(WorkbasketDistributionTargetsListComponent);
+      debugElement = fixture.debugElement;
+      component = fixture.componentInstance;
+      component.distributionTargets = workbasketReadStateMock.paginatedWorkbasketsSummary.workbaskets;
+      component.side = Side.AVAILABLE;
+    })
+  );
 
   it('should create component', () => {
     expect(component).toBeTruthy();
@@ -92,6 +94,6 @@ describe('WorkbasketDistributionTargetsListComponent', () => {
   it('should call orderBy pipe', () => {
     const orderBySpy = jest.spyOn(OrderByMock.prototype, 'transform');
     fixture.detectChanges();
-    expect(orderBySpy).toHaveBeenCalledWith(component.distributionTargets, ['type', 'description']);
+    expect(orderBySpy).toHaveBeenCalledWith(component.distributionTargets, ['type', 'name']);
   });
 });