Several fixes after merge with main

This commit is contained in:
Giuseppe Digilio
2020-12-04 14:16:40 +01:00
parent 948e002225
commit 84840678d2
35 changed files with 136 additions and 151 deletions

View File

@@ -2,21 +2,19 @@ import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { Observable } from 'rxjs';
import {flatMap, take} from 'rxjs/operators';
import { mergeMap, take } from 'rxjs/operators';
import { ComColDataService } from '../../../core/data/comcol-data.service';
import { CommunityDataService } from '../../../core/data/community-data.service';
import { RemoteData } from '../../../core/data/remote-data';
import { RouteService } from '../../../core/services/route.service';
import { Community } from '../../../core/shared/community.model';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import {
getFirstSucceededRemoteDataPayload,
} from '../../../core/shared/operators';
import { getFirstSucceededRemoteDataPayload, } from '../../../core/shared/operators';
import { ResourceType } from '../../../core/shared/resource-type';
import {hasValue, isNotEmpty, isNotUndefined} from '../../empty.util';
import { hasValue, isNotEmpty, isNotUndefined } from '../../empty.util';
import { NotificationsService } from '../../notifications/notifications.service';
import { RequestParam } from '../../../core/cache/models/request-param.model';
import {RequestService} from '../../../core/data/request.service';
import { RequestService } from '../../../core/data/request.service';
/**
* Component representing the create page for communities and collections
@@ -82,11 +80,11 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
this.parentUUID$.pipe(
take(1),
flatMap((uuid: string) => {
mergeMap((uuid: string) => {
const params = uuid ? [new RequestParam('parent', uuid)] : [];
return this.dsoDataService.create(dso, ...params)
.pipe(getFirstSucceededRemoteDataPayload()
)
);
}))
.subscribe((dsoRD: TDomain) => {
if (isNotUndefined(dsoRD)) {