diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html index 3ad1dce0b8b..1e5a453a377 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html @@ -26,6 +26,7 @@ <ds-error *ngIf="isSubmitted && !selectedGroup" message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error> </ng-container> <ds-eperson-group-list [isListOfEPerson]="false" + (deselect)="updateGroupObjectSelected($event)" (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list> </div> </div> diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts index 2eec0cfd0cc..6b5bfbeb925 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts @@ -67,7 +67,12 @@ export class SupervisionOrderGroupSelectorComponent { * Assign the value of group on select */ updateGroupObjectSelected(object) { - this.selectedGroup = object; + console.log(object); + if (object && object !== this.selectedGroup) { + this.selectedGroup = object; + } else if (object) { + this.selectedGroup = null; + } } /** diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts index 5d73770c780..c4f6142f38f 100644 --- a/src/app/core/data/request.effects.ts +++ b/src/app/core/data/request.effects.ts @@ -35,7 +35,6 @@ export class RequestEffects { ); }), filter((entry: RequestEntry) => hasValue(entry)), - // TODO: test once rest part is aligned withLatestFrom(this.xsrfService.tokenInitialized$), // If it's a GET request, or we have an XSRF token, dispatch it immediately // Otherwise wait for the XSRF token first