Skip to content

Commit cb7c2c9

Browse files
authored
Merge pull request DSpace#2373 from alexandrevryghem/w2p-102415_Remote-lookup-entity-on-admin-edit_contribute-main
Added support to import from external source on Edit Item > Relationships
2 parents 44e84f8 + 7f842f1 commit cb7c2c9

2 files changed

Lines changed: 40 additions & 0 deletions

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
2929
import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
3030
import { followLink } from '../../../../utils/follow-link-config.model';
3131
import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
32+
import { FindListOptions } from '../../../../../core/data/find-list-options.model';
33+
import { RequestParam } from '../../../../../core/cache/models/request-param.model';
34+
import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
35+
import { PaginatedList } from '../../../../../core/data/paginated-list.model';
3236

3337
@Component({
3438
selector: 'ds-dynamic-lookup-relation-modal',
@@ -173,6 +177,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
173177
if (!!this.currentItemIsLeftItem$) {
174178
this.currentItemIsLeftItem$.subscribe((isLeft) => {
175179
this.isLeft = isLeft;
180+
this.label = this.relationshipType.leftwardType;
176181
});
177182
}
178183

@@ -201,6 +206,19 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
201206
).pipe(
202207
getAllSucceededRemoteDataPayload()
203208
);
209+
} else {
210+
const findListOptions = Object.assign({}, new FindListOptions(), {
211+
elementsPerPage: 5,
212+
currentPage: 1,
213+
searchParams: [
214+
new RequestParam('entityType', this.relationshipOptions.relationshipType)
215+
]
216+
});
217+
this.externalSourcesRD$ = this.externalSourceService.searchBy('findByEntityType', findListOptions,
218+
true, true, followLink('entityTypes'))
219+
.pipe(getFirstSucceededRemoteDataPayload(), map((r: PaginatedList<ExternalSource>) => {
220+
return r.page;
221+
}));
204222
}
205223

206224
this.setTotals();

src/assets/i18n/en.json5

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2766,6 +2766,8 @@
27662766

27672767
"journalissue.page.titleprefix": "Journal Issue: ",
27682768

2769+
"journalissue.search.results.head": "Journal Issue Search Results",
2770+
27692771
"journalvolume.listelement.badge": "Journal Volume",
27702772

27712773
"journalvolume.page.description": "Description",
@@ -2778,6 +2780,8 @@
27782780

27792781
"journalvolume.page.volume": "Volume",
27802782

2783+
"journalvolume.search.results.head": "Journal Volume Search Results",
2784+
27812785
"iiifsearchable.listelement.badge": "Document Media",
27822786

27832787
"iiifsearchable.page.titleprefix": "Document: ",
@@ -3686,10 +3690,14 @@
36863690

36873691
"relationships.isIssueOf": "Journal Issues",
36883692

3693+
"relationships.isIssueOf.JournalIssue": "Journal Issue",
3694+
36893695
"relationships.isJournalIssueOf": "Journal Issue",
36903696

36913697
"relationships.isJournalOf": "Journals",
36923698

3699+
"relationships.isJournalVolumeOf": "Journal Volume",
3700+
36933701
"relationships.isOrgUnitOf": "Organizational Units",
36943702

36953703
"relationships.isPersonOf": "Authors",
@@ -3706,6 +3714,8 @@
37063714

37073715
"relationships.isVolumeOf": "Journal Volumes",
37083716

3717+
"relationships.isVolumeOf.JournalVolume": "Journal Volume",
3718+
37093719
"relationships.isContributorOf": "Contributors",
37103720

37113721
"relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
@@ -4436,6 +4446,16 @@
44364446

44374447
"submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
44384448

4449+
"submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
4450+
4451+
"submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
4452+
4453+
"submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
4454+
4455+
"submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Funding OpenAIRE ({{ count }})",
4456+
4457+
"submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
4458+
44394459
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
44404460

44414461
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
@@ -4462,6 +4482,8 @@
44624482

44634483
"submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
44644484

4485+
"submission.sections.describe.relationship-lookup.title.Journal": "Journal",
4486+
44654487
"submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
44664488

44674489
"submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",

0 commit comments

Comments
 (0)