From cb41f40c50018cb2beda2734094da936eca040e5 Mon Sep 17 00:00:00 2001 From: Enea Jahollari Date: Tue, 26 Sep 2023 10:52:17 +0200 Subject: [PATCH] small change --- src/app/core/cache/builders/link.service.ts | 2 +- src/app/core/data-services-map.ts | 116 ++++++++++++++++++++ src/app/data-services.ts | 116 -------------------- 3 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 src/app/core/data-services-map.ts delete mode 100644 src/app/data-services.ts diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index 3dd16ff181..354f70aad1 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -11,8 +11,8 @@ import { ResourceType } from '../../shared/resource-type'; import { HALDataService } from '../../data/base/hal-data-service.interface'; import { PaginatedList } from '../../data/paginated-list.model'; import { lazyService } from '../../lazy-service'; -import { LAZY_DATA_SERVICES } from '../../../data-services'; import { catchError, switchMap } from 'rxjs/operators'; +import { LAZY_DATA_SERVICES } from '../../data-services-map'; /** * A Service to handle the resolving and removing diff --git a/src/app/core/data-services-map.ts b/src/app/core/data-services-map.ts new file mode 100644 index 0000000000..6abb153a67 --- /dev/null +++ b/src/app/core/data-services-map.ts @@ -0,0 +1,116 @@ +import { AUTHORIZATION } from './shared/authorization.resource-type'; +import { BROWSE_DEFINITION } from './shared/browse-definition.resource-type'; +import { + BULK_ACCESS_CONDITION_OPTIONS, + SUBMISSION_ACCESSES_TYPE, + SUBMISSION_FORMS_TYPE, + SUBMISSION_UPLOADS_TYPE +} from './config/models/config-type'; +import { METADATA_SCHEMA } from './metadata/metadata-schema.resource-type'; +import { BITSTREAM } from './shared/bitstream.resource-type'; +import { USAGE_REPORT } from './statistics/models/usage-report.resource-type'; +import { COLLECTION } from './shared/collection.resource-type'; +import { CLAIMED_TASK } from './tasks/models/claimed-task-object.resource-type'; +import { + VOCABULARY, + VOCABULARY_ENTRY, + VOCABULARY_ENTRY_DETAIL +} from './submission/vocabularies/models/vocabularies.resource-type'; +import { ITEM_TYPE } from './shared/item-relationships/item-type.resource-type'; +import { LICENSE } from './shared/license.resource-type'; +import { COMMUNITY } from './shared/community.resource-type'; +import { BUNDLE } from './shared/bundle.resource-type'; +import { CONFIG_PROPERTY } from './shared/config-property.resource-type'; +import { POOL_TASK } from './tasks/models/pool-task-object.resource-type'; +import { SUPERVISION_ORDER } from './supervision-order/models/supervision-order.resource-type'; +import { WorkspaceItem } from './submission/models/workspaceitem.model'; +import { WorkflowItem } from './submission/models/workflowitem.model'; +import { SUBMISSION_CC_LICENSE_URL } from './submission/models/submission-cc-licence-link.resource-type'; +import { SUBMISSION_CC_LICENSE } from './submission/models/submission-cc-licence.resource-type'; +import { RESOURCE_POLICY } from './resource-policy/models/resource-policy.resource-type'; +import { RESEARCHER_PROFILE } from './profile/model/researcher-profile.resource-type'; +import { ORCID_QUEUE } from './orcid/model/orcid-queue.resource-type'; +import { ORCID_HISTORY } from './orcid/model/orcid-history.resource-type'; +import { FEEDBACK } from './feedback/models/feedback.resource-type'; +import { GROUP } from './eperson/models/group.resource-type'; +import { EPERSON } from './eperson/models/eperson.resource-type'; +import { WORKFLOW_ACTION } from './tasks/models/workflow-action-object.resource-type'; +import { VERSION_HISTORY } from './shared/version-history.resource-type'; +import { SITE } from './shared/site.resource-type'; +import { ROOT } from './data/root.resource-type'; +import { RELATIONSHIP_TYPE } from './shared/item-relationships/relationship-type.resource-type'; +import { RELATIONSHIP } from './shared/item-relationships/relationship.resource-type'; +import { METADATA_FIELD } from './metadata/metadata-field.resource-type'; +import { ITEM } from './shared/item.resource-type'; +import { VERSION } from './shared/version.resource-type'; +import { FEATURE } from './shared/feature.resource-type'; +import { DSPACE_OBJECT } from './shared/dspace-object.resource-type'; +import { BITSTREAM_FORMAT } from './shared/bitstream-format.resource-type'; +import { Type } from '@angular/core'; +import { HALDataService } from './data/base/hal-data-service.interface'; +import { SYSTEMWIDEALERT } from '../system-wide-alert/system-wide-alert.resource-type'; +import { + ACCESS_STATUS +} from '../shared/object-collection/shared/badges/access-status-badge/access-status.resource-type'; +import { SUBSCRIPTION } from '../shared/subscriptions/models/subscription.resource-type'; +import { SCRIPT } from '../process-page/scripts/script.resource-type'; +import { PROCESS } from '../process-page/processes/process.resource-type'; +import { IDENTIFIERS } from '../shared/object-list/identifier-data/identifier-data.resource-type'; + +export const LAZY_DATA_SERVICES: {[key: string]: () => Promise>>} = { + [AUTHORIZATION.value]: () => import('./data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService), + [BROWSE_DEFINITION.value]: () => import('./browse/browse-definition-data.service').then(m => m.BrowseDefinitionDataService), + [BULK_ACCESS_CONDITION_OPTIONS.value]: () => import('./config/bulk-access-config-data.service').then(m => m.BulkAccessConfigDataService), + [METADATA_SCHEMA.value]: () => import('./data/metadata-schema-data.service').then(m => m.MetadataSchemaDataService), + [SUBMISSION_UPLOADS_TYPE.value]: () => import('./config/submission-uploads-config-data.service').then(m => m.SubmissionUploadsConfigDataService), + [BITSTREAM.value]: () => import('./data/bitstream-data.service').then(m => m.BitstreamDataService), + [SUBMISSION_ACCESSES_TYPE.value]: () => import('./config/submission-accesses-config-data.service').then(m => m.SubmissionAccessesConfigDataService), + [SYSTEMWIDEALERT.value]: () => import('./data/system-wide-alert-data.service').then(m => m.SystemWideAlertDataService), + [USAGE_REPORT.value]: () => import('./statistics/usage-report-data.service').then(m => m.UsageReportDataService), + [ACCESS_STATUS.value]: () => import('./data/access-status-data.service').then(m => m.AccessStatusDataService), + [COLLECTION.value]: () => import('./data/collection-data.service').then(m => m.CollectionDataService), + [CLAIMED_TASK.value]: () => import('./tasks/claimed-task-data.service').then(m => m.ClaimedTaskDataService), + [VOCABULARY_ENTRY.value]: () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService), + [ITEM_TYPE.value]: () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService), + [LICENSE.value]: () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService), + [SUBSCRIPTION.value]: () => import('../shared/subscriptions/subscriptions-data.service').then(m => m.SubscriptionsDataService), + [COMMUNITY.value]: () => import('./data/community-data.service').then(m => m.CommunityDataService), + [VOCABULARY.value]: () => import('./submission/vocabularies/vocabulary.data.service').then(m => m.VocabularyDataService), + [BUNDLE.value]: () => import('./data/bundle-data.service').then(m => m.BundleDataService), + [CONFIG_PROPERTY.value]: () => import('./data/configuration-data.service').then(m => m.ConfigurationDataService), + [POOL_TASK.value]: () => import('./tasks/pool-task-data.service').then(m => m.PoolTaskDataService), + [CLAIMED_TASK.value]: () => import('./tasks/claimed-task-data.service').then(m => m.ClaimedTaskDataService), + [SUPERVISION_ORDER.value]: () => import('./supervision-order/supervision-order-data.service').then(m => m.SupervisionOrderDataService), + [WorkspaceItem.type.value]: () => import('./submission/workspaceitem-data.service').then(m => m.WorkspaceitemDataService), + [WorkflowItem.type.value]: () => import('./submission/workflowitem-data.service').then(m => m.WorkflowItemDataService), + [VOCABULARY.value]: () => import('./submission/vocabularies/vocabulary.data.service').then(m => m.VocabularyDataService), + [VOCABULARY_ENTRY_DETAIL.value]: () => import('./submission/vocabularies/vocabulary-entry-details.data.service').then(m => m.VocabularyEntryDetailsDataService), + [SUBMISSION_CC_LICENSE_URL.value]: () => import('./submission/submission-cc-license-url-data.service').then(m => m.SubmissionCcLicenseUrlDataService), + [SUBMISSION_CC_LICENSE.value]: () => import('./submission/submission-cc-license-data.service').then(m => m.SubmissionCcLicenseDataService), + [USAGE_REPORT.value]: () => import('./statistics/usage-report-data.service').then(m => m.UsageReportDataService), + [RESOURCE_POLICY.value]: () => import('./resource-policy/resource-policy-data.service').then(m => m.ResourcePolicyDataService), + [RESEARCHER_PROFILE.value]: () => import('./profile/researcher-profile-data.service').then(m => m.ResearcherProfileDataService), + [ORCID_QUEUE.value]: () => import('./orcid/orcid-queue-data.service').then(m => m.OrcidQueueDataService), + [ORCID_HISTORY.value]: () => import('./orcid/orcid-history-data.service').then(m => m.OrcidHistoryDataService), + [FEEDBACK.value]: () => import('./feedback/feedback-data.service').then(m => m.FeedbackDataService), + [GROUP.value]: () => import('./eperson/group-data.service').then(m => m.GroupDataService), + [EPERSON.value]: () => import('./eperson/eperson-data.service').then(m => m.EPersonDataService), + [WORKFLOW_ACTION.value]: () => import('./data/workflow-action-data.service').then(m => m.WorkflowActionDataService), + [VERSION_HISTORY.value]: () => import('./data/version-history-data.service').then(m => m.VersionHistoryDataService), + [SITE.value]: () => import('./data/site-data.service').then(m => m.SiteDataService), + [ROOT.value]: () => import('./data/root-data.service').then(m => m.RootDataService), + [RELATIONSHIP_TYPE.value]: () => import('./data/relationship-type-data.service').then(m => m.RelationshipTypeDataService), + [RELATIONSHIP.value]: () => import('./data/relationship-data.service').then(m => m.RelationshipDataService), + [SCRIPT.value]: () => import('./data/processes/script-data.service').then(m => m.ScriptDataService), + [PROCESS.value]: () => import('./data/processes/process-data.service').then(m => m.ProcessDataService), + [METADATA_FIELD.value]: () => import('./data/metadata-field-data.service').then(m => m.MetadataFieldDataService), + [ITEM.value]: () => import('./data/item-data.service').then(m => m.ItemDataService), + [VERSION.value]: () => import('./data/version-data.service').then(m => m.VersionDataService), + [IDENTIFIERS.value]: () => import('./data/identifier-data.service').then(m => m.IdentifierDataService), + [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_FORMS_TYPE.value]: () => import('./config/submission-forms-config-data.service').then(m => m.SubmissionFormsConfigDataService), +}; + + diff --git a/src/app/data-services.ts b/src/app/data-services.ts deleted file mode 100644 index 6d637ca218..0000000000 --- a/src/app/data-services.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { AUTHORIZATION } from './core/shared/authorization.resource-type'; -import { BROWSE_DEFINITION } from './core/shared/browse-definition.resource-type'; -import { - BULK_ACCESS_CONDITION_OPTIONS, - SUBMISSION_ACCESSES_TYPE, - SUBMISSION_FORMS_TYPE, - SUBMISSION_UPLOADS_TYPE -} from './core/config/models/config-type'; -import { METADATA_SCHEMA } from './core/metadata/metadata-schema.resource-type'; -import { BITSTREAM } from './core/shared/bitstream.resource-type'; -import { SYSTEMWIDEALERT } from './system-wide-alert/system-wide-alert.resource-type'; -import { USAGE_REPORT } from './core/statistics/models/usage-report.resource-type'; -import { - ACCESS_STATUS -} from './shared/object-collection/shared/badges/access-status-badge/access-status.resource-type'; -import { COLLECTION } from './core/shared/collection.resource-type'; -import { CLAIMED_TASK } from './core/tasks/models/claimed-task-object.resource-type'; -import { - VOCABULARY, - VOCABULARY_ENTRY, - VOCABULARY_ENTRY_DETAIL -} from './core/submission/vocabularies/models/vocabularies.resource-type'; -import { ITEM_TYPE } from './core/shared/item-relationships/item-type.resource-type'; -import { LICENSE } from './core/shared/license.resource-type'; -import { SUBSCRIPTION } from './shared/subscriptions/models/subscription.resource-type'; -import { COMMUNITY } from './core/shared/community.resource-type'; -import { BUNDLE } from './core/shared/bundle.resource-type'; -import { CONFIG_PROPERTY } from './core/shared/config-property.resource-type'; -import { POOL_TASK } from './core/tasks/models/pool-task-object.resource-type'; -import { SUPERVISION_ORDER } from './core/supervision-order/models/supervision-order.resource-type'; -import { WorkspaceItem } from './core/submission/models/workspaceitem.model'; -import { WorkflowItem } from './core/submission/models/workflowitem.model'; -import { SUBMISSION_CC_LICENSE_URL } from './core/submission/models/submission-cc-licence-link.resource-type'; -import { SUBMISSION_CC_LICENSE } from './core/submission/models/submission-cc-licence.resource-type'; -import { RESOURCE_POLICY } from './core/resource-policy/models/resource-policy.resource-type'; -import { RESEARCHER_PROFILE } from './core/profile/model/researcher-profile.resource-type'; -import { ORCID_QUEUE } from './core/orcid/model/orcid-queue.resource-type'; -import { ORCID_HISTORY } from './core/orcid/model/orcid-history.resource-type'; -import { FEEDBACK } from './core/feedback/models/feedback.resource-type'; -import { GROUP } from './core/eperson/models/group.resource-type'; -import { EPERSON } from './core/eperson/models/eperson.resource-type'; -import { WORKFLOW_ACTION } from './core/tasks/models/workflow-action-object.resource-type'; -import { VERSION_HISTORY } from './core/shared/version-history.resource-type'; -import { SITE } from './core/shared/site.resource-type'; -import { ROOT } from './core/data/root.resource-type'; -import { RELATIONSHIP_TYPE } from './core/shared/item-relationships/relationship-type.resource-type'; -import { RELATIONSHIP } from './core/shared/item-relationships/relationship.resource-type'; -import { SCRIPT } from './process-page/scripts/script.resource-type'; -import { PROCESS } from './process-page/processes/process.resource-type'; -import { METADATA_FIELD } from './core/metadata/metadata-field.resource-type'; -import { ITEM } from './core/shared/item.resource-type'; -import { VERSION } from './core/shared/version.resource-type'; -import { IDENTIFIERS } from './shared/object-list/identifier-data/identifier-data.resource-type'; -import { FEATURE } from './core/shared/feature.resource-type'; -import { DSPACE_OBJECT } from './core/shared/dspace-object.resource-type'; -import { BITSTREAM_FORMAT } from './core/shared/bitstream-format.resource-type'; -import { Type } from '@angular/core'; -import { HALDataService } from './core/data/base/hal-data-service.interface'; - -export const LAZY_DATA_SERVICES: {[key: string]: () => Promise>>} = { - [AUTHORIZATION.value]: () => import('./core/data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService), - [BROWSE_DEFINITION.value]: () => import('./core/browse/browse-definition-data.service').then(m => m.BrowseDefinitionDataService), - [BULK_ACCESS_CONDITION_OPTIONS.value]: () => import('./core/config/bulk-access-config-data.service').then(m => m.BulkAccessConfigDataService), - [METADATA_SCHEMA.value]: () => import('./core/data/metadata-schema-data.service').then(m => m.MetadataSchemaDataService), - [SUBMISSION_UPLOADS_TYPE.value]: () => import('./core/config/submission-uploads-config-data.service').then(m => m.SubmissionUploadsConfigDataService), - [BITSTREAM.value]: () => import('./core/data/bitstream-data.service').then(m => m.BitstreamDataService), - [SUBMISSION_ACCESSES_TYPE.value]: () => import('./core/config/submission-accesses-config-data.service').then(m => m.SubmissionAccessesConfigDataService), - [SYSTEMWIDEALERT.value]: () => import('./core/data/system-wide-alert-data.service').then(m => m.SystemWideAlertDataService), - [USAGE_REPORT.value]: () => import('./core/statistics/usage-report-data.service').then(m => m.UsageReportDataService), - [ACCESS_STATUS.value]: () => import('./core/data/access-status-data.service').then(m => m.AccessStatusDataService), - [COLLECTION.value]: () => import('./core/data/collection-data.service').then(m => m.CollectionDataService), - [CLAIMED_TASK.value]: () => import('./core/tasks/claimed-task-data.service').then(m => m.ClaimedTaskDataService), - [VOCABULARY_ENTRY.value]: () => import('./core/data/href-only-data.service').then(m => m.HrefOnlyDataService), - [ITEM_TYPE.value]: () => import('./core/data/href-only-data.service').then(m => m.HrefOnlyDataService), - [LICENSE.value]: () => import('./core/data/href-only-data.service').then(m => m.HrefOnlyDataService), - [SUBSCRIPTION.value]: () => import('./shared/subscriptions/subscriptions-data.service').then(m => m.SubscriptionsDataService), - [COMMUNITY.value]: () => import('./core/data/community-data.service').then(m => m.CommunityDataService), - [VOCABULARY.value]: () => import('./core/submission/vocabularies/vocabulary.data.service').then(m => m.VocabularyDataService), - [BUNDLE.value]: () => import('./core/data/bundle-data.service').then(m => m.BundleDataService), - [CONFIG_PROPERTY.value]: () => import('./core/data/configuration-data.service').then(m => m.ConfigurationDataService), - [POOL_TASK.value]: () => import('./core/tasks/pool-task-data.service').then(m => m.PoolTaskDataService), - [CLAIMED_TASK.value]: () => import('./core/tasks/claimed-task-data.service').then(m => m.ClaimedTaskDataService), - [SUPERVISION_ORDER.value]: () => import('./core/supervision-order/supervision-order-data.service').then(m => m.SupervisionOrderDataService), - [WorkspaceItem.type.value]: () => import('./core/submission/workspaceitem-data.service').then(m => m.WorkspaceitemDataService), - [WorkflowItem.type.value]: () => import('./core/submission/workflowitem-data.service').then(m => m.WorkflowItemDataService), - [VOCABULARY.value]: () => import('./core/submission/vocabularies/vocabulary.data.service').then(m => m.VocabularyDataService), - [VOCABULARY_ENTRY_DETAIL.value]: () => import('./core/submission/vocabularies/vocabulary-entry-details.data.service').then(m => m.VocabularyEntryDetailsDataService), - [SUBMISSION_CC_LICENSE_URL.value]: () => import('./core/submission/submission-cc-license-url-data.service').then(m => m.SubmissionCcLicenseUrlDataService), - [SUBMISSION_CC_LICENSE.value]: () => import('./core/submission/submission-cc-license-data.service').then(m => m.SubmissionCcLicenseDataService), - [USAGE_REPORT.value]: () => import('./core/statistics/usage-report-data.service').then(m => m.UsageReportDataService), - [RESOURCE_POLICY.value]: () => import('./core/resource-policy/resource-policy-data.service').then(m => m.ResourcePolicyDataService), - [RESEARCHER_PROFILE.value]: () => import('./core/profile/researcher-profile-data.service').then(m => m.ResearcherProfileDataService), - [ORCID_QUEUE.value]: () => import('./core/orcid/orcid-queue-data.service').then(m => m.OrcidQueueDataService), - [ORCID_HISTORY.value]: () => import('./core/orcid/orcid-history-data.service').then(m => m.OrcidHistoryDataService), - [FEEDBACK.value]: () => import('./core/feedback/feedback-data.service').then(m => m.FeedbackDataService), - [GROUP.value]: () => import('./core/eperson/group-data.service').then(m => m.GroupDataService), - [EPERSON.value]: () => import('./core/eperson/eperson-data.service').then(m => m.EPersonDataService), - [WORKFLOW_ACTION.value]: () => import('./core/data/workflow-action-data.service').then(m => m.WorkflowActionDataService), - [VERSION_HISTORY.value]: () => import('./core/data/version-history-data.service').then(m => m.VersionHistoryDataService), - [SITE.value]: () => import('./core/data/site-data.service').then(m => m.SiteDataService), - [ROOT.value]: () => import('./core/data/root-data.service').then(m => m.RootDataService), - [RELATIONSHIP_TYPE.value]: () => import('./core/data/relationship-type-data.service').then(m => m.RelationshipTypeDataService), - [RELATIONSHIP.value]: () => import('./core/data/relationship-data.service').then(m => m.RelationshipDataService), - [SCRIPT.value]: () => import('./core/data/processes/script-data.service').then(m => m.ScriptDataService), - [PROCESS.value]: () => import('./core/data/processes/process-data.service').then(m => m.ProcessDataService), - [METADATA_FIELD.value]: () => import('./core/data/metadata-field-data.service').then(m => m.MetadataFieldDataService), - [ITEM.value]: () => import('./core/data/item-data.service').then(m => m.ItemDataService), - [VERSION.value]: () => import('./core/data/version-data.service').then(m => m.VersionDataService), - [IDENTIFIERS.value]: () => import('./core/data/identifier-data.service').then(m => m.IdentifierDataService), - [FEATURE.value]: () => import('./core/data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService), - [DSPACE_OBJECT.value]: () => import('./core/data/dspace-object-data.service').then(m => m.DSpaceObjectDataService), - [BITSTREAM_FORMAT.value]: () => import('./core/data/bitstream-format-data.service').then(m => m.BitstreamFormatDataService), - [SUBMISSION_FORMS_TYPE.value]: () => import('./core/config/submission-forms-config-data.service').then(m => m.SubmissionFormsConfigDataService), -}; - -