[DURACOM-191] move data services to map

src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts

@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import {
   FindAllData,
   FindAllDataImpl,
@@ -16,14 +15,12 @@ import { RequestService } from '../../../core/data/request.service';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { LDN_SERVICE_CONSTRAINT_FILTERS } from '../ldn-services-model/ldn-service.resource-type';
 import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the itemfilters endpoint
  */
 @Injectable({ providedIn: 'root' })
-@dataService(LDN_SERVICE_CONSTRAINT_FILTERS)
 export class LdnItemfiltersService extends IdentifiableDataService<Itemfilter> implements FindAllData<Itemfilter> {
   private findAllData: FindAllDataImpl<Itemfilter>;
 

src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts

@@ -13,7 +13,6 @@ import {
   CreateData,
   CreateDataImpl,
 } from '../../../core/data/base/create-data';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import {
   DeleteData,
   DeleteDataImpl,
@@ -42,7 +41,6 @@ import { URLCombiner } from '../../../core/url-combiner/url-combiner';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { LdnServiceConstrain } from '../ldn-services-model/ldn-service.constrain.model';
-import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
 import { LdnService } from '../ldn-services-model/ldn-services.model';
 
 /**
@@ -57,7 +55,6 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
  * @implements {CreateData<LdnService>}
  */
 @Injectable({ providedIn: 'root' })
-@dataService(LDN_SERVICE)
 export class LdnServicesService extends IdentifiableDataService<LdnService> implements FindAllData<LdnService>, DeleteData<LdnService>, PatchData<LdnService>, CreateData<LdnService> {
   createData: CreateDataImpl<LdnService>;
   private findAllData: FindAllDataImpl<LdnService>;

src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts

@@ -15,7 +15,6 @@ import {
 
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { PostRequest } from '../../../core/data/request.models';
@@ -29,7 +28,6 @@ import {
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
-import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';
 
 /**
  * Injectable service responsible for fetching/sending data from/to the REST API on the messages' endpoint.
@@ -39,7 +37,6 @@ import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-ty
  * @extends {IdentifiableDataService<AdminNotifyMessage>}
  */
 @Injectable({ providedIn: 'root' })
-@dataService(ADMIN_NOTIFY_MESSAGE)
 export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNotifyMessage> {
 
   protected reprocessEndpoint = 'enqueueretry';

src/app/core/config/submission-forms-config-data.service.ts

@@ -4,20 +4,17 @@ import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from '../data/base/data-service.decorator';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ConfigDataService } from './config-data.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionFormsModel } from './models/config-submission-forms.model';
-import { SUBMISSION_FORMS_TYPE } from './models/config-type';
 
 /**
  * Data service to retrieve submission form configuration objects from the REST server.
  */
 @Injectable({ providedIn: 'root' })
-@dataService(SUBMISSION_FORMS_TYPE)
 export class SubmissionFormsConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,

src/app/core/data-services-map.ts

@@ -1,9 +1,17 @@
 import { LazyDataServicesMap } from '../../config/app-config.interface';
+import {
+  LDN_SERVICE,
+  LDN_SERVICE_CONSTRAINT_FILTERS,
+} from '../admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type';
+import { ADMIN_NOTIFY_MESSAGE } from '../admin/admin-notify-dashboard/models/admin-notify-message.resource-type';
+import { NOTIFYREQUEST } from '../item-page/simple/notify-requests-status/notify-requests-status.resource-type';
 import { PROCESS } from '../process-page/processes/process.resource-type';
 import { SCRIPT } from '../process-page/scripts/script.resource-type';
 import { ACCESS_STATUS } from '../shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
+import { DUPLICATE } from '../shared/object-list/duplicate-data/duplicate.resource-type';
 import { IDENTIFIERS } from '../shared/object-list/identifier-data/identifier-data.resource-type';
 import { SUBSCRIPTION } from '../shared/subscriptions/models/subscription.resource-type';
+import { SUBMISSION_COAR_NOTIFY_CONFIG } from '../submission/sections/section-coar-notify/section-coar-notify-service.resource-type';
 import { SYSTEMWIDEALERT } from '../system-wide-alert/system-wide-alert.resource-type';
 import {
   BULK_ACCESS_CONDITION_OPTIONS,
@@ -19,6 +27,11 @@ import { WORKSPACEITEM } from './eperson/models/workspaceitem.resource-type';
 import { FEEDBACK } from './feedback/models/feedback.resource-type';
 import { METADATA_FIELD } from './metadata/metadata-field.resource-type';
 import { METADATA_SCHEMA } from './metadata/metadata-schema.resource-type';
+import { SUGGESTION_SOURCE } from './notifications/models/suggestion-source-object.resource-type';
+import { SUGGESTION_TARGET } from './notifications/models/suggestion-target-object.resource-type';
+import { QUALITY_ASSURANCE_EVENT_OBJECT } from './notifications/qa/models/quality-assurance-event-object.resource-type';
+import { QUALITY_ASSURANCE_SOURCE_OBJECT } from './notifications/qa/models/quality-assurance-source-object.resource-type';
+import { QUALITY_ASSURANCE_TOPIC_OBJECT } from './notifications/qa/models/quality-assurance-topic-object.resource-type';
 import { ORCID_HISTORY } from './orcid/model/orcid-history.resource-type';
 import { ORCID_QUEUE } from './orcid/model/orcid-queue.resource-type';
 import { RESEARCHER_PROFILE } from './profile/model/researcher-profile.resource-type';
@@ -42,6 +55,7 @@ import { SITE } from './shared/site.resource-type';
 import { VERSION } from './shared/version.resource-type';
 import { VERSION_HISTORY } from './shared/version-history.resource-type';
 import { USAGE_REPORT } from './statistics/models/usage-report.resource-type';
+import { CorrectionType } from './submission/models/correctiontype.model';
 import { SUBMISSION_CC_LICENSE } from './submission/models/submission-cc-licence.resource-type';
 import { SUBMISSION_CC_LICENSE_URL } from './submission/models/submission-cc-licence-link.resource-type';
 import {
@@ -107,7 +121,19 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = {
   [FEATURE.value]: () => import('./data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService),
   [DSPACE_OBJECT.value]: () => import('./data/dspace-object-data.service').then(m => m.DSpaceObjectDataService),
   [BITSTREAM_FORMAT.value]: () => import('./data/bitstream-format-data.service').then(m => m.BitstreamFormatDataService),
+  [SUBMISSION_COAR_NOTIFY_CONFIG.value]: () => import('../submission/sections/section-coar-notify/coar-notify-config-data.service').then(m => m.CoarNotifyConfigDataService),
+  [LDN_SERVICE_CONSTRAINT_FILTERS.value]: () => import('../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service').then(m => m.LdnItemfiltersService),
+  [LDN_SERVICE.value]: () => import('../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service').then(m => m.LdnServicesService),
+  [ADMIN_NOTIFY_MESSAGE.value]: () => import('../admin/admin-notify-dashboard/services/admin-notify-messages.service').then(m => m.AdminNotifyMessagesService),
   [SUBMISSION_FORMS_TYPE.value]: () => import('./config/submission-forms-config-data.service').then(m => m.SubmissionFormsConfigDataService),
+  [NOTIFYREQUEST.value]: () => import('./data/notify-services-status-data.service').then(m => m.NotifyRequestsStatusDataService),
+  [QUALITY_ASSURANCE_EVENT_OBJECT.value]: () => import('./notifications/qa/events/quality-assurance-event-data.service').then(m => m.QualityAssuranceEventDataService),
+  [QUALITY_ASSURANCE_SOURCE_OBJECT.value]: () => import('./notifications/qa/source/quality-assurance-source-data.service').then(m => m.QualityAssuranceSourceDataService),
+  [QUALITY_ASSURANCE_TOPIC_OBJECT.value]: () => import('./notifications/qa/topics/quality-assurance-topic-data.service').then(m => m.QualityAssuranceTopicDataService),
+  [SUGGESTION_SOURCE.value]: () => import('./notifications/source/suggestion-source-data.service').then(m => m.SuggestionSourceDataService),
+  [SUGGESTION_TARGET.value]: () => import('./notifications/target/suggestion-target-data.service').then(m => m.SuggestionTargetDataService),
+  [DUPLICATE.value]: () => import('./submission/submission-duplicate-data.service').then(m => m.SubmissionDuplicateDataService),
+  [CorrectionType.type.value]: () => import('./submission/correctiontype-data.service').then(m => m.CorrectionTypeDataService),
 };
 
 

src/app/core/data/notify-services-status-data.service.ts

@@ -6,18 +6,15 @@ import {
 } from 'rxjs';
 
 import { NotifyRequestsStatus } from '../../item-page/simple/notify-requests-status/notify-requests-status.model';
-import { NOTIFYREQUEST } from '../../item-page/simple/notify-requests-status/notify-requests-status.resource-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { dataService } from './base/data-service.decorator';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { RemoteData } from './remote-data';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
 
 @Injectable({ providedIn: 'root' })
-@dataService(NOTIFYREQUEST)
 export class NotifyRequestsStatusDataService extends IdentifiableDataService<NotifyRequestsStatus> {
 
   constructor(

src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts

@@ -21,7 +21,6 @@ import {
   CreateData,
   CreateDataImpl,
 } from '../../../data/base/create-data';
-import { dataService } from '../../../data/base/data-service.decorator';
 import {
   DeleteData,
   DeleteDataImpl,
@@ -48,13 +47,11 @@ import { HttpOptions } from '../../../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../../../shared/hal-endpoint.service';
 import { NoContent } from '../../../shared/NoContent.model';
 import { QualityAssuranceEventObject } from '../models/quality-assurance-event.model';
-import { QUALITY_ASSURANCE_EVENT_OBJECT } from '../models/quality-assurance-event-object.resource-type';
 
 /**
  * The service handling all Quality Assurance topic REST requests.
  */
 @Injectable({ providedIn: 'root' })
-@dataService(QUALITY_ASSURANCE_EVENT_OBJECT)
 export class QualityAssuranceEventDataService extends IdentifiableDataService<QualityAssuranceEventObject> {
 
   private createData: CreateData<QualityAssuranceEventObject>;

src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts

@@ -5,7 +5,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../cache/object-cache.service';
-import { dataService } from '../../../data/base/data-service.decorator';
 import {
   FindAllData,
   FindAllDataImpl,
@@ -21,13 +20,11 @@ import { RemoteData } from '../../../data/remote-data';
 import { RequestService } from '../../../data/request.service';
 import { HALEndpointService } from '../../../shared/hal-endpoint.service';
 import { QualityAssuranceSourceObject } from '../models/quality-assurance-source.model';
-import { QUALITY_ASSURANCE_SOURCE_OBJECT } from '../models/quality-assurance-source-object.resource-type';
 
 /**
  * The service handling all Quality Assurance source REST requests.
  */
 @Injectable({ providedIn: 'root' })
-@dataService(QUALITY_ASSURANCE_SOURCE_OBJECT)
 export class QualityAssuranceSourceDataService extends IdentifiableDataService<QualityAssuranceSourceObject> {
 
   private findAllData: FindAllData<QualityAssuranceSourceObject>;

src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts

@@ -5,7 +5,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../cache/object-cache.service';
-import { dataService } from '../../../data/base/data-service.decorator';
 import {
   FindAllData,
   FindAllDataImpl,
@@ -21,13 +20,11 @@ import { RemoteData } from '../../../data/remote-data';
 import { RequestService } from '../../../data/request.service';
 import { HALEndpointService } from '../../../shared/hal-endpoint.service';
 import { QualityAssuranceTopicObject } from '../models/quality-assurance-topic.model';
-import { QUALITY_ASSURANCE_TOPIC_OBJECT } from '../models/quality-assurance-topic-object.resource-type';
 
 /**
  * The service handling all Quality Assurance topic REST requests.
  */
 @Injectable({ providedIn: 'root' })
-@dataService(QUALITY_ASSURANCE_TOPIC_OBJECT)
 export class QualityAssuranceTopicDataService extends IdentifiableDataService<QualityAssuranceTopicObject> {
 
   private findAllData: FindAllData<QualityAssuranceTopicObject>;

src/app/core/notifications/source/suggestion-source-data.service.ts

@@ -8,7 +8,6 @@ import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { CoreState } from '../../core-state.model';
-import { dataService } from '../../data/base/data-service.decorator';
 import {
   FindAllData,
   FindAllDataImpl,
@@ -21,13 +20,11 @@ import { RemoteData } from '../../data/remote-data';
 import { RequestService } from '../../data/request.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { SuggestionSource } from '../models/suggestion-source.model';
-import { SUGGESTION_SOURCE } from '../models/suggestion-source-object.resource-type';
 
 /**
  * Service that retrieves Suggestion Source data
  */
 @Injectable({ providedIn: 'root' })
-@dataService(SUGGESTION_SOURCE)
 export class SuggestionSourceDataService extends IdentifiableDataService<SuggestionSource> {
 
   protected linkPath = 'suggestionsources';

src/app/core/notifications/target/suggestion-target-data.service.ts

@@ -9,7 +9,6 @@ import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.s
 import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { CoreState } from '../../core-state.model';
-import { dataService } from '../../data/base/data-service.decorator';
 import {
   FindAllData,
   FindAllDataImpl,
@@ -26,10 +25,8 @@ import { RemoteData } from '../../data/remote-data';
 import { RequestService } from '../../data/request.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { SuggestionTarget } from '../models/suggestion-target.model';
-import { SUGGESTION_TARGET } from '../models/suggestion-target-object.resource-type';
 
 @Injectable({ providedIn: 'root' })
-@dataService(SUGGESTION_TARGET)
 export class SuggestionTargetDataService extends IdentifiableDataService<SuggestionTarget> {
 
   protected linkPath = 'suggestiontargets';

src/app/core/submission/correctiontype-data.service.ts

@@ -8,7 +8,6 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from '../data/base/data-service.decorator';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { SearchDataImpl } from '../data/base/search-data';
 import { FindListOptions } from '../data/find-list-options.model';
@@ -26,7 +25,6 @@ import { CorrectionType } from './models/correctiontype.model';
  * A service that provides methods to make REST requests with correctiontypes endpoint.
  */
 @Injectable({ providedIn: 'root' })
-@dataService(CorrectionType.type)
 export class CorrectionTypeDataService extends IdentifiableDataService<CorrectionType> {
   protected linkPath = 'correctiontypes';
   protected searchByTopic = 'findByTopic';

src/app/core/submission/submission-duplicate-data.service.ts

@@ -3,13 +3,11 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { Duplicate } from '../../shared/object-list/duplicate-data/duplicate.model';
-import { DUPLICATE } from '../../shared/object-list/duplicate-data/duplicate.resource-type';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { BaseDataService } from '../data/base/base-data.service';
-import { dataService } from '../data/base/data-service.decorator';
 import {
   SearchData,
   SearchDataImpl,
@@ -35,7 +33,6 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
  *
  */
 @Injectable({ providedIn: 'root' })
-@dataService(DUPLICATE)
 export class SubmissionDuplicateDataService extends BaseDataService<Duplicate> implements SearchData<Duplicate> {
 
   /**

src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts

@@ -13,7 +13,6 @@ import {
   CreateData,
   CreateDataImpl,
 } from '../../../core/data/base/create-data';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import {
   DeleteData,
   DeleteDataImpl,
@@ -40,7 +39,6 @@ import { NoContent } from '../../../core/shared/NoContent.model';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { SUBMISSION_COAR_NOTIFY_CONFIG } from './section-coar-notify-service.resource-type';
 import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config';
 
 
@@ -48,7 +46,6 @@ import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config';
  * A service responsible for fetching/sending data from/to the REST API on the CoarNotifyConfig endpoint
  */
 @Injectable({ providedIn: 'root' })
-@dataService(SUBMISSION_COAR_NOTIFY_CONFIG)
 export class CoarNotifyConfigDataService extends IdentifiableDataService<SubmissionCoarNotifyConfig> implements FindAllData<SubmissionCoarNotifyConfig>, DeleteData<SubmissionCoarNotifyConfig>, PatchData<SubmissionCoarNotifyConfig>, CreateData<SubmissionCoarNotifyConfig> {
   createData: CreateDataImpl<SubmissionCoarNotifyConfig>;
   private findAllData: FindAllDataImpl<SubmissionCoarNotifyConfig>;