Merge branch 'main' into authorities_and_controlled_vocabularies

src/app/core/core.module.ts

@@ -164,6 +164,8 @@ import { VocabularyEntriesResponseParsingService } from './submission/vocabulari
 import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from './submission/vocabularies/vocabulary.service';
 import { VocabularyTreeviewService } from '../shared/vocabulary-treeview/vocabulary-treeview.service';
+import { ConfigurationDataService } from './data/configuration-data.service';
+import { ConfigurationProperty } from './shared/configuration-property.model';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -247,6 +249,7 @@ const PROVIDERS = [
   UploaderService,
   FileService,
   DSpaceObjectDataService,
+  ConfigurationDataService,
   DSOChangeAnalyzer,
   DefaultChangeAnalyzer,
   ArrayMoveChangeAnalyzer,
@@ -357,7 +360,8 @@ export const models =
     Registration,
     Vocabulary,
     VocabularyEntry,
-    VocabularyEntryDetail
+    VocabularyEntryDetail,
+    ConfigurationProperty
   ];
 
 @NgModule({