diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 7183899c1c..a57823fe50 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -97,7 +97,6 @@ import { EndpointMockingRestService } from './dspace-rest-v2/endpoint-mocking-re import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../../config'; export const restServiceFactory = (cfg: GlobalConfig, mocks: MockResponseMap, http: HttpClient) => { - console.log('REST SERVICE FACTORY'); if (ENV_CONFIG.production) { return new DSpaceRESTv2Service(http); } else { diff --git a/src/app/core/dspace-rest-v2/mocks/mock-submission-response.json b/src/app/core/dspace-rest-v2/mocks/mock-submission-response.json index 1ab79f220e..b4b7a9852c 100644 --- a/src/app/core/dspace-rest-v2/mocks/mock-submission-response.json +++ b/src/app/core/dspace-rest-v2/mocks/mock-submission-response.json @@ -10,7 +10,7 @@ }, "label": "Journal Issue", "mandatory": true, - "repeatable": false, + "repeatable": true, "mandatoryMessage": "Required field!", "hints": "Select a journal issue for this publication.", "selectableMetadata": [ diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html index 90f45547c6..84c6e5bd8b 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html @@ -6,8 +6,14 @@
+
+ +
+ +
+
-
+
@@ -77,6 +83,9 @@
+
+ {{ 'form.no-results' | translate}} +
Selected {{selection.length}} items diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts index a13b42d634..160bb12f40 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts @@ -28,24 +28,32 @@ export class DsDynamicLookupRelationModalComponent implements OnInit { fieldName: string; resultsRD$: Observable>>>; searchConfig: PaginatedSearchOptions; - repeatable: boolean = true; + repeatable: boolean; selection: DSpaceObject[] = []; allSelected = false; - - constructor(protected modal: NgbActiveModal, private searchService: SearchService) { + queryInput; + searchQuery; + initialPagination = Object.assign(new PaginationComponentOptions(), { + id: 'submission-relation-list', + pageSize: 5 + });; + constructor(public modal: NgbActiveModal, private searchService: SearchService) { } ngOnInit(): void { this.fieldName = this.relationKey.substring(RELATION_TYPE_METADATA_PREFIX.length); - const pagination = Object.assign(new PaginationComponentOptions(), { - id: 'submission-relation-list', - pageSize: 5 - }); - this.onPaginationChange(pagination); + this.onPaginationChange(this.initialPagination); + } + + search() { + this.searchQuery = this.queryInput; + this.onPaginationChange(this.initialPagination); + this.deselectAll(); } onPaginationChange(pagination: PaginationComponentOptions) { this.searchConfig = new PaginatedSearchOptions({ + query: this.searchQuery, pagination: pagination, fixedFilter: RELATION_TYPE_FILTER_PREFIX + this.fieldName }); @@ -105,6 +113,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit { selectAll() { this.allSelected = true; const fullPagination = Object.assign(new PaginationComponentOptions(), { + query: this.searchQuery, currentPage: 1, pageSize: Number.POSITIVE_INFINITY }); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html index 9911074e09..e9d25e16dd 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html @@ -1,7 +1,7 @@ +
-
- -
+
+
- - -
+
+
    +
  • + + {{value.name}} + +
    • +
+
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts index 52ab49855e..f1d70ee453 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts @@ -11,11 +11,9 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component'; import { DynamicLookupRelationModel } from './dynamic-lookup-relation.model'; import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'; -import { RelationshipService } from '../../../../../../core/data/relationship.service'; @Component({ selector: 'ds-dynamic-lookup-relation', - // styleUrls: ['./dynamic-lookup-relation.component.scss'], templateUrl: './dynamic-lookup-relation.component.html' }) export class DsDynamicLookupRelationComponent extends DynamicFormControlComponent implements OnInit { @@ -30,34 +28,44 @@ export class DsDynamicLookupRelationComponent extends DynamicFormControlComponen modalRef: NgbModalRef; modalValuesString = ''; - currentObjects; + selectedResults: DSpaceObject[]; constructor(private modalService: NgbModal, protected layoutService: DynamicFormLayoutService, protected validationService: DynamicFormValidationService, - private relationshipService: RelationshipService ) { super(layoutService, validationService); } ngOnInit(): void { - this.currentObjects = this.relationshipService.getItemRelationshipLabels(); } - public hasEmptyValue() { - return isNotEmpty(this.model.value); + public hasResultsSelected() { + return isNotEmpty(this.selectedResults); } openLookup() { this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent); + this.modalRef.componentInstance.repeatable = this.model.repeatable; this.modalRef.componentInstance.relationKey = this.model.name; this.modalRef.result.then((resultList) => { - this.model.value = resultList; + this.selectedResults = resultList; this.modalValuesString = resultList.map((dso: DSpaceObject) => dso.name).join('; '); }); } - alert(t: string) { - alert(t); + add() { + if (isNotEmpty(this.model.value)) { + this.model.value = [...this.model.value, ...this.selectedResults]; + } else { + this.model.value = this.selectedResults; + } + + this.modalValuesString = ''; + this.selectedResults = []; + } + + removeSelection(uuid: string) { + this.model.value = this.model.value.filter((dso: DSpaceObject) => dso.uuid !== uuid); } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts index ae2f71c1f6..9530138305 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts @@ -5,12 +5,14 @@ export const DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_RELATION = 'LOOKUP_RELATION'; export interface DynamicLookupRelationModelConfig extends DsDynamicInputModelConfig { value?: any; + repeatable: boolean; } export class DynamicLookupRelationModel extends DsDynamicInputModel { @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_RELATION; @serializable() value: any[]; + @serializable() repeatable: boolean; constructor(config: DynamicLookupRelationModelConfig, layout?: DynamicFormControlLayout) { @@ -18,6 +20,7 @@ export class DynamicLookupRelationModel extends DsDynamicInputModel { this.readOnly = true; this.disabled = true; + this.repeatable = config.repeatable; this.valueUpdates.next(config.value); } } diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts index 28e3fb8fb5..7a64eb9f9b 100644 --- a/src/app/shared/form/builder/parsers/field-parser.ts +++ b/src/app/shared/form/builder/parsers/field-parser.ts @@ -27,6 +27,7 @@ export abstract class FieldParser { && (this.configData.input.type !== 'list') && (this.configData.input.type !== 'tag') && (this.configData.input.type !== 'group') + && (this.configData.input.type !== 'lookup-relation') ) { let arrayCounter = 0; let fieldArrayCounter = 0; diff --git a/src/app/shared/form/builder/parsers/lookup-relation-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-relation-field-parser.ts index e1b3864c64..202edfec8e 100644 --- a/src/app/shared/form/builder/parsers/lookup-relation-field-parser.ts +++ b/src/app/shared/form/builder/parsers/lookup-relation-field-parser.ts @@ -1,5 +1,8 @@ import { FieldParser } from './field-parser'; -import { DynamicLookupModel, DynamicLookupModelConfig } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model'; +import { + DynamicLookupModel, + DynamicLookupModelConfig +} from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model'; import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model'; import { DynamicLookupRelationModel, @@ -9,9 +12,9 @@ import { export class LookupRelationFieldParser extends FieldParser { public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any { - const lookupModelConfig: DynamicLookupRelationModelConfig = this.initModel(null, label); + const lookupModelConfig: DynamicLookupRelationModelConfig = this.initModel(null, label); + lookupModelConfig.repeatable = this.configData.repeatable; - - return new DynamicLookupRelationModel(lookupModelConfig); + return new DynamicLookupRelationModel(lookupModelConfig); } } diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html index 6170764108..65843b9eee 100644 --- a/src/app/shared/form/form.component.html +++ b/src/app/shared/form/form.component.html @@ -12,10 +12,10 @@ (dfFocus)="onFocus($event)"> - +
-
+
- +
-
+