117287: Fixed group form not working correctly anymore when switching…

… between different groups
alexandrevryghem · Oct 29, 2024 · 60ef270 · 60ef270
1 parent f03ed89
commit 60ef270
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -13,7 +13,7 @@ import {
   Observable,
   Subscription, combineLatest,
 } from 'rxjs';
-import { map, switchMap, take, debounceTime, startWith, filter } from 'rxjs/operators';
+import { map, switchMap, take, debounceTime } from 'rxjs/operators';
 import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
@@ -35,7 +35,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertType } from '../../../shared/alert/aletr-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { hasValue, isNotEmpty, hasValueOperator, hasNoValue } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -164,11 +164,16 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.activeGroupLinkedDSO$ = this.getActiveGroupLinkedDSO();
     this.linkedEditRolesRoute$ = this.getLinkedEditRolesRoute();
     this.canEdit$ = this.activeGroupLinkedDSO$.pipe(
-      filter((dso: DSpaceObject) => hasNoValue(dso)),
-      switchMap(() => this.activeGroup$),
-      hasValueOperator(),
-      switchMap((group: Group) => this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self)),
-      startWith(false),
+      switchMap((dso: DSpaceObject) => {
+        if (hasValue(dso)) {
+          return [false];
+        } else {
+          return this.activeGroup$.pipe(
+            hasValueOperator(),
+            switchMap((group: Group) => this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self)),
+          );
+        }
+      }),
     );
     this.initialisePage();
   }
@@ -216,15 +221,15 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       combineLatest([
         this.activeGroup$,
         this.canEdit$,
-        this.activeGroupLinkedDSO$.pipe(take(1)),
+        this.activeGroupLinkedDSO$,
       ]).subscribe(([activeGroup, canEdit, linkedObject]) => {
 
         if (activeGroup != null) {
 
           // Disable group name exists validator
           this.formGroup.controls.groupName.clearAsyncValidators();
 
-          if (linkedObject?.name) {
+          if (isNotEmpty(linkedObject?.name)) {
             this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, groupCommunityModel);
             this.groupDescription = this.formGroup.get('groupCommunity');
             this.formGroup.patchValue({
@@ -233,16 +238,20 @@ export class GroupFormComponent implements OnInit, OnDestroy {
               groupDescription: activeGroup.firstMetadataValue('dc.description'),
             });
           } else {
+            this.formModel = [
+              groupNameModel,
+              groupDescriptionModel,
+            ];
             this.formGroup.patchValue({
               groupName: activeGroup.name,
               groupDescription: activeGroup.firstMetadataValue('dc.description'),
             });
           }
-          setTimeout(() => {
-            if (!canEdit || activeGroup.permanent) {
-              this.formGroup.disable();
-            }
-          }, 200);
+          if (!canEdit || activeGroup.permanent) {
+            this.formGroup.disable();
+          } else {
+            this.formGroup.enable();
+          }
         }
       })
     );
@@ -471,14 +480,15 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   getLinkedEditRolesRoute(): Observable<string> {
     return this.activeGroupLinkedDSO$.pipe(
+      hasValueOperator(),
       map((dso: DSpaceObject) => {
         switch ((dso as any).type) {
           case Community.type.value:
             return getCommunityEditRolesRoute(dso.id);
           case Collection.type.value:
             return getCollectionEditRolesRoute(dso.id);
         }
-      })
+      }),
     );
   }
 }