MaDgIK
/
connect-admin
14
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Merge remote-tracking branch 'origin/new-search' into ang16-criteria-extend-fields-list

This commit is contained in:
Konstantinos Triantafyllou 2025-11-04 13:41:01 +02:00
parent db4fd89bee 727a213435
commit b90cfc80b1
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit d61621586d33663db9b22a11dc428150ac075775
Subproject commit edff7fa53adc46a7099a33e05c7d864dc33b599e

22
src/app/pages/propagated-organizations/propagated-organizations.component.ts
View File

@ -23,6 +23,7 @@ import {CKEditorModule} from "ng2-ckeditor";
import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module";
import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module";
import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
import {CommunityInfo, PropagatedOrganization} from "../../openaireLibrary/connect/community/communityInfo";
import {UrlPrefixModule} from "../../openaireLibrary/utils/pipes/url-prefix.module";
@ -85,8 +86,11 @@ export class PropagatedOrganizationsComponent extends BaseComponent {
getTagged(propagatedOrganizations: PropagatedOrganization[]) {
//from index
this.subscriptions.push(this.searchOrganizationsService.searchOrganizations("fq=communityId exact " + this.community.communityId,
"", 1, propagatedOrganizations.length, [], properties).subscribe(res => {
this.subscriptions.push(this.searchOrganizationsService.advancedSearchOrganizations("communityId=" + StringUtils.quoteAndURIEncode(this.community.communityId),
1, propagatedOrganizations.length, properties, "", []).subscribe(res => {
// this.subscriptions.push(this.searchOrganizationsService.searchOrganizations("communityId=" + StringUtils.quoteAndURIEncode(this.community.communityId),
// "", 1, propagatedOrgs.length, [], properties).subscribe(res => {
this.idsToSearch = [];
this.enhancedMap = new Map();
for (let org of res[1]) {
@ -133,14 +137,16 @@ export class PropagatedOrganizationsComponent extends BaseComponent {
enrichedOrgsNotTaggedYet() {
//from index info
this.subscriptions.push(this.searchOrganizationsService.advancedSearchOrganizations("objIdentifier=" + this.idsToSearch.join(" or objIdentifier="),
1, this.idsToSearch.length, properties, "&type=organizations").subscribe(res => {
this.subscriptions.push(this.searchOrganizationsService.advancedSearchOrganizations("objIdentifier=(" + this.idsToSearch.join(" OR ") + ")",
1, this.idsToSearch.length, properties, "").subscribe(res => {
// advancedSearchOrganizations (params: string, page: number, size: number, properties:EnvProperties,
// refineParams:string=null, refineFields:string[] =null, refineQuery:string = null, minRef: boolean = false):any {
for (let org of res[1]) {
this.enhancedMap.get(org.id).title= org.title.name;
this.enhancedMap.get(org.id).acronym = org.acronym;
this.enhancedMap.get(org.id).websiteURL = org.websiteURL;
if (this.enhancedMap?.get(org.id)) {
this.enhancedMap.get(org.id).title = org.title.name;
this.enhancedMap.get(org.id).acronym = org.acronym;
this.enhancedMap.get(org.id).websiteURL = org.websiteURL;
}
}
this.prepareAffiliationsList();
}, error => {
@ -175,7 +181,7 @@ export class PropagatedOrganizationsComponent extends BaseComponent {
}
openEdit(organization: EnhancedOrganization) {
this.editOrganization = <PropagatedOrganization> organization;
this.editOrganization = <PropagatedOrganization>organization;
if (this.editOrganization) {
this.organizationModal.alertTitle = 'Edit Organization: ' + organization.acronym;
this.organizationModal.okButtonText = 'Update';

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 8cefacf721c7eed3ddffb510d004505d3fa56b54
Subproject commit db996ff8826a5f11eb5582f9089212d5d5294a7a

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 05d3e0c856d0cc1712dc4bf83434408271855e53
Subproject commit 05b0fc4a8072ccea7c40c0f244644145dab68084