[DSC-1542] fix supervision selection

4Science · Oct 16, 2024 · 17ffbe3 · 17ffbe3
1 parent 2efde9c
commit 17ffbe3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...ace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/...ace-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/...space-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/...space-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
@@ -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