From 6911d6f6ad72dc6d1e17993b404ca7ba6ac8be5b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 22 Feb 2019 12:22:30 +0100
Subject: [PATCH] Implements MetadataValue and MetadataMap interfaces

---
 src/app/core/integration/models/authority.value.ts           | 3 ++-
 .../submission/models/workspaceitem-section-form.model.ts    | 5 +++--
 .../form/builder/models/form-field-metadata-value.model.ts   | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/core/integration/models/authority.value.ts b/src/app/core/integration/models/authority.value.ts
index 6e48983e6a..d493642213 100644
--- a/src/app/core/integration/models/authority.value.ts
+++ b/src/app/core/integration/models/authority.value.ts
@@ -2,11 +2,12 @@ import { IntegrationModel } from './integration.model';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { OtherInformation } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { MetadataValue } from '../../shared/metadata.interfaces';
 
 /**
  * Class representing an authority object
  */
-export class AuthorityValue extends IntegrationModel {
+export class AuthorityValue extends IntegrationModel implements MetadataValue {
 
   /**
    * The identifier of this authority
diff --git a/src/app/core/submission/models/workspaceitem-section-form.model.ts b/src/app/core/submission/models/workspaceitem-section-form.model.ts
index e0abad9130..116d34f1cc 100644
--- a/src/app/core/submission/models/workspaceitem-section-form.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-form.model.ts
@@ -1,5 +1,6 @@
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { MetadataMap } from '../../shared/metadata.interfaces';
 
-export interface WorkspaceitemSectionFormObject {
-  [metadata: string]: FormFieldMetadataValueObject;
+export interface WorkspaceitemSectionFormObject extends MetadataMap {
+  [metadata: string]: FormFieldMetadataValueObject[];
 }
diff --git a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
index a98b2d7d52..fdf4ce1f5d 100644
--- a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
+++ b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
@@ -1,12 +1,13 @@
 import { isEmpty, isNotEmpty, isNotNull } from '../../../empty.util';
 import { ConfidenceType } from '../../../../core/integration/models/confidence-type';
 import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { MetadataValue } from '../../../../core/shared/metadata.interfaces';
 
 export interface OtherInformation {
   [name: string]: string
 }
 
-export class FormFieldMetadataValueObject {
+export class FormFieldMetadataValueObject implements MetadataValue {
   metadata?: string;
   value: any;
   display: string;