hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 11:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

54472: Send normalized collections/communities instead of FormData

Browse Source
This commit is contained in:
Kristof De Langhe
2018-11-06 09:57:27 +01:00
parent 1fc9359133
commit dd439109a4
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/+collection-page/create-collection-page/create-collection-page.component.ts
View File

@@ -9,6 +9,8 @@ import { Observable } from 'rxjs';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
import { RemoteData } from '../../core/data/remote-data'; import { RemoteData } from '../../core/data/remote-data';
import { isNotEmpty } from '../../shared/empty.util'; import { isNotEmpty } from '../../shared/empty.util';
import { NormalizedCollection } from '../../core/cache/models/normalized-collection.model';
import { ResourceType } from '../../core/shared/resource-type';
@Component({ @Component({
selector: 'ds-create-collection', selector: 'ds-create-collection',
@@ -36,7 +38,7 @@ export class CreateCollectionPageComponent {
onSubmit(data: any) { onSubmit(data: any) {
this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => { this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => {
const collection = Object.assign(new Collection(), { const collection = Object.assign(new NormalizedCollection(), {
name: data.name, name: data.name,
metadata: [ metadata: [
{ key: 'dc.description', value: data.introductory }, { key: 'dc.description', value: data.introductory },
@@ -44,7 +46,8 @@ export class CreateCollectionPageComponent {
{ key: 'dc.rights', value: data.copyright }, { key: 'dc.rights', value: data.copyright },
{ key: 'dc.rights.license', value: data.license } { key: 'dc.rights.license', value: data.license }
// TODO: metadata for news and provenance // TODO: metadata for news and provenance
] ],
type: ResourceType.Collection
}); });
this.collectionDataService.create(collection, uuid).subscribe((rd: RemoteData<Collection>) => { this.collectionDataService.create(collection, uuid).subscribe((rd: RemoteData<Collection>) => {
if (rd.hasSucceeded) { if (rd.hasSucceeded) {

7
src/app/+community-page/create-community-page/create-community-page.component.ts
View File

@@ -8,6 +8,8 @@ import { RemoteData } from '../../core/data/remote-data';
import { isNotEmpty } from '../../shared/empty.util'; import { isNotEmpty } from '../../shared/empty.util';
import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
import { ResourceType } from '../../core/shared/resource-type';
import { NormalizedCommunity } from '../../core/cache/models/normalized-community.model';
@Component({ @Component({
selector: 'ds-create-community', selector: 'ds-create-community',
@@ -34,14 +36,15 @@ export class CreateCommunityPageComponent {
onSubmit(data: any) { onSubmit(data: any) {
this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => { this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => {
const community = Object.assign(new Community(), { const community = Object.assign(new NormalizedCommunity(), {
name: data.name, name: data.name,
metadata: [ metadata: [
{ key: 'dc.description', value: data.introductory }, { key: 'dc.description', value: data.introductory },
{ key: 'dc.description.abstract', value: data.description }, { key: 'dc.description.abstract', value: data.description },
{ key: 'dc.rights', value: data.copyright } { key: 'dc.rights', value: data.copyright }
// TODO: metadata for news // TODO: metadata for news
] ],
type: ResourceType.Community
}); });
this.communityDataService.create(community, uuid).pipe(take(1)).subscribe((rd: RemoteData<DSpaceObject>) => { this.communityDataService.create(community, uuid).pipe(take(1)).subscribe((rd: RemoteData<DSpaceObject>) => {
if (rd.hasSucceeded) { if (rd.hasSucceeded) {

8
src/app/core/data/data.service.ts
View File

@@ -30,6 +30,8 @@ import {
} from '../shared/operators'; } from '../shared/operators';
import { DSOSuccessResponse, ErrorResponse, RestResponse } from '../cache/response.models'; import { DSOSuccessResponse, ErrorResponse, RestResponse } from '../cache/response.models';
import { NotificationOptions } from '../../shared/notifications/models/notification-options.model'; import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
export abstract class DataService<TNormalized extends NormalizedObject, TDomain> { export abstract class DataService<TNormalized extends NormalizedObject, TDomain> {
protected abstract requestService: RequestService; protected abstract requestService: RequestService;
@@ -128,7 +130,7 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
} }
} }
create(dso: TDomain, parentUUID: string): Observable<RemoteData<TDomain>> { create(dso: TNormalized, parentUUID: string): Observable<RemoteData<TDomain>> {
const requestId = this.requestService.generateRequestId(); const requestId = this.requestService.generateRequestId();
const endpoint$ = this.halService.getEndpoint(this.linkPath).pipe( const endpoint$ = this.halService.getEndpoint(this.linkPath).pipe(
isNotEmptyOperator(), isNotEmptyOperator(),
@@ -136,9 +138,11 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
map((endpoint: string) => parentUUID ? `${endpoint}?parent=${parentUUID}` : endpoint) map((endpoint: string) => parentUUID ? `${endpoint}?parent=${parentUUID}` : endpoint)
); );
const serializedDso = new DSpaceRESTv2Serializer(NormalizedObjectFactory.getConstructor(dso.type)).serialize(dso);
const request$ = endpoint$.pipe( const request$ = endpoint$.pipe(
take(1), take(1),
map((endpoint: string) => new CreateRequest(requestId, endpoint, dso)) map((endpoint: string) => new CreateRequest(requestId, endpoint, JSON.stringify(serializedDso)))
); );
// Execute the post request // Execute the post request