Skip to content

Commit 5015e68

Browse files
authored
Merge pull request DSpace#4115 from atmire/w2p-129629_add-models-to-provide-core-list_contribute-main
129629: Add models to provide-core.ts and remove duplicates
2 parents 45f7ea8 + 2eb09b3 commit 5015e68

File tree

3 files changed

+40
-44
lines changed

3 files changed

+40
-44
lines changed

src/app/core/provide-core.ts

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import { makeEnvironmentProviders } from '@angular/core';
44
import { environment } from '../../environments/environment';
55
import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
66
import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
7+
import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
78
import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
9+
import { Filetypes } from '../process-page/processes/filetypes.model';
810
import { Process } from '../process-page/processes/process.model';
911
import { Script } from '../process-page/scripts/script.model';
1012
import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint-mocking-rest.service';
@@ -14,26 +16,41 @@ import {
1416
} from '../shared/mocks/dspace-rest/mocks/response-map.mock';
1517
import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model';
1618
import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
19+
import { ListableNotificationObject } from '../shared/object-list/listable-notification-object/listable-notification-object.model';
20+
import { FacetConfigResponse } from '../shared/search/models/facet-config-response.model';
21+
import { FacetValues } from '../shared/search/models/facet-values.model';
22+
import { SearchFilterConfig } from '../shared/search/models/search-filter-config.model';
23+
import { SearchObjects } from '../shared/search/models/search-objects.model';
24+
import { SearchResult } from '../shared/search/models/search-result.model';
1725
import { Subscription } from '../shared/subscriptions/models/subscription.model';
26+
import { StatisticsEndpoint } from '../statistics/statistics-endpoint.model';
1827
import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
1928
import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model';
2029
import { AuthStatus } from './auth/models/auth-status.model';
2130
import { ShortLivedToken } from './auth/models/short-lived-token.model';
2231
import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
32+
import { SubmissionAccessModel } from './config/models/config-submission-access.model';
2333
import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
34+
import { SubmissionDefinitionModel } from './config/models/config-submission-definition.model';
2435
import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model';
36+
import { SubmissionFormModel } from './config/models/config-submission-form.model';
2537
import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
2638
import { SubmissionSectionModel } from './config/models/config-submission-section.model';
39+
import { SubmissionSectionsModel } from './config/models/config-submission-sections.model';
40+
import { SubmissionUploadModel } from './config/models/config-submission-upload.model';
2741
import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
42+
import { PaginatedList } from './data/paginated-list.model';
2843
import { Root } from './data/root.model';
2944
import { DspaceRestService } from './dspace-rest/dspace-rest.service';
3045
import { EPerson } from './eperson/models/eperson.model';
3146
import { Group } from './eperson/models/group.model';
47+
import { Feedback } from './feedback/models/feedback.model';
3248
import { MetadataField } from './metadata/metadata-field.model';
3349
import { MetadataSchema } from './metadata/metadata-schema.model';
3450
import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
3551
import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
3652
import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
53+
import { Suggestion } from './notifications/suggestions/models/suggestion.model';
3754
import { SuggestionSource } from './notifications/suggestions/models/suggestion-source.model';
3855
import { SuggestionTarget } from './notifications/suggestions/models/suggestion-target.model';
3956
import { OrcidHistory } from './orcid/model/orcid-history.model';
@@ -49,6 +66,7 @@ import { Bundle } from './shared/bundle.model';
4966
import { Collection } from './shared/collection.model';
5067
import { Community } from './shared/community.model';
5168
import { ConfigurationProperty } from './shared/configuration-property.model';
69+
import { ContentSource } from './shared/content-source.model';
5270
import { DSpaceObject } from './shared/dspace-object.model';
5371
import { ExternalSource } from './shared/external-source.model';
5472
import { ExternalSourceEntry } from './shared/external-source-entry.model';
@@ -70,13 +88,15 @@ import { ValueListBrowseDefinition } from './shared/value-list-browse-definition
7088
import { Version } from './shared/version.model';
7189
import { VersionHistory } from './shared/version-history.model';
7290
import { UsageReport } from './statistics/models/usage-report.model';
91+
import { CorrectionType } from './submission/models/correctiontype.model';
7392
import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
7493
import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
7594
import { WorkflowItem } from './submission/models/workflowitem.model';
7695
import { WorkspaceItem } from './submission/models/workspaceitem.model';
7796
import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
7897
import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
7998
import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
99+
import { SupervisionOrder } from './supervision-order/models/supervision-order.model';
80100
import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
81101
import { ClaimedTask } from './tasks/models/claimed-task-object.model';
82102
import { PoolTask } from './tasks/models/pool-task-object.model';
@@ -164,11 +184,9 @@ export const models =
164184
VocabularyEntryDetail,
165185
ConfigurationProperty,
166186
ShortLivedToken,
167-
Registration,
168187
UsageReport,
169188
QualityAssuranceTopicObject,
170189
QualityAssuranceEventObject,
171-
Root,
172190
SearchConfig,
173191
SubmissionAccessesModel,
174192
QualityAssuranceSourceObject,
@@ -187,4 +205,24 @@ export const models =
187205
SubmissionCoarNotifyConfig,
188206
NotifyRequestsStatus,
189207
SystemWideAlert,
208+
AdminNotifyMessage,
209+
SubmissionAccessModel,
210+
SubmissionDefinitionModel,
211+
SubmissionFormModel,
212+
SubmissionSectionsModel,
213+
SubmissionUploadModel,
214+
PaginatedList,
215+
Feedback,
216+
Suggestion,
217+
Filetypes,
218+
ContentSource,
219+
ListableNotificationObject,
220+
FacetConfigResponse,
221+
FacetValues,
222+
SearchFilterConfig,
223+
SearchObjects,
224+
SearchResult,
225+
StatisticsEndpoint,
226+
CorrectionType,
227+
SupervisionOrder,
190228
];

src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ import { ResourceType } from '../../../core/shared/resource-type';
88

99

1010
export const SUBMISSION_COAR_NOTIFY_CONFIG = new ResourceType('submissioncoarnotifyconfig');
11-
12-
export const COAR_NOTIFY_WORKSPACEITEM = new ResourceType('workspaceitem');
13-

src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)