Merge pull request #544 from ministryofjustice/bugfix/DST-9201

src/main/java/uk/co/bconline/ndelius/model/Team.java

@@ -1,9 +1,9 @@
 package uk.co.bconline.ndelius.model;
 
-import javax.validation.constraints.NotBlank;
-
 import lombok.*;
 
+import javax.validation.constraints.NotBlank;
+
 @Getter
 @Builder
 @ToString
@@ -14,4 +14,5 @@ public final class Team
 	@NotBlank
 	private String code;
 	private String description;
+	private String providerCode;
 }

src/main/java/uk/co/bconline/ndelius/service/impl/TeamServiceImpl.java

@@ -35,7 +35,7 @@ public List<Team> getTeams(String probationArea)
 	{
 		List<TeamEntity> teams = ofNullable(probationArea)
 				.map(repository::findAllByEndDateIsNullAndProbationAreaCode)
-				.orElse(repository.findAllByEndDateIsNull());
+				.orElseGet(repository::findAllByEndDateIsNull);
 
 		return transformer.map(teams);
 	}

src/main/java/uk/co/bconline/ndelius/transformer/TeamTransformer.java

@@ -2,10 +2,12 @@
 
 import org.springframework.stereotype.Component;
 import uk.co.bconline.ndelius.model.Team;
+import uk.co.bconline.ndelius.model.entity.ProbationAreaEntity;
 import uk.co.bconline.ndelius.model.entity.TeamEntity;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 import static java.util.stream.Collectors.toList;
 
@@ -18,6 +20,7 @@ public List<Team> map(Collection<TeamEntity> teams)
 				.map(team -> Team.builder()
 						.code(team.getCode())
 						.description(team.getDescription())
+						.providerCode(Optional.ofNullable(team.getProbationArea()).map(ProbationAreaEntity::getCode).orElse(null))
 						.build())
 				.collect(toList());
 	}

src/test/java/uk/co/bconline/ndelius/util/CSVUtilsTest.java

@@ -46,7 +46,7 @@ public void csvHasTestData() throws CsvRequiredFieldEmptyException, CsvDataTypeM
 				.build()), writer);
 		String csv = writer.toString();
 
-		String expectedTestUser = "\n\"test.user\",\"test\",\"user\",\"2020-01-01\",\"ABC123\",\"Team(code=TEAM01, description=Team 1) Team(code=TEAM02, description=Team 2)\"\n";
+		String expectedTestUser = "\n\"test.user\",\"test\",\"user\",\"2020-01-01\",\"ABC123\",\"Team(code=TEAM01, description=Team 1, providerCode=null) Team(code=TEAM02, description=Team 2, providerCode=null)\"\n";
 		assertThat(csv, containsString(expectedTestUser));
 	}
 

ui/src/app/component/item-selector/item-selector.component.html

@@ -73,13 +73,12 @@
                style="cursor: pointer"
                title="Only show selected options"
                [value]="SELECTED_OPTION_SUB_MENU">Selected</option>
-            <option *ngFor="let dataset of subMenuItems"
-                    [value]="dataset.code"
-                    [selected]="dataset.description"
+            <option *ngFor="let items of subMenuItems"
+                    [value]="items.code"
                     class="nav-link py-1"
                     tabindex="0"
-                    title="Show teams for the {{dataset.description}} provider">
-              {{ dataset.description }}
+                    title="Show teams for the {{items.description}} provider">
+              {{ items.description }}
             </option>
           </select>
 
@@ -99,6 +98,7 @@
                title="Filter selectable options" placeholder="Search&hellip;" aria-label="Filter">
       </div>
     </div>
+    <div *ngIf="available == null || available.length === 0">{{ subMenuMessage }}</div>
     <div class="text-truncate custom-control custom-{{multiple? 'checkbox': 'radio'}}"
          [class.d-none]="onlyShowSelected && !isSelected(item)"
          *ngFor="let item of filtered; let i = index">

ui/src/app/component/item-selector/item-selector.component.ts

@@ -1,12 +1,15 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  DoCheck,
   ElementRef,
   EventEmitter,
   forwardRef,
   Input,
+  OnChanges,
   OnInit,
   Output,
+  SimpleChanges,
   ViewChild
 } from '@angular/core';
 import {
@@ -40,7 +43,7 @@ declare var Popper: any;
 })
 
 export class ItemSelectorComponent
-  implements ControlValueAccessor, Validator, OnInit {
+  implements ControlValueAccessor, Validator, OnInit, DoCheck, OnChanges {
   @ViewChild('filterControl', {static: true}) filterControl: ElementRef;
   @ViewChild('toggleBtn', {static: true}) toggleBtn: ElementRef;
   @ViewChild('dropdown', {static: true}) dropdown: ElementRef;
@@ -54,7 +57,8 @@ export class ItemSelectorComponent
   @Input() alignRight: boolean;
   @Input() placeholder = 'Please select...';
   @Input() loadingText = 'Loading...';
-  @Input() subMenuItems: {code: string, description: string}[];
+  @Input() subMenuItems: { code: string, description: string }[];
+  @Input() prevSubMenuItems: { code: string, description: string }[]; // for change detection
   @Input() selectedSubMenuItem: string;
   @Input() disabled: boolean;
   @Output() selectedChange: EventEmitter<any> = new EventEmitter<any>();
@@ -64,6 +68,7 @@ export class ItemSelectorComponent
   dirty = false;
   filter = '';
   onlyShowSelected: boolean;
+  subMenuMessage: string;
 
   @Input() idMapper: Function = null;
   @Input() getSubMenu: Function;
@@ -74,6 +79,25 @@ export class ItemSelectorComponent
   private propagateTouchChange = (_: any) => {
   }
 
+  ngOnChanges(changes: SimpleChanges) {
+    // Change detection to the default selectedSubMenuItem (homeArea)
+    if (changes.hasOwnProperty('selectedSubMenuItem')) {
+      this.getSubMenuList();
+    }
+  }
+
+  ngDoCheck() {
+    // Using ngDoCheck for custom change detection on the subMenuItems Array
+    // Change detection when the subMenuItems changes (datasets)
+    if (this.subMenuItems != null && this.subMenuItems.length !== (this.prevSubMenuItems || []).length) {
+      this.prevSubMenuItems = [...this.subMenuItems];
+      // DST-9201 Filter selected items (teams) to contain only items where providerCode is in the list of available subMenuItems (datasets)
+      // Note: providerCode is specific to Teams - if we need to make this generic we'll need to rethink this.
+      this.selected = this.selected.filter(sel => this.subMenuItems.some(subMenuItem => subMenuItem.code === sel.providerCode));
+      this.getSubMenuList();
+    }
+  }
+
   toggle(item): void {
     if (this.multiple) {
       if (this.selected == null) {
@@ -166,11 +190,7 @@ export class ItemSelectorComponent
     };
 
     if (this.subMenuItems != null) {
-      if (this.onlyShowSelected) {
-        return [...this.selected, ...this.availableItems].filter(removeNullAndDuplicates);
-      } else {
-        return this.availableItems.filter(removeNullAndDuplicates);
-      }
+      return this.availableItems.filter(removeNullAndDuplicates);
     } else if (this.multiple) {
       return [...this.selected, ...this.availableItems].filter(removeNullAndDuplicates);
     } else {
@@ -269,16 +289,22 @@ export class ItemSelectorComponent
   }
 
   getSubMenuList(): void {
+    // Triggered when changing sub-menu, to populate the available items within the sub-menu
     if (this.selectedSubMenuItem === this.SELECTED_OPTION_SUB_MENU) {
+      this.available = this.selected;
       this.onlyShowSelected = true;
-      this.available = [];
-      return;
     } else {
+      this.available = null;
       this.onlyShowSelected = false;
+      this.subMenuMessage = 'Loading...';
+      this.getSubMenu(this.selectedSubMenuItem).subscribe(
+        items => {
+          this.subMenuMessage = '';
+          this.available = items;
+        },
+        () => this.subMenuMessage = 'Error loading menu items'
+      );
     }
-    this.getSubMenu(this.selectedSubMenuItem).subscribe(
-      items => this.available = items
-    );
   }
 
   disableComponent(): boolean {

ui/src/app/component/user/user.component.html

@@ -358,7 +358,7 @@ <h2 class="card-title mb-0" id="staff-details">Staff Details</h2>
                            [available]="teams"
                            [subMenuItems]="user.datasets"
                            [getSubMenu]="teamService.providerTeams.bind(teamService)"
-                           [selectedSubMenuItem]="user.homeArea?.code"
+                           [selectedSubMenuItem]="user.homeArea?.code || (user.datasets?.length > 0 && user.datasets[0]?.code)"
                            [readonly]="mode === 'View'"
                            [labelMapper]="LabelMappingUtils.codeDescriptionToLabel"></item-selector>
           </div>

ui/src/app/component/user/user.component.ts

@@ -164,16 +164,11 @@ export class UserComponent implements OnInit {
 
   homeAreaChanged() {
     if (this.user.homeArea != null) {
-      this.teams = null;
-      this.teamService.providerTeams(this.user.homeArea.code).subscribe((teams: Team[]) => {
-        this.teams = teams;
-      });
       this.subContractedProviders = null;
       this.datasetService.subContractedProviders(this.user.homeArea.code).subscribe((subContractedProviders: Dataset[]) => {
         this.subContractedProviders = subContractedProviders;
       });
     } else {
-      this.teams = [];
       this.subContractedProviders = [];
     }
   }

ui/src/app/model/team.ts

@@ -1,4 +1,5 @@
 export class Team {
   code: string;
   description: string;
+  providerCode: string;
 }