diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/Prefilling.java b/dmp-backend/core/src/main/java/eu/eudat/model/Prefilling.java index b23e44a3d..d8187e0c8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/Prefilling.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/Prefilling.java @@ -10,7 +10,7 @@ public class Prefilling { private String label; public static final String _label = "label"; - private Map data; + private Map data; public static final String _data = "data"; private String key; public static final String _key = "key"; @@ -33,11 +33,11 @@ public class Prefilling { this.label = label; } - public Map getData() { + public Map getData() { return data; } - public void setData(Map data) { + public void setData(Map data) { this.data = data; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPrefillingRequest.java similarity index 56% rename from dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java rename to dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPrefillingRequest.java index 4d622c99a..279525d21 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPrefillingRequest.java @@ -1,6 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; +import gr.cite.tools.validation.ValidatorFactory; import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; @@ -16,14 +17,11 @@ import java.util.List; import java.util.Map; import java.util.UUID; -public class DescriptionProfilingRequest { +public class DescriptionPrefillingRequest { - private Map data; + private DescriptionPrefillingRequestData data; public static final String _data = "data"; - private String prefillId; - public static final String _prefillId = "prefillId"; - private UUID prefillingSourceId; public static final String _prefillingSourceId = "prefillingSourceId"; @@ -35,22 +33,14 @@ public class DescriptionProfilingRequest { private BaseFieldSet project; public static final String _project = "project"; - public Map getData() { + public DescriptionPrefillingRequestData getData() { return data; } - public void setData(Map data) { + public void setData(DescriptionPrefillingRequestData data) { this.data = data; } - public String getPrefillId() { - return prefillId; - } - - public void setPrefillId(String prefillId) { - this.prefillId = prefillId; - } - public UUID getPrefillingSourceId() { return prefillingSourceId; } @@ -77,44 +67,46 @@ public class DescriptionProfilingRequest { @Component(DescriptionProfilingRequestValidator.ValidatorName) @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) - public static class DescriptionProfilingRequestValidator extends BaseValidator { + public static class DescriptionProfilingRequestValidator extends BaseValidator { public static final String ValidatorName = "DescriptionProfilingRequestValidator"; private final MessageSource messageSource; + private final ValidatorFactory validatorFactory; - protected DescriptionProfilingRequestValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) { + protected DescriptionProfilingRequestValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { super(conventionService, errors); this.messageSource = messageSource; + this.validatorFactory = validatorFactory; } @Override - protected Class modelClass() { - return DescriptionProfilingRequest.class; + protected Class modelClass() { + return DescriptionPrefillingRequest.class; } @Override - protected List specifications(DescriptionProfilingRequest item) { + protected List specifications(DescriptionPrefillingRequest item) { return Arrays.asList( this.spec() .must(() -> this.isValidGuid(item.getDescriptionTemplateId())) - .failOn(DescriptionProfilingRequest._descriptionTemplateId).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionProfilingRequest._descriptionTemplateId}, LocaleContextHolder.getLocale())), + .failOn(DescriptionPrefillingRequest._descriptionTemplateId).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPrefillingRequest._descriptionTemplateId}, LocaleContextHolder.getLocale())), this.spec() .must(() -> this.isValidGuid(item.getPrefillingSourceId())) - .failOn(DescriptionProfilingRequest._prefillingSourceId).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionProfilingRequest._prefillingSourceId}, LocaleContextHolder.getLocale())), + .failOn(DescriptionPrefillingRequest._prefillingSourceId).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPrefillingRequest._prefillingSourceId}, LocaleContextHolder.getLocale())), + this.refSpec() + .iff(() -> !this.isNull(item.getData())) + .on(DescriptionReferencePersist._reference) + .over(item.getData()) + .using(() -> this.validatorFactory.validator(DescriptionPrefillingRequestData.DescriptionPrefillingRequestDataValidator.class)), this.spec() - .must(() -> !this.isEmpty(item.getPrefillId())) - .failOn(DescriptionProfilingRequest._prefillId).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionProfilingRequest._prefillId}, LocaleContextHolder.getLocale())) -// this.spec() -// .must(() -> item.getData() != null) -// .failOn(DescriptionProfilingWithDataRequest._data).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionProfilingWithDataRequest._data}, LocaleContextHolder.getLocale())) -// this.spec() -// .must(() -> item.getProject() != null) -// .failOn(DescriptionProfilingWithDataRequest._project).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionProfilingWithDataRequest._project}, LocaleContextHolder.getLocale())) + .must(() -> !this.isNull(item.getData())) + .failOn(DescriptionPrefillingRequest._data).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPrefillingRequest._data}, LocaleContextHolder.getLocale())) ); } } } + diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPrefillingRequestData.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPrefillingRequestData.java new file mode 100644 index 000000000..bc9328a69 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPrefillingRequestData.java @@ -0,0 +1,71 @@ +package eu.eudat.model.persist; + +import eu.eudat.commons.validation.BaseValidator; +import eu.eudat.convention.ConventionService; +import eu.eudat.errorcode.ErrorThesaurusProperties; +import gr.cite.tools.validation.specification.Specification; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Scope; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Component; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DescriptionPrefillingRequestData { + + private HashMap data; + public static final String _data = "data"; + + private String id; + public static final String _id = "id"; + + public HashMap getData() { + return data; + } + + public void setData(HashMap data) { + this.data = data; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + @Component(DescriptionPrefillingRequestDataValidator.ValidatorName) + @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) + public static class DescriptionPrefillingRequestDataValidator extends BaseValidator { + + public static final String ValidatorName = "DescriptionPrefillingRequestDataValidator"; + + private final MessageSource messageSource; + + + protected DescriptionPrefillingRequestDataValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) { + super(conventionService, errors); + this.messageSource = messageSource; + } + + @Override + protected Class modelClass() { + return DescriptionPrefillingRequestData.class; + } + + @Override + protected List specifications(DescriptionPrefillingRequestData item) { + return Arrays.asList( + this.spec() + .must(() -> !this.isEmpty(item.getId())) + .failOn(DescriptionPrefillingRequestData._id).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPrefillingRequestData._id}, LocaleContextHolder.getLocale())) + ); + } + } + +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/maintenance/MaintenanceService.java b/dmp-backend/core/src/main/java/eu/eudat/service/maintenance/MaintenanceService.java index ea7dbcd56..597d932b0 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/maintenance/MaintenanceService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/maintenance/MaintenanceService.java @@ -1,24 +1,6 @@ package eu.eudat.service.maintenance; -import eu.eudat.model.Description; -import eu.eudat.model.Prefilling; -import eu.eudat.model.PrefillingSource; -import eu.eudat.model.persist.DescriptionProfilingRequest; -import eu.eudat.model.persist.PrefillingSearchRequest; -import eu.eudat.model.persist.PrefillingSourcePersist; -import gr.cite.tools.exception.MyApplicationException; -import gr.cite.tools.exception.MyForbiddenException; -import gr.cite.tools.exception.MyNotFoundException; -import gr.cite.tools.exception.MyValidationException; -import gr.cite.tools.fieldset.FieldSet; -import jakarta.xml.bind.JAXBException; -import org.xml.sax.SAXException; - import javax.management.InvalidApplicationException; -import javax.xml.parsers.ParserConfigurationException; -import java.io.IOException; -import java.util.List; -import java.util.UUID; public interface MaintenanceService { diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceService.java b/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceService.java index fc5cbe4c2..c1bbde14f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceService.java @@ -4,7 +4,7 @@ import eu.eudat.model.Description; import eu.eudat.model.Prefilling; import eu.eudat.model.PrefillingSource; import eu.eudat.model.persist.PrefillingSearchRequest; -import eu.eudat.model.persist.DescriptionProfilingRequest; +import eu.eudat.model.persist.DescriptionPrefillingRequest; import eu.eudat.model.persist.PrefillingSourcePersist; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyForbiddenException; @@ -28,6 +28,6 @@ public interface PrefillingSourceService { List searchPrefillings(PrefillingSearchRequest model); - Description getPrefilledDescription(DescriptionProfilingRequest model, FieldSet fields) throws JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, InvalidApplicationException; + Description getPrefilledDescription(DescriptionPrefillingRequest model, FieldSet fields) throws JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, InvalidApplicationException; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceServiceImpl.java index a83cff3c8..8d7cad65d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/prefillingsource/PrefillingSourceServiceImpl.java @@ -25,7 +25,7 @@ import eu.eudat.model.builder.PrefillingSourceBuilder; import eu.eudat.model.deleter.PrefillingSourceDeleter; import eu.eudat.model.descriptionproperties.*; import eu.eudat.model.persist.PrefillingSearchRequest; -import eu.eudat.model.persist.DescriptionProfilingRequest; +import eu.eudat.model.persist.DescriptionPrefillingRequest; import eu.eudat.model.persist.PrefillingSourcePersist; import eu.eudat.model.persist.externalfetcher.*; import eu.eudat.model.persist.prefillingsourcedefinition.PrefillingSourceDefinitionFieldPersist; @@ -330,6 +330,7 @@ public class PrefillingSourceServiceImpl implements PrefillingSourceService { prefilling.setLabel(result.getOrDefault(Prefilling._label, null)); prefilling.setKey(result.getOrDefault(Prefilling._key, null)); prefilling.setTag(result.getOrDefault(Prefilling._tag, null)); + if (prefillingSourceDefinition.getGetConfiguration() == null) prefilling.setData(result); prefillings.add(prefilling); } @@ -339,7 +340,7 @@ public class PrefillingSourceServiceImpl implements PrefillingSourceService { return prefillings; } - public Description getPrefilledDescription(DescriptionProfilingRequest model, FieldSet fieldSet) throws JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, InvalidApplicationException { + public Description getPrefilledDescription(DescriptionPrefillingRequest model, FieldSet fieldSet) throws JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, InvalidApplicationException { PrefillingSourceEntity prefillingSourceEntity = this.queryFactory.query(PrefillingSourceQuery.class).ids(model.getPrefillingSourceId()).first(); if (prefillingSourceEntity == null) throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{model.getPrefillingSourceId(), PrefillingSource.class.getSimpleName()}, LocaleContextHolder.getLocale())); @@ -347,17 +348,16 @@ public class PrefillingSourceServiceImpl implements PrefillingSourceService { PrefillingSourceDefinitionEntity prefillingSourceDefinition = this.xmlHandlingService.fromXmlSafe(PrefillingSourceDefinitionEntity.class, prefillingSourceEntity.getDefinition()); if (prefillingSourceDefinition == null) throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{model.getPrefillingSourceId(), PrefillingSourceDefinition.class.getSimpleName()}, LocaleContextHolder.getLocale())); - ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(); - externalReferenceCriteria.setLike(model.getPrefillId()); - Map data = new HashMap<>(); if (prefillingSourceDefinition.getGetConfiguration() != null){ + ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(); + externalReferenceCriteria.setLike(model.getData().getId()); ExternalDataResult externalData = this.externalFetcherService.getExternalData(Stream.of(prefillingSourceDefinition.getGetConfiguration()).collect(Collectors.toList()), externalReferenceCriteria, null); if (externalData != null && !this.conventionService.isListNullOrEmpty(externalData.getResults())) { data = externalData.getResults().getFirst(); } } else { - data = model.getData() == null ? new HashMap<>() : model.getData(); + data = model.getData() == null ? new HashMap<>() : model.getData().getData(); } DescriptionTemplateEntity descriptionTemplateEntity = this.entityManager.find(DescriptionTemplateEntity.class, model.getDescriptionTemplateId()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/PrefillingSourceController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/PrefillingSourceController.java index cdc777ec9..21a40603e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/PrefillingSourceController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/PrefillingSourceController.java @@ -12,13 +12,12 @@ import eu.eudat.model.censorship.DescriptionCensor; import eu.eudat.model.censorship.PrefillingCensor; import eu.eudat.model.censorship.PrefillingSourceCensor; import eu.eudat.model.persist.PrefillingSearchRequest; -import eu.eudat.model.persist.DescriptionProfilingRequest; +import eu.eudat.model.persist.DescriptionPrefillingRequest; import eu.eudat.model.persist.PrefillingSourcePersist; import eu.eudat.model.result.QueryResult; import eu.eudat.query.PrefillingSourceQuery; import eu.eudat.query.lookup.PrefillingSourceLookup; import eu.eudat.service.prefillingsource.PrefillingSourceService; -import gr.cite.commons.web.authz.service.AuthorizationService; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.censor.CensorFactory; @@ -63,7 +62,6 @@ public class PrefillingSourceController { private final MessageSource messageSource; - private final AuthorizationService authorizationService; private final PrefillingSourceService prefillingSourceService; @@ -73,13 +71,12 @@ public class PrefillingSourceController { AuditService auditService, CensorFactory censorFactory, QueryFactory queryFactory, - MessageSource messageSource, AuthorizationService authorizationService, PrefillingSourceService prefillingSourceService) { + MessageSource messageSource, PrefillingSourceService prefillingSourceService) { this.builderFactory = builderFactory; this.auditService = auditService; this.censorFactory = censorFactory; this.queryFactory = queryFactory; this.messageSource = messageSource; - this.authorizationService = authorizationService; this.prefillingSourceService = prefillingSourceService; } @@ -162,8 +159,8 @@ public class PrefillingSourceController { } @PostMapping("generate") - @ValidationFilterAnnotation(validator = DescriptionProfilingRequest.DescriptionProfilingRequestValidator.ValidatorName, argumentName = "model") - public Description generate(@RequestBody DescriptionProfilingRequest model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, InvalidApplicationException { + @ValidationFilterAnnotation(validator = DescriptionPrefillingRequest.DescriptionProfilingRequestValidator.ValidatorName, argumentName = "model") + public Description generate(@RequestBody DescriptionPrefillingRequest model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, InvalidApplicationException { logger.debug(new MapLogEntry("persisting" + Prefilling.class.getSimpleName()).And("model", model)); this.censorFactory.censor(DescriptionCensor.class).censor(fieldSet, null); diff --git a/dmp-frontend/src/app/core/model/description-profiling-request/description-profiling-request.ts b/dmp-frontend/src/app/core/model/description-profiling-request/description-profiling-request.ts index 380c90024..ac07ba831 100644 --- a/dmp-frontend/src/app/core/model/description-profiling-request/description-profiling-request.ts +++ b/dmp-frontend/src/app/core/model/description-profiling-request/description-profiling-request.ts @@ -5,10 +5,14 @@ export interface PrefillingSearchRequest { prefillingSourceId: Guid; } -export interface DescriptionProfilingRequest { +export interface DescriptionPrefillingRequest { prefillingSourceId: Guid; descriptionTemplateId: Guid; - data: Map; - prefillId: string; + data: DescriptionPrefillingRequestData; project: string[]; -} \ No newline at end of file +} + +export interface DescriptionPrefillingRequestData { + data: Map; + id: string; +} diff --git a/dmp-frontend/src/app/core/model/prefilling-source/prefilling-source.ts b/dmp-frontend/src/app/core/model/prefilling-source/prefilling-source.ts index e77dcbe2f..4b888c7a8 100644 --- a/dmp-frontend/src/app/core/model/prefilling-source/prefilling-source.ts +++ b/dmp-frontend/src/app/core/model/prefilling-source/prefilling-source.ts @@ -32,6 +32,7 @@ export interface Prefilling { label: string, key: string, tag: string + data: Map } // Persist diff --git a/dmp-frontend/src/app/core/services/prefilling-source/prefilling-source.service.ts b/dmp-frontend/src/app/core/services/prefilling-source/prefilling-source.service.ts index f596027e5..807200b91 100644 --- a/dmp-frontend/src/app/core/services/prefilling-source/prefilling-source.service.ts +++ b/dmp-frontend/src/app/core/services/prefilling-source/prefilling-source.service.ts @@ -12,7 +12,7 @@ import { catchError, map } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; import { ConfigurationService } from '../configuration/configuration.service'; import { BaseHttpV2Service } from '../http/base-http-v2.service'; -import { PrefillingSearchRequest, DescriptionProfilingRequest } from '@app/core/model/description-profiling-request/description-profiling-request'; +import { DescriptionPrefillingRequest, PrefillingSearchRequest } from '@app/core/model/description-profiling-request/description-profiling-request'; import { Description } from '@app/core/model/description/description'; @Injectable() @@ -65,7 +65,7 @@ export class PrefillingSourceService { catchError((error: any) => throwError(error))); } - generate(item: DescriptionProfilingRequest, reqFields: string[] = []): Observable { + generate(item: DescriptionPrefillingRequest, reqFields: string[] = []): Observable { const url = `${this.apiBase}/generate`; const options = { params: { f: reqFields } }; @@ -113,4 +113,4 @@ export class PrefillingSourceService { return lookup; } -} \ No newline at end of file +} diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts index 8f2310bf2..02f9a4557 100644 --- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts @@ -191,6 +191,7 @@ export class PrefillingSourceEditorComponent extends BaseEditor{{'PREFILL-DESCRIPTION-DIALOG.SEARCH-HEADER' | translate}} - diff --git a/dmp-frontend/src/app/ui/description/editor/prefill-description/prefill-description.component.ts b/dmp-frontend/src/app/ui/description/editor/prefill-description/prefill-description.component.ts index 7824f8972..76281851d 100644 --- a/dmp-frontend/src/app/ui/description/editor/prefill-description/prefill-description.component.ts +++ b/dmp-frontend/src/app/ui/description/editor/prefill-description/prefill-description.component.ts @@ -1,7 +1,7 @@ import { Component, Inject, OnInit } from "@angular/core"; import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms"; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material/dialog"; -import { PrefillingSearchRequest, DescriptionProfilingRequest } from "@app/core/model/description-profiling-request/description-profiling-request"; +import { DescriptionPrefillingRequest, PrefillingSearchRequest } from "@app/core/model/description-profiling-request/description-profiling-request"; import { DescriptionTemplate } from "@app/core/model/description-template/description-template"; import { Dmp } from "@app/core/model/dmp/dmp"; import { Prefilling } from "@app/core/model/prefilling-source/prefilling-source"; @@ -62,7 +62,7 @@ export class PrefillDescriptionDialogComponent extends BaseComponent implements type: this.fb.control(false), descriptionTemplateId: this.fb.control(null, Validators.required), prefillingSourceId: this.fb.control(null, Validators.required), - prefillId: this.fb.control(null, Validators.required), + data: this.fb.control(null, Validators.required), }) // if (this.data.availableProfiles && this.data.availableProfiles.length === 1) { // this.addProfileIfUsedLessThanMax(this.data.availableProfiles[0]); @@ -73,12 +73,12 @@ export class PrefillDescriptionDialogComponent extends BaseComponent implements displayFn: (item) => (item['label'].length > 60) ? (item['label'].substr(0, 60) + "...") : item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['id'], - valueAssign: (item) => item['id'], + valueAssign: (item) => item, }; } changePreffillingSource(){ - this.prefillForm.get('prefillId').setValue(null); + this.prefillForm.get('data').setValue(null); } // addProfileIfUsedLessThanMax(profile: DescriptionProfileModel) { @@ -210,7 +210,7 @@ export class PrefillDescriptionDialogComponent extends BaseComponent implements // } else { // this.closeDialog(); // } - const formData = this.formService.getValue(this.prefillForm.value) as DescriptionProfilingRequest; + const formData = this.formService.getValue(this.prefillForm.value) as DescriptionPrefillingRequest; this.prefillingSourceService.generate(formData, DescriptionEditorResolver.descriptionTemplateLookupFields(nameof(x => x.descriptionTemplate))) .pipe(takeUntil(this._destroyed)).subscribe(description => { @@ -226,4 +226,4 @@ export class PrefillDescriptionDialogComponent extends BaseComponent implements closeDialog(result = null): void { this.dialogRef.close(result); } -} \ No newline at end of file +}