resolve conflicts after main alignment

This commit is contained in:
FrancescoMolinaro
2024-02-28 17:58:24 +01:00
parent 47a907c1d2
commit 5eb2405a68
12 changed files with 158 additions and 69 deletions

View File

@@ -186,8 +186,18 @@ import { ValueListBrowseDefinition } from './shared/value-list-browse-definition
import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
import { CorrectionTypeDataService } from './submission/correctiontype-data.service';
import { SuggestionTarget } from './suggestion-notifications/models/suggestion-target.model';
import { SuggestionSource } from './suggestion-notifications/models/suggestion-source.model';
import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
import { LdnItemfiltersService } from '../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service';
import {
CoarNotifyConfigDataService
} from '../submission/sections/section-coar-notify/coar-notify-config-data.service';
import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
import { SuggestionTarget } from './notifications/models/suggestion-target.model';
import { SuggestionSource } from './notifications/models/suggestion-source.model';
import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
/**
* When not in production, endpoint responses can be mocked for testing purposes
@@ -311,7 +321,11 @@ const PROVIDERS = [
OrcidQueueDataService,
OrcidHistoryDataService,
SupervisionOrderDataService,
CorrectionTypeDataService
CorrectionTypeDataService,
LdnServicesService,
LdnItemfiltersService,
CoarNotifyConfigDataService,
NotifyRequestsStatusDataService
];
/**
@@ -392,7 +406,11 @@ export const models =
ItemRequest,
BulkAccessConditionOptions,
SuggestionTarget,
SuggestionSource
SuggestionSource,
LdnService,
Itemfilter,
SubmissionCoarNotifyConfig,
NotifyRequestsStatus,
];
@NgModule({