Skip to content

Commit 5eb2405

Browse files
FrancescoMolinaroFrancescoMolinaro
committed
resolve conflicts after main alignment
1 parent 47a907c commit 5eb2405

12 files changed

Lines changed: 158 additions & 69 deletions

File tree

‎src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,10 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
313313
*/
314314
selectInboundItemFilter(filterValue: string, index: number): void {
315315
const filterArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray);
316-
filterArray.controls[index].patchValue({constraint: filterValue, constraintFormatted: this.translateService.instant(filterValue + '.label')});
316+
filterArray.controls[index].patchValue({
317+
constraint: filterValue,
318+
constraintFormatted: this.translateService.instant((filterValue !== '' ? filterValue : 'ldn.no-filter') + '.label')
319+
});
317320
filterArray.markAllAsTouched();
318321
}
319322

‎src/app/admin/admin-notifications/admin-notifications-routing.module.ts‎

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,37 @@ import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.r
66
import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
77
import { PUBLICATION_CLAIMS_PATH } from './admin-notifications-routing-paths';
88
import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
9-
import { AdminNotificationsPublicationClaimPageResolver } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service';
109
import { QUALITY_ASSURANCE_EDIT_PATH } from './admin-notifications-routing-paths';
11-
import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
12-
import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
13-
import { AdminQualityAssuranceTopicsPageResolver } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service';
14-
import { AdminQualityAssuranceEventsPageResolver } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.resolver';
15-
import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
16-
import { AdminQualityAssuranceSourcePageResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
1710
import {
1811
SiteAdministratorGuard
1912
} from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
2013
import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
2114
import { QualityAssuranceBreadcrumbService } from '../../core/breadcrumbs/quality-assurance-breadcrumb.service';
15+
import {
16+
QualityAssuranceEventsPageResolver
17+
} from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
18+
import {
19+
AdminNotificationsPublicationClaimPageResolver
20+
} from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
21+
import {
22+
QualityAssuranceTopicsPageComponent
23+
} from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component';
24+
import {
25+
QualityAssuranceTopicsPageResolver
26+
} from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
27+
import {
28+
QualityAssuranceSourcePageComponent
29+
} from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component';
30+
import {
31+
QualityAssuranceSourcePageResolver
32+
} from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
2233
import {
2334
SourceDataResolver
24-
} from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver';
35+
} from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
36+
import {
37+
QualityAssuranceEventsPageComponent
38+
} from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
39+
2540

2641
@NgModule({
2742
imports: [
@@ -44,11 +59,11 @@ import {
4459
{
4560
canActivate: [ AuthenticatedGuard ],
4661
path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
47-
component: AdminQualityAssuranceTopicsPageComponent,
62+
component: QualityAssuranceTopicsPageComponent,
4863
pathMatch: 'full',
4964
resolve: {
5065
breadcrumb: QualityAssuranceBreadcrumbResolver,
51-
openaireQualityAssuranceTopicsParams: AdminQualityAssuranceTopicsPageResolver
66+
openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver
5267
},
5368
data: {
5469
title: 'admin.quality-assurance.page.title',
@@ -59,11 +74,11 @@ import {
5974
{
6075
canActivate: [ AuthenticatedGuard ],
6176
path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
62-
component: AdminQualityAssuranceTopicsPageComponent,
77+
component: QualityAssuranceTopicsPageComponent,
6378
pathMatch: 'full',
6479
resolve: {
6580
breadcrumb: I18nBreadcrumbResolver,
66-
openaireQualityAssuranceTopicsParams: AdminQualityAssuranceTopicsPageResolver
81+
openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver
6782
},
6883
data: {
6984
title: 'admin.quality-assurance.page.title',
@@ -74,11 +89,11 @@ import {
7489
{
7590
canActivate: [ SiteAdministratorGuard ],
7691
path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
77-
component: AdminQualityAssuranceSourcePageComponent,
92+
component: QualityAssuranceSourcePageComponent,
7893
pathMatch: 'full',
7994
resolve: {
8095
breadcrumb: I18nBreadcrumbResolver,
81-
openaireQualityAssuranceSourceParams: AdminQualityAssuranceSourcePageResolver,
96+
openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
8297
sourceData: SourceDataResolver
8398
},
8499
data: {
@@ -90,11 +105,11 @@ import {
90105
{
91106
canActivate: [ AuthenticatedGuard ],
92107
path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
93-
component: AdminQualityAssuranceEventsPageComponent,
108+
component: QualityAssuranceEventsPageComponent,
94109
pathMatch: 'full',
95110
resolve: {
96111
breadcrumb: QualityAssuranceBreadcrumbResolver,
97-
openaireQualityAssuranceEventsParams: AdminQualityAssuranceEventsPageResolver
112+
openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver
98113
},
99114
data: {
100115
title: 'admin.notifications.event.page.title',
@@ -109,10 +124,10 @@ import {
109124
I18nBreadcrumbsService,
110125
AdminNotificationsPublicationClaimPageResolver,
111126
SourceDataResolver,
112-
AdminQualityAssuranceSourcePageResolver,
113-
AdminQualityAssuranceTopicsPageResolver,
114-
AdminQualityAssuranceEventsPageResolver,
115-
AdminQualityAssuranceSourcePageResolver,
127+
QualityAssuranceSourcePageResolver,
128+
QualityAssuranceTopicsPageResolver,
129+
QualityAssuranceEventsPageResolver,
130+
QualityAssuranceSourcePageResolver,
116131
QualityAssuranceBreadcrumbResolver,
117132
QualityAssuranceBreadcrumbService
118133
]

‎src/app/admin/admin-routing-paths.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifi
44

55
export const REGISTRIES_MODULE_PATH = 'registries';
66
export const NOTIFICATIONS_MODULE_PATH = 'notifications';
7+
export const LDN_PATH = 'ldn';
8+
79

810
export function getRegistriesModuleRoute() {
911
return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
1012
}
1113

14+
export function getLdnServicesModuleRoute() {
15+
return new URLCombiner(getAdminModuleRoute(), LDN_PATH).toString();
16+
}
17+
1218
export function getNotificationsModuleRoute() {
1319
return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
1420
}

‎src/app/admin/admin-routing.module.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
66
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
77
import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
88
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
9-
import { REGISTRIES_MODULE_PATH } from './admin-routing-paths';
9+
import { LDN_PATH, NOTIFICATIONS_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
1010
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
1111
import {
1212
SiteAdministratorGuard
@@ -15,6 +15,11 @@ import {
1515
@NgModule({
1616
imports: [
1717
RouterModule.forChild([
18+
{
19+
path: NOTIFICATIONS_MODULE_PATH,
20+
loadChildren: () => import('./admin-notifications/admin-notifications.module')
21+
.then((m) => m.AdminNotificationsModule),
22+
},
1823
{
1924
path: REGISTRIES_MODULE_PATH,
2025
loadChildren: () => import('./admin-registries/admin-registries.module')
@@ -63,6 +68,17 @@ import {
6368
data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'},
6469
canActivate: [SiteAdministratorGuard]
6570
},
71+
{
72+
path: LDN_PATH,
73+
children: [
74+
{ path: '', pathMatch: 'full', redirectTo: 'services' },
75+
{
76+
path: 'services',
77+
loadChildren: () => import('./admin-ldn-services/admin-ldn-services.module')
78+
.then((m) => m.AdminLdnServicesModule),
79+
}
80+
],
81+
},
6682
])
6783
],
6884
providers: [

‎src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
22
import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
33
import { Observable, of as observableOf } from 'rxjs';
44
import { Injectable } from '@angular/core';
5-
import { map } from 'rxjs/operators';
6-
import { getFirstCompletedRemoteData } from '../shared/operators';
75
import { TranslateService } from '@ngx-translate/core';
8-
import { QualityAssuranceTopicDataService } from '../notifications/qa/topics/quality-assurance-topic-data.service';
96

107

118

@@ -19,7 +16,6 @@ export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderSer
1916

2017
private QUALITY_ASSURANCE_BREADCRUMB_KEY = 'admin.quality-assurance.breadcrumbs';
2118
constructor(
22-
protected qualityAssuranceService: QualityAssuranceTopicDataService,
2319
private translationService: TranslateService,
2420
) {
2521

@@ -32,18 +28,14 @@ export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderSer
3228
* @param url The url to use as a link for this breadcrumb
3329
*/
3430
getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
35-
const sourceId = key.split(':')[0];
36-
const topicId = key.split(':')[2];
31+
const args = key.split(':');
32+
const sourceId = args[0];
33+
const topicId = args.length > 2 ? args[args.length - 1] : args[1];
3734

3835
if (topicId) {
39-
return this.qualityAssuranceService.getTopic(topicId).pipe(
40-
getFirstCompletedRemoteData(),
41-
map((topic) => {
42-
return [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
43-
new Breadcrumb(sourceId, `${url}${sourceId}`),
44-
new Breadcrumb(topicId.replace(/[!:]/g, '/'), undefined)];
45-
})
46-
);
36+
return observableOf( [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
37+
new Breadcrumb(sourceId, `${url}${sourceId}`),
38+
new Breadcrumb(topicId, undefined)]);
4739
} else {
4840
return observableOf([new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
4941
new Breadcrumb(sourceId, `${url}${sourceId}`)]);

‎src/app/core/core.module.ts‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,18 @@ import { ValueListBrowseDefinition } from './shared/value-list-browse-definition
186186
import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
187187
import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
188188
import { CorrectionTypeDataService } from './submission/correctiontype-data.service';
189-
import { SuggestionTarget } from './suggestion-notifications/models/suggestion-target.model';
190-
import { SuggestionSource } from './suggestion-notifications/models/suggestion-source.model';
189+
import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
190+
import { LdnItemfiltersService } from '../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service';
191+
import {
192+
CoarNotifyConfigDataService
193+
} from '../submission/sections/section-coar-notify/coar-notify-config-data.service';
194+
import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
195+
import { SuggestionTarget } from './notifications/models/suggestion-target.model';
196+
import { SuggestionSource } from './notifications/models/suggestion-source.model';
197+
import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
198+
import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
199+
import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
200+
import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
191201

192202
/**
193203
* When not in production, endpoint responses can be mocked for testing purposes
@@ -311,7 +321,11 @@ const PROVIDERS = [
311321
OrcidQueueDataService,
312322
OrcidHistoryDataService,
313323
SupervisionOrderDataService,
314-
CorrectionTypeDataService
324+
CorrectionTypeDataService,
325+
LdnServicesService,
326+
LdnItemfiltersService,
327+
CoarNotifyConfigDataService,
328+
NotifyRequestsStatusDataService
315329
];
316330

317331
/**
@@ -392,7 +406,11 @@ export const models =
392406
ItemRequest,
393407
BulkAccessConditionOptions,
394408
SuggestionTarget,
395-
SuggestionSource
409+
SuggestionSource,
410+
LdnService,
411+
Itemfilter,
412+
SubmissionCoarNotifyConfig,
413+
NotifyRequestsStatus,
396414
];
397415

398416
@NgModule({

‎src/app/notifications/notifications.module.ts‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,20 @@ import {
2727
QualityAssuranceSourceDataService
2828
} from '../core/notifications/qa/source/quality-assurance-source-data.service';
2929
import { EPersonDataComponent } from './qa/events/ePerson-data/ePerson-data.component';
30-
import { PublicationClaimComponent } from '../suggestion-notifications/suggestion-targets/publication-claim/publication-claim.component';
31-
import { SuggestionActionsComponent } from '../suggestion-notifications/suggestion-actions/suggestion-actions.component';
32-
import {
33-
SuggestionListElementComponent
34-
} from '../suggestion-notifications/suggestion-list-element/suggestion-list-element.component';
30+
import { SuggestionActionsComponent } from './suggestion-actions/suggestion-actions.component';
31+
import { PublicationClaimComponent } from './suggestion-targets/publication-claim/publication-claim.component';
32+
import { SuggestionListElementComponent } from './suggestion-list-element/suggestion-list-element.component';
3533
import {
3634
SuggestionEvidencesComponent
37-
} from '../suggestion-notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
38-
import { SuggestionsPopupComponent } from '../suggestion-notifications/suggestions-popup/suggestions-popup.component';
39-
import {
40-
SuggestionsNotificationComponent
41-
} from '../suggestion-notifications/suggestions-notification/suggestions-notification.component';
42-
import { SuggestionsService } from '../suggestion-notifications/suggestions.service';
43-
import { SuggestionsDataService } from '../core/suggestion-notifications/suggestions-data.service';
44-
import {
45-
SuggestionSourceDataService
46-
} from '../core/suggestion-notifications/source/suggestion-source-data.service';
47-
import {
48-
SuggestionTargetDataService
49-
} from '../core/suggestion-notifications/target/suggestion-target-data.service';
50-
import {
51-
SuggestionTargetsStateService
52-
} from '../suggestion-notifications/suggestion-targets/suggestion-targets.state.service';
35+
} from './suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
36+
import { SuggestionsPopupComponent } from './suggestions-popup/suggestions-popup.component';
37+
import { SuggestionsNotificationComponent } from './suggestions-notification/suggestions-notification.component';
38+
import { SuggestionsService } from './suggestions.service';
39+
import { SuggestionSourceDataService } from '../core/notifications/source/suggestion-source-data.service';
40+
import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
41+
import { SuggestionTargetsStateService } from './suggestion-targets/suggestion-targets.state.service';
42+
import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
43+
5344

5445

5546
const MODULES = [

0 commit comments

Comments
 (0)