From a178e215f00e13468568f39717c0c268cc8c94d7 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 11 Sep 2020 15:35:50 +0200
Subject: [PATCH] Fixed issue with preparing patch operation's value when value
 has an authority id but is not an instance of VocabularyEntry or
 FormFieldMetadataValueObject

---
 .../json-patch/builder/json-patch-operations-builder.ts     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/core/json-patch/builder/json-patch-operations-builder.ts b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
index 3755821bf9..ced3750834 100644
--- a/src/app/core/json-patch/builder/json-patch-operations-builder.ts
+++ b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
@@ -134,6 +134,8 @@ export class JsonPatchOperationsBuilder {
       operationValue = this.prepareAuthorityValue(value);
     } else if (value instanceof FormFieldLanguageValueObject) {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language);
+    } else if (value.hasOwnProperty('authority')) {
+      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.authority);
     } else if (value.hasOwnProperty('value')) {
       operationValue = new FormFieldMetadataValueObject(value.value);
     } else {
@@ -149,8 +151,8 @@ export class JsonPatchOperationsBuilder {
     return operationValue;
   }
 
-  protected prepareAuthorityValue(value: any) {
-    let operationValue: any = null;
+  protected prepareAuthorityValue(value: any): FormFieldMetadataValueObject {
+    let operationValue: FormFieldMetadataValueObject;
     if (isNotEmpty(value.authority)) {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.authority);
     } else {