DigitaleBibliothek / Frontend / cbbac013130

Commits

Davide Negretti authored cbbac013130 24 Aug 2021

[CST-4058] bug fixed

src/app/access-control/group-registry/group-form/group-form.component.ts

Modified

-7
+  DynamicFormLayout,
-8
+  DynamicInputModel,
-9
+  DynamicTextAreaModel
-10
+} from '@ng-dynamic-forms/core';
-11
+import { TranslateService } from '@ngx-translate/core';
-12
+import {
-13
+  ObservedValueOf,
-14
+  combineLatest as observableCombineLatest,
-15
+  Observable,
-16
+  of as observableOf,
--
+  Subscription
-+
+  Subscription,
-18
+} from 'rxjs';
--
+import { catchError, map, switchMap, take } from 'rxjs/operators';
-+
+import { catchError, map, switchMap, take, filter } from 'rxjs/operators';
-20
+import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
-21
+import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
-22
+import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
-23
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-24
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-25
+import { PaginatedList } from '../../../core/data/paginated-list.model';
-26
+import { RemoteData } from '../../../core/data/remote-data';
-27
+import { RequestService } from '../../../core/data/request.service';
-28
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-29
+import { GroupDataService } from '../../../core/eperson/group-data.service';
-30
+import { Group } from '../../../core/eperson/models/group.model';
-31
+import { Collection } from '../../../core/shared/collection.model';
-32
+import { Community } from '../../../core/shared/community.model';
-33
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-34
+import {
-35
+  getRemoteDataPayload,
-36
+  getFirstSucceededRemoteData,
--
+  getFirstCompletedRemoteData
-+
+  getFirstCompletedRemoteData,
-+
+  getFirstSucceededRemoteDataPayload
-39
+} from '../../../core/shared/operators';
-40
+import { AlertType } from '../../../shared/alert/aletr-type';
-41
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-42
+import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
-43
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-44
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
-45
+import { followLink } from '../../../shared/utils/follow-link-config.model';
-46
+import { NoContent } from '../../../core/shared/NoContent.model';
-47
+import { Operation } from 'fast-json-patch';
-48
-120
+   */
-121
+  canEdit$: Observable<boolean>;
-122
-123
+  /**
-124
+   * The AlertType enumeration
-125
+   * @type {AlertType}
-126
+   */
-127
+  public AlertTypeEnum = AlertType;
-128
-129
+  constructor(public groupDataService: GroupDataService,
--
+              private ePersonDataService: EPersonDataService,
--
+              private dSpaceObjectDataService: DSpaceObjectDataService,
--
+              private formBuilderService: FormBuilderService,
--
+              private translateService: TranslateService,
--
+              private notificationsService: NotificationsService,
--
+              private route: ActivatedRoute,
--
+              protected router: Router,
--
+              private authorizationService: AuthorizationDataService,
--
+              private modalService: NgbModal,
--
+              public requestService: RequestService) {
-+
+    private ePersonDataService: EPersonDataService,
-+
+    private dSpaceObjectDataService: DSpaceObjectDataService,
-+
+    private formBuilderService: FormBuilderService,
-+
+    private translateService: TranslateService,
-+
+    private notificationsService: NotificationsService,
-+
+    private route: ActivatedRoute,
-+
+    protected router: Router,
-+
+    private authorizationService: AuthorizationDataService,
-+
+    private modalService: NgbModal,
-+
+    public requestService: RequestService) {
-140
+  }
-141
-142
+  ngOnInit() {
-143
+    this.initialisePage();
-144
+  }
-145
-146
+  initialisePage() {
-147
+    this.subs.push(this.route.params.subscribe((params) => {
-148
+      if (params.groupId !== 'newGroup') {
-149
+        this.setActiveGroup(params.groupId);
-182
+        readOnly: true,
-183
+      });
-184
+      this.groupDescription = new DynamicTextAreaModel({
-185
+        id: 'groupDescription',
-186
+        label: groupDescription,
-187
+        name: 'groupDescription',
-188
+        required: false,
-189
+      });
-190
+      this.formModel = [
-191
+        this.groupName,
--
+        this.groupCommunity,
-+
+        // this.groupCommunity,
-193
+        this.groupDescription,
-194
+      ];
-195
+      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-+
+      debugger;
-197
+      this.subs.push(
-198
+        observableCombineLatest(
-199
+          this.groupDataService.getActiveGroup(),
--
+          this.canEdit$
--
+        ).subscribe(([activeGroup, canEdit]) => {
-+
+          this.canEdit$,
-+
+          this.groupDataService.getActiveGroup()
-+
+            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload())))
-+
+        ).subscribe(([activeGroup, canEdit, linkedObject]) => {
-+
-205
+          if (activeGroup != null) {
-206
+            this.groupBeingEdited = activeGroup;
--
+            this.getLinkedDSO(activeGroup).subscribe((res) => {
--
+              if (res?.payload?.name) {
--
+                this.formGroup.patchValue({
--
+                  groupName: activeGroup != null ? activeGroup.name : '',
--
+                  groupCommunity: res?.payload?.name ?? '',
--
+                  groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
--
+                });
--
+              } else {
--
+                this.formModel = [
--
+                  this.groupName,
--
+                  this.groupDescription,
--
+                ];
--
+                this.formGroup.patchValue({
--
+                  groupName: activeGroup != null ? activeGroup.name : '',
--
+                  groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
--
+                });
--
+              }
-+
-+
+            if (linkedObject?.name) {
-+
+              // this.formModel = [
-+
+              //   this.groupName,
-+
+              //   this.groupCommunity,
-+
+              //   this.groupDescription,
-+
+              // ];
-+
+              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
-+
+              this.formGroup.patchValue({
-+
+                groupName: activeGroup != null ? activeGroup.name : '',
-+
+                groupCommunity: linkedObject?.name ?? '',
-+
+                groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
-+
+              });
-+
+            } else {
-+
+              this.formModel = [
-+
+                this.groupName,
-+
+                this.groupDescription,
-+
+              ];
-+
+              this.formGroup.patchValue({
-+
+                groupName: activeGroup != null ? activeGroup.name : '',
-+
+                groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
-+
+              });
-+
+            }
-+
+            setTimeout(() => {
-231
+              if (!canEdit || activeGroup.permanent) {
-232
+                this.formGroup.disable();
-233
+              }
--
+            });
-+
+            }, 200);
-235
+          }
-236
+        })
-237
+      );
-238
+    });
-239
+  }
-240
-241
+  /**
-242
+   * Stop editing the currently selected group
-243
+   */
-244
+  onCancel() {

Frontend

Commits

Jira Issues

Add shortcut