[DSC-714] Set authority value only when is provided by the VocabularyEntryDetail object

Author: atarix83

src/app/core/json-patch/builder/json-patch-operations-builder.ts

@@ -157,7 +157,7 @@ export class JsonPatchOperationsBuilder {
         operationValue = new FormFieldMetadataValueObject(dateToISOFormat(value));
       }
     } else if (value instanceof VocabularyEntry) {
-      operationValue = this.prepareAuthorityValue(value);
+      operationValue = new FormFieldMetadataValueObject(value.value, null, value.securityLevel, value.authority);
     } else if (value instanceof FormFieldLanguageValueObject) {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language, securityLevel);
     } else if (value.hasOwnProperty('authority')) {
@@ -184,14 +184,4 @@ export class JsonPatchOperationsBuilder {
     return operationValue;
   }
 
-  protected prepareAuthorityValue(value: any): FormFieldMetadataValueObject {
-    let operationValue: FormFieldMetadataValueObject;
-    if (isNotEmpty(value.authority)) {
-      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.securityLevel, value.authority);
-    } else {
-      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.securityLevel,);
-    }
-    return operationValue;
-  }
-
 }

src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts

@@ -50,8 +50,6 @@ export class VocabularyEntry extends ListableObject {
   @autoserialize
   securityLevel: number;
 
-
-
   /**
    * A string representing the kind of vocabulary entry
    */

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

@@ -79,7 +79,6 @@
          [disabled]="model.readOnly"
          [type]="model.inputType"
          [value]="currentValue?.display"
-         [disabled]="model.readOnly"
          (focus)="onFocus($event)"
          (change)="onChange($event)"
          (click)="openTree($event)"

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts

@@ -29,6 +29,13 @@ describe('VocabularyTreeviewComponent test suite', () => {
   item.id = 'node1';
   const item2 = new VocabularyEntryDetail();
   item2.id = 'node2';
+  const entryWithAuthority = new VocabularyEntryDetail();
+  entryWithAuthority.authority = 'entryWithAuthority';
+  entryWithAuthority.id = 'entryWithAuthority';
+  entryWithAuthority.value = 'test';
+  const entryWithoutAuthority = new VocabularyEntryDetail();
+  entryWithoutAuthority.id = 'entryWithoutAuthority';
+  entryWithoutAuthority.value = 'test2';
   const emptyNodeMap = new Map<string, TreeviewFlatNode>();
   const storedNodeMap = new Map<string, TreeviewFlatNode>().set('test', new TreeviewFlatNode(item2));
   const nodeMap = new Map<string, TreeviewFlatNode>().set('test', new TreeviewFlatNode(item));
@@ -169,11 +176,31 @@ describe('VocabularyTreeviewComponent test suite', () => {
       expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(node.item, [], true);
     });
 
-    it('should emit select event', () => {
-      spyOn(comp, 'onSelect');
-      comp.onSelect(item);
+    it('should emit proper FormFieldMetadataValueObject when VocabularyEntryDetail has authority', () => {
+      spyOn(compAsAny, 'getSelectedEntryIds').and.returnValue([]);
+      spyOn(comp.select, 'emit');
+      comp.onSelect(entryWithAuthority);
 
-      expect(comp.onSelect).toHaveBeenCalledWith(item);
+      const expected = new FormFieldMetadataValueObject(entryWithAuthority.value, null, null, entryWithAuthority.authority);
+      expect(comp.select.emit).toHaveBeenCalledWith(expected);
+    });
+
+    it('should emit proper FormFieldMetadataValueObject when VocabularyEntryDetail has no authority', () => {
+      spyOn(compAsAny, 'getSelectedEntryIds').and.returnValue([]);
+      spyOn(comp.select, 'emit');
+      comp.onSelect(entryWithoutAuthority);
+
+      const expected = new FormFieldMetadataValueObject(entryWithoutAuthority.value);
+      expect(comp.select.emit).toHaveBeenCalledWith(expected);
+    });
+
+    it('should emit deselect when entry is already present', () => {
+      spyOn(compAsAny, 'getSelectedEntryIds').and.returnValue([entryWithAuthority.id]);
+      spyOn(comp.select, 'emit');
+      spyOn(comp.deselect, 'emit');
+      comp.onSelect(entryWithAuthority);
+
+      expect(comp.deselect.emit).toHaveBeenCalled();
     });
 
     it('should call searchByQuery function and set storedNodeMap properly', () => {

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts

@@ -248,7 +248,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
   onSelect(item: VocabularyEntryDetail) {
     if (!this.getSelectedEntryIds().includes(this.getEntryId(item))) {
       this.selectedItems.push(item);
-      this.select.emit(item);
+      this.select.emit(new FormFieldMetadataValueObject(item.value, null, item.securityLevel, item.authority, item.display));
     } else {
       this.selectedItems = this.selectedItems.filter((detail: VocabularyTreeItemType) => this.getEntryId(detail) !== this.getEntryId(item));
       this.deselect.emit(item);