[DSC-1565][CST-13645] Fix issue with type-bind when using controlled vocabulary for dc.type

Author: atarix83

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts

@@ -11,15 +11,14 @@ import {
   REQUIRED_MATCHER_PROVIDER,
 } from '@ng-dynamic-forms/core';
 
-import {
-  mockInputWithTypeBindModel, MockRelationModel
-} from '../../../mocks/form-models.mock';
+import { mockInputWithTypeBindModel, MockRelationModel } from '../../../mocks/form-models.mock';
 import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import {UntypedFormControl, ReactiveFormsModule} from '@angular/forms';
+import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
 import { FormBuilderService } from '../form-builder.service';
 import { getMockFormBuilderService } from '../../../mocks/form-builder-service.mock';
 import { Injector } from '@angular/core';
+import { VocabularyEntryDetail } from '../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
 describe('DSDynamicTypeBindRelationService test suite', () => {
   let service: DsDynamicTypeBindRelationService;
@@ -42,17 +41,17 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
     (relationService: DsDynamicTypeBindRelationService,
      formRelationService: DynamicFormRelationService,
     ) => {
-    service = relationService;
-    dynamicFormRelationService = formRelationService;
-  }));
+      service = relationService;
+      dynamicFormRelationService = formRelationService;
+    }));
 
   describe('Test getTypeBindValue method', () => {
     it('Should get type bind "boundType" from the given metadata object value', () => {
-        const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
-          'boundType', null, null, null,'Bound Type'
-        );
-        const bindType = service.getTypeBindValue(mockMetadataValueObject);
-        expect(bindType).toBe('boundType');
+      const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
+        'boundType', null, null, null, 'Bound Type'
+      );
+      const bindType = service.getTypeBindValue(mockMetadataValueObject);
+      expect(bindType).toBe('boundType');
     });
     it('Should get type authority key "bound-auth-key" from the given metadata object value', () => {
       const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
@@ -61,6 +60,19 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
       const bindType = service.getTypeBindValue(mockMetadataValueObject);
       expect(bindType).toBe('bound-auth-key');
     });
+    it('Should get type bind "boundType" from the given vocabulary entry object value', () => {
+      const vocabularyEntry = new VocabularyEntryDetail();
+      vocabularyEntry.value = vocabularyEntry.display = 'boundType';
+      const bindType = service.getTypeBindValue(vocabularyEntry);
+      expect(bindType).toBe('boundType');
+    });
+    it('Should get type authority key "bound-auth-key" from the given vocabulary entry object value', () => {
+      const vocabularyEntry = new VocabularyEntryDetail();
+      vocabularyEntry.id = vocabularyEntry.authority = 'bound-auth-key';
+      vocabularyEntry.value = vocabularyEntry.display = 'boundType';
+      const bindType = service.getTypeBindValue(vocabularyEntry);
+      expect(bindType).toBe('bound-auth-key');
+    });
     it('Should get passed string returned directly as string passed instead of metadata', () => {
       const bindType = service.getTypeBindValue('rawString');
       expect(bindType).toBe('rawString');

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts

@@ -11,14 +11,16 @@ import {
   DynamicFormControlMatcher,
   DynamicFormControlModel,
   DynamicFormControlRelation,
-  DynamicFormRelationService, MATCH_VISIBLE,
+  DynamicFormRelationService,
+  MATCH_VISIBLE,
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
-import {hasNoValue, hasValue} from '../../../empty.util';
+import { hasNoValue, hasValue } from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+import { VocabularyEntry } from '../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 
 /**
  * Service to manage type binding for submission input fields
@@ -38,11 +40,11 @@ export class DsDynamicTypeBindRelationService {
    * @param bindModelValue
    * @private
    */
-  public getTypeBindValue(bindModelValue: string | FormFieldMetadataValueObject): string {
+  public getTypeBindValue(bindModelValue: string | FormFieldMetadataValueObject | VocabularyEntry): string {
     let value;
     if (hasNoValue(bindModelValue) || typeof bindModelValue === 'string') {
       value = bindModelValue;
-    } else if (bindModelValue instanceof FormFieldMetadataValueObject
+    } else if ((bindModelValue instanceof FormFieldMetadataValueObject || bindModelValue instanceof VocabularyEntry)
       && bindModelValue.hasAuthority()) {
       value = bindModelValue.authority;
     } else {

src/config/config.util.spec.ts

@@ -21,7 +21,8 @@ describe('Config Util', () => {
         'dc.identifier.scopus',
         'dc.identifier.isi',
         'dcterms.dateSubmitted',
-        'dc.identifier.applicationnumber'
+        'dc.identifier.applicationnumber',
+        'dc.type'
       ]);
 
       expect(appConfig.themes.length).toEqual(1);

src/config/default-app-config.ts

@@ -157,7 +157,7 @@ export class DefaultAppConfig implements AppConfig {
   submission: SubmissionConfig = {
     autosave: {
       // NOTE: which metadata trigger an autosave
-      metadata: ['dc.title', 'dc.identifier.doi', 'dc.identifier.pmid', 'dc.identifier.arxiv', 'dc.identifier.patentno', 'dc.identifier.scopus', 'dc.identifier.isi', 'dcterms.dateSubmitted', 'dc.identifier.applicationnumber'],
+      metadata: ['dc.title', 'dc.identifier.doi', 'dc.identifier.pmid', 'dc.identifier.arxiv', 'dc.identifier.patentno', 'dc.identifier.scopus', 'dc.identifier.isi', 'dcterms.dateSubmitted', 'dc.identifier.applicationnumber', 'dc.type'],
       /**
        * NOTE: after how many time (milliseconds) submission is saved automatically
        * eg. timer: 5 * (1000 * 60); // 5 minutes