From 4510d18a7d125941176dc6efb5970deccd907005 Mon Sep 17 00:00:00 2001 From: abhinav Date: Thu, 20 Mar 2025 15:19:11 +0100 Subject: [PATCH 1/2] 129629: Add models to provide-core.ts and remove duplicates --- src/app/core/provide-core.ts | 45 +++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts index 78629f9d95..f47557390c 100644 --- a/src/app/core/provide-core.ts +++ b/src/app/core/provide-core.ts @@ -4,7 +4,9 @@ import { makeEnvironmentProviders } from '@angular/core'; import { environment } from '../../environments/environment'; import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters'; import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model'; +import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model'; import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model'; +import { Filetypes } from '../process-page/processes/filetypes.model'; import { Process } from '../process-page/processes/process.model'; import { Script } from '../process-page/scripts/script.model'; import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint-mocking-rest.service'; @@ -14,26 +16,42 @@ import { } from '../shared/mocks/dspace-rest/mocks/response-map.mock'; import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model'; import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model'; +import { ListableNotificationObject } from '../shared/object-list/listable-notification-object/listable-notification-object.model'; +import { FacetConfigResponse } from '../shared/search/models/facet-config-response.model'; +import { FacetValues } from '../shared/search/models/facet-values.model'; +import { SearchFilterConfig } from '../shared/search/models/search-filter-config.model'; +import { SearchObjects } from '../shared/search/models/search-objects.model'; +import { SearchResult } from '../shared/search/models/search-result.model'; import { Subscription } from '../shared/subscriptions/models/subscription.model'; +import { StatisticsEndpoint } from '../statistics/statistics-endpoint.model'; import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config'; +import { SubmissionCoarNotifyWorkspaceitemModel } from '../submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model'; import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model'; import { AuthStatus } from './auth/models/auth-status.model'; import { ShortLivedToken } from './auth/models/short-lived-token.model'; import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model'; +import { SubmissionAccessModel } from './config/models/config-submission-access.model'; import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model'; +import { SubmissionDefinitionModel } from './config/models/config-submission-definition.model'; import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model'; +import { SubmissionFormModel } from './config/models/config-submission-form.model'; import { SubmissionFormsModel } from './config/models/config-submission-forms.model'; import { SubmissionSectionModel } from './config/models/config-submission-section.model'; +import { SubmissionSectionsModel } from './config/models/config-submission-sections.model'; +import { SubmissionUploadModel } from './config/models/config-submission-upload.model'; import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model'; +import { PaginatedList } from './data/paginated-list.model'; import { Root } from './data/root.model'; import { DspaceRestService } from './dspace-rest/dspace-rest.service'; import { EPerson } from './eperson/models/eperson.model'; import { Group } from './eperson/models/group.model'; +import { Feedback } from './feedback/models/feedback.model'; import { MetadataField } from './metadata/metadata-field.model'; import { MetadataSchema } from './metadata/metadata-schema.model'; import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model'; import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model'; import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model'; +import { Suggestion } from './notifications/suggestions/models/suggestion.model'; import { SuggestionSource } from './notifications/suggestions/models/suggestion-source.model'; import { SuggestionTarget } from './notifications/suggestions/models/suggestion-target.model'; import { OrcidHistory } from './orcid/model/orcid-history.model'; @@ -49,6 +67,7 @@ import { Bundle } from './shared/bundle.model'; import { Collection } from './shared/collection.model'; import { Community } from './shared/community.model'; import { ConfigurationProperty } from './shared/configuration-property.model'; +import { ContentSource } from './shared/content-source.model'; import { DSpaceObject } from './shared/dspace-object.model'; import { ExternalSource } from './shared/external-source.model'; import { ExternalSourceEntry } from './shared/external-source-entry.model'; @@ -70,6 +89,7 @@ import { ValueListBrowseDefinition } from './shared/value-list-browse-definition import { Version } from './shared/version.model'; import { VersionHistory } from './shared/version-history.model'; import { UsageReport } from './statistics/models/usage-report.model'; +import { CorrectionType } from './submission/models/correctiontype.model'; import { SubmissionCcLicence } from './submission/models/submission-cc-license.model'; import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model'; import { WorkflowItem } from './submission/models/workflowitem.model'; @@ -77,6 +97,7 @@ import { WorkspaceItem } from './submission/models/workspaceitem.model'; import { Vocabulary } from './submission/vocabularies/models/vocabulary.model'; import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model'; import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model'; +import { SupervisionOrder } from './supervision-order/models/supervision-order.model'; import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model'; import { ClaimedTask } from './tasks/models/claimed-task-object.model'; import { PoolTask } from './tasks/models/pool-task-object.model'; @@ -164,15 +185,12 @@ export const models = VocabularyEntryDetail, ConfigurationProperty, ShortLivedToken, - Registration, UsageReport, QualityAssuranceTopicObject, QualityAssuranceEventObject, - Root, SearchConfig, SubmissionAccessesModel, QualityAssuranceSourceObject, - AccessStatusObject, ResearcherProfile, OrcidQueue, OrcidHistory, @@ -188,4 +206,25 @@ export const models = SubmissionCoarNotifyConfig, NotifyRequestsStatus, SystemWideAlert, + AdminNotifyMessage, + SubmissionAccessModel, + SubmissionDefinitionModel, + SubmissionFormModel, + SubmissionSectionsModel, + SubmissionUploadModel, + PaginatedList, + Feedback, + Suggestion, + Filetypes, + ContentSource, + ListableNotificationObject, + FacetConfigResponse, + FacetValues, + SearchFilterConfig, + SearchObjects, + SearchResult, + StatisticsEndpoint, + CorrectionType, + SubmissionCoarNotifyWorkspaceitemModel, + SupervisionOrder, ]; From 2eb09b3adaaf7a0db02ca0b0f07d64a5851669e8 Mon Sep 17 00:00:00 2001 From: abhinav Date: Wed, 26 Mar 2025 17:40:54 +0100 Subject: [PATCH 2/2] SubmissionCoarNotifyWorkspaceitemModel removed This doesn't seem to be used anywhere and was throwing some errors. --- src/app/core/provide-core.ts | 4 +- ...ction-coar-notify-service.resource-type.ts | 3 -- ...mission-coar-notify-workspaceitem.model.ts | 39 ------------------- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts index f47557390c..a3f88788f5 100644 --- a/src/app/core/provide-core.ts +++ b/src/app/core/provide-core.ts @@ -25,7 +25,6 @@ import { SearchResult } from '../shared/search/models/search-result.model'; import { Subscription } from '../shared/subscriptions/models/subscription.model'; import { StatisticsEndpoint } from '../statistics/statistics-endpoint.model'; import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config'; -import { SubmissionCoarNotifyWorkspaceitemModel } from '../submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model'; import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model'; import { AuthStatus } from './auth/models/auth-status.model'; import { ShortLivedToken } from './auth/models/short-lived-token.model'; @@ -191,10 +190,10 @@ export const models = SearchConfig, SubmissionAccessesModel, QualityAssuranceSourceObject, + AccessStatusObject, ResearcherProfile, OrcidQueue, OrcidHistory, - AccessStatusObject, IdentifierData, Subscription, ItemRequest, @@ -225,6 +224,5 @@ export const models = SearchResult, StatisticsEndpoint, CorrectionType, - SubmissionCoarNotifyWorkspaceitemModel, SupervisionOrder, ]; diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts index 53e41783ce..54ce43ab90 100644 --- a/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts +++ b/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts @@ -8,6 +8,3 @@ import { ResourceType } from '../../../core/shared/resource-type'; export const SUBMISSION_COAR_NOTIFY_CONFIG = new ResourceType('submissioncoarnotifyconfig'); - -export const COAR_NOTIFY_WORKSPACEITEM = new ResourceType('workspaceitem'); - diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts deleted file mode 100644 index b80244c272..0000000000 --- a/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { - autoserialize, - deserialize, - deserializeAs, - inheritSerialization, -} from 'cerialize'; - -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; -import { COAR_NOTIFY_WORKSPACEITEM } from './section-coar-notify-service.resource-type'; - -/** An CoarNotify and its properties. */ -@typedObject -@inheritSerialization(CacheableObject) -export class SubmissionCoarNotifyWorkspaceitemModel extends CacheableObject { - static type = COAR_NOTIFY_WORKSPACEITEM; - - @excludeFromEquals - @autoserialize - endorsement?: number[]; - - @deserializeAs('id') - review?: number[]; - - @autoserialize - ingest?: number[]; - - @deserialize - _links: { - self: { - href: string; - }; - }; - - get self(): string { - return this._links.self.href; - } -}