Merge develop into angular-16
This commit is contained in:
commit
0ffc63ba95
|
@ -1 +1 @@
|
|||
Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb
|
||||
Subproject commit 4686ebe5f4acf97faf41b3e430f7452c406dbad5
|
|
@ -113,6 +113,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
|
|||
deleteAffiliationOpen(index: number) {
|
||||
this.index = index;
|
||||
let affiliation: Affiliation = this.affiliations[index];
|
||||
console.log(index, affiliation)
|
||||
this.removeAffiliationModal.alertTitle = 'Delete Organization';
|
||||
this.removeAffiliationModal.message = 'Do you want to remove <b>' +
|
||||
affiliation.name + '</b> from Organizations?';
|
||||
|
@ -164,7 +165,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
|
|||
|
||||
removeAffiliation() {
|
||||
this.loading = true;
|
||||
this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations',
|
||||
console.log(this.index, this.affiliations[this.index].id)
|
||||
this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations?organizationName='+this.affiliations[this.index].name,
|
||||
this.affiliations[this.index].id).subscribe((deleteOK) => {
|
||||
this.affiliations.splice(this.index, 1);
|
||||
if (this.currentPage.length === 0) {
|
||||
|
|
|
@ -82,6 +82,17 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
|
|||
placeholder="Visibility status for your community's profile."
|
||||
[options]="statuses" type="select"></div>
|
||||
</div>
|
||||
<div class="uk-width-1-2@m">
|
||||
<div input [formInput]="communityFb.get('claim')"
|
||||
placeholder="Who can create links for your community"
|
||||
[options]="claimOptions" type="select"></div>
|
||||
</div>
|
||||
<!-- Hide until the functionality is ready-->
|
||||
<!-- <div class="uk-width-1-2@m">
|
||||
<div input [formInput]="communityFb.get('membership')"
|
||||
placeholder="Who can join"
|
||||
[options]="membershipOptions" type="select"></div>
|
||||
</div>-->
|
||||
</div>
|
||||
</form>
|
||||
`,
|
||||
|
@ -91,9 +102,24 @@ export class EditCommunityComponent {
|
|||
public communityFb: UntypedFormGroup;
|
||||
public statuses: Option[] = [
|
||||
{label: 'Visible', value: 'all'},
|
||||
{label: 'Visible [Public*]', value: 'PUBLIC'},
|
||||
{label: 'Visible to managers', value: 'manager'},
|
||||
{label: 'Visible to managers [Restricted*]', value: 'RESTRICTED'},
|
||||
/*
|
||||
{label: 'Hidden [Private*]', value: 'PRIVATE'},
|
||||
*/
|
||||
{label: 'Hidden', value: 'hidden'}
|
||||
]
|
||||
public claimOptions: Option[] = [
|
||||
{label: 'Logged in users', value: 'all'},
|
||||
{label: 'Members only', value: 'membersOnly'},
|
||||
{label: 'Managers only', value: 'managersOnly'}
|
||||
|
||||
]
|
||||
public membershipOptions: Option[] = [
|
||||
{label: 'Anyone can join', value: 'open'},
|
||||
{label: 'By invitation', value: 'byInvitation'}
|
||||
]
|
||||
public community: CommunityInfo;
|
||||
public isNew: boolean;
|
||||
public properties: EnvProperties = properties
|
||||
|
@ -133,6 +159,8 @@ export class EditCommunityComponent {
|
|||
shortName: this.fb.control(this.community.shortTitle, Validators.required),
|
||||
description: this.fb.control(this.community.description),
|
||||
status: this.fb.control(this.community.status),
|
||||
claim: this.fb.control(this.community.claim),
|
||||
membership: this.fb.control(this.community.membership),
|
||||
managers: this.fb.control(this.community.managers),
|
||||
isUpload: this.fb.control(this.community.isUpload),
|
||||
logoUrl: this.fb.control(this.community.logoUrl)
|
||||
|
|
|
@ -81,7 +81,8 @@ export class RemoveContentProvidersComponent implements OnInit {
|
|||
}
|
||||
|
||||
public confirmedDeleteContentProvider() {
|
||||
this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe(
|
||||
console.log(this.selectedCommunityContentProvider)
|
||||
this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.openaireId).subscribe(
|
||||
() => {
|
||||
let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider);
|
||||
this.communityContentProviders.splice(index, 1);
|
||||
|
|
|
@ -94,12 +94,12 @@
|
|||
<div class="uk-card-body">
|
||||
<result-preview [properties]="properties" [showOrganizations]="true"
|
||||
[showSubjects]="true" [result]="getResultPreview(result)"
|
||||
[externalUrl]="projectUrl">
|
||||
[externalUrl]="projectUrl" [hasLink]="false">
|
||||
</result-preview>
|
||||
</div>
|
||||
<div class="uk-card-footer uk-padding-remove-vertical">
|
||||
<div class="uk-grid uk-grid-small uk-flex-nowrap uk-grid-divider uk-flex-right" uk-grid>
|
||||
<div *ngIf="!getCommunityProject(result)">
|
||||
<div *ngIf="!result['isPart']">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<a (click)="addProject(result)" class="uk-button uk-button-link uk-flex uk-flex-middle">
|
||||
<icon name="add" [flex]="true"></icon>
|
||||
|
@ -109,7 +109,7 @@
|
|||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="getCommunityProject(result)">
|
||||
<div *ngIf="result['isPart']">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<a (click)="removeProject(result)"
|
||||
class="uk-button uk-button-link uk-flex uk-flex-middle">
|
||||
|
|
|
@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
|
|||
import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields";
|
||||
import {Filter, Value} from "../../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
||||
import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service";
|
||||
import {SearchCommunityProjectsService} from "../../openaireLibrary/connect/projects/searchProjects.service";
|
||||
|
||||
declare var UIkit;
|
||||
|
||||
|
@ -38,7 +39,7 @@ export class AddProjectsComponent implements OnInit {
|
|||
public errorCodes: ErrorCodes;
|
||||
public openaireSearchUtils: SearchUtilsClass = new SearchUtilsClass();
|
||||
@Output() communityProjectsChanged = new EventEmitter();
|
||||
@Input() communityProjects = [];
|
||||
// @Input() communityProjects = [];
|
||||
public openaireProjects = [];
|
||||
public queryParameters: string = "";
|
||||
|
||||
|
@ -58,7 +59,7 @@ export class AddProjectsComponent implements OnInit {
|
|||
|
||||
constructor(private route: ActivatedRoute, private _router: Router, private _searchProjectsService: SearchProjectsService,
|
||||
private _manageCommunityProjectsService: ManageCommunityProjectsService,
|
||||
private _clearCacheService: ClearCacheService,
|
||||
private _clearCacheService: ClearCacheService, private _searchCommunityProjectsService: SearchCommunityProjectsService,
|
||||
private _fb: UntypedFormBuilder) {
|
||||
this.errorCodes = new ErrorCodes();
|
||||
this.openaireSearchUtils.status = this.errorCodes.LOADING;
|
||||
|
@ -121,15 +122,17 @@ export class AddProjectsComponent implements OnInit {
|
|||
public addProject(project: SearchResult) {
|
||||
this.subscriptions.push(this._manageCommunityProjectsService.addProject(this.properties, this.community.communityId, project).subscribe(
|
||||
data => {
|
||||
this.communityProjects.push(data);
|
||||
// this.communityProjects.push(data);
|
||||
this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" added", this.community.communityId);
|
||||
|
||||
UIkit.notification(this.openaireEntities.PROJECT+' successfully added!', {
|
||||
status: 'success',
|
||||
timeout: 6000,
|
||||
pos: 'bottom-right'
|
||||
});
|
||||
project["isPart"] = true;
|
||||
this.communityProjectsChanged.emit({
|
||||
value: this.communityProjects,
|
||||
value: project,
|
||||
});
|
||||
},
|
||||
err => {
|
||||
|
@ -140,20 +143,20 @@ export class AddProjectsComponent implements OnInit {
|
|||
}
|
||||
|
||||
public removeProject(project: any) {
|
||||
let communityProject = this.getCommunityProject(project);
|
||||
let projectId: string = communityProject['id'];
|
||||
this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, projectId).subscribe(
|
||||
// let communityProject = this.getCommunityProject(project);
|
||||
this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, project['id']).subscribe(
|
||||
data => {
|
||||
let index = this.communityProjects.indexOf(communityProject);
|
||||
this.communityProjects.splice(index, 1);
|
||||
// let index = this.communityProjects.indexOf(communityProject);
|
||||
// this.communityProjects.splice(index, 1);
|
||||
this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" removed", this.community.communityId);
|
||||
UIkit.notification(this.openaireEntities.PROJECT+' successfully removed!', {
|
||||
status: 'success',
|
||||
timeout: 6000,
|
||||
pos: 'bottom-right'
|
||||
});
|
||||
project["isPart"] = false;
|
||||
this.communityProjectsChanged.emit({
|
||||
value: this.communityProjects,
|
||||
value: project,
|
||||
});
|
||||
},
|
||||
err => {
|
||||
|
@ -163,16 +166,19 @@ export class AddProjectsComponent implements OnInit {
|
|||
));
|
||||
}
|
||||
|
||||
public getCommunityProject(project: any): string {
|
||||
let index: number = 0;
|
||||
for (let communityProject of this.communityProjects) {
|
||||
if (communityProject.openaireId == project.id ||
|
||||
(project.code == communityProject.grantId && project.funderShortname == communityProject.funder)) {
|
||||
return communityProject;
|
||||
public getCommunityProject(project: any) {
|
||||
this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, 1, this.resultsPerPage, project.id, null).subscribe(
|
||||
data => {
|
||||
if(data.totalElements > 0){
|
||||
project["isPart"] = true;
|
||||
}
|
||||
},
|
||||
err => {
|
||||
console.error(err);
|
||||
//TODO check erros (service not available, bad request)
|
||||
|
||||
}
|
||||
index++;
|
||||
}
|
||||
return "";
|
||||
));
|
||||
}
|
||||
|
||||
getFunders() {
|
||||
|
@ -217,7 +223,9 @@ export class AddProjectsComponent implements OnInit {
|
|||
data => {
|
||||
this.openaireSearchUtils.totalResults = data[0];
|
||||
this.openaireProjects = data[1];
|
||||
|
||||
for(let project of this.openaireProjects){
|
||||
this.getCommunityProject(project);
|
||||
}
|
||||
this.openaireSearchUtils.status = this.errorCodes.DONE;
|
||||
if (this.openaireSearchUtils.totalResults == 0) {
|
||||
this.openaireSearchUtils.status = this.errorCodes.NONE;
|
||||
|
|
|
@ -16,12 +16,11 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit
|
|||
@Component({
|
||||
selector: 'manage-projects',
|
||||
template: `
|
||||
<remove-projects #removeProjectsComponent (addProjects)="openAddProjects()" [communityProjects]="communityProjects"
|
||||
[loading]="showLoadingInRemove" [community]="community"
|
||||
(communityProjectsChanged)="communityProjectsChanged($event)">
|
||||
<remove-projects #removeProjectsComponent (addProjects)="openAddProjects()"
|
||||
[loading]="showLoadingInRemove" [community]="community">
|
||||
</remove-projects>
|
||||
<fs-modal #fsModalProjects>
|
||||
<add-projects #addProjects [communityProjects]="communityProjects" [community]="community"
|
||||
<add-projects *ngIf="modalIsOpen" #addProjects [community]="community"
|
||||
(communityProjectsChanged)="communityProjectsChanged($event)"></add-projects>
|
||||
</fs-modal>
|
||||
`
|
||||
|
@ -36,6 +35,7 @@ export class ManageProjectsComponent implements OnInit {
|
|||
public body: string = "Send from page";
|
||||
public properties: EnvProperties = properties;
|
||||
public community: CommunityInfo = null;
|
||||
modalIsOpen = false;
|
||||
|
||||
constructor(private element: ElementRef,
|
||||
private title: Title,
|
||||
|
@ -68,15 +68,17 @@ export class ManageProjectsComponent implements OnInit {
|
|||
this.fullscreen.back = true;
|
||||
this.fullscreen.okButton = true;
|
||||
this.fullscreen.open();
|
||||
this.modalIsOpen = true;
|
||||
}
|
||||
|
||||
public communityProjectsChanged($event) {
|
||||
this.communityProjects = $event.value;
|
||||
/* this.communityProjects = $event.value;
|
||||
this.showLoadingInRemove = false;
|
||||
|
||||
if (this.fullscreen.isOpen) {
|
||||
this.removeProjectsComponent.applyFilters();
|
||||
this.removeProjectsComponent.createFunderFilter();
|
||||
}
|
||||
}*/
|
||||
this.removeProjectsComponent.getCommunityProjects();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,20 +24,21 @@
|
|||
</div>
|
||||
<div inner>
|
||||
<div class="uk-margin-top">
|
||||
<results-and-pages [type]="openaireEntiites.PROJECTS | lowercase" [page]="page" [pageSize]="resultsPerPage"
|
||||
[totalResults]="previewCommunityProjects.length"></results-and-pages>
|
||||
<results-and-pages [type]="openaireEntiites.PROJECTS | lowercase" [page]="communitySearchUtils.page" [pageSize]="resultsPerPage"
|
||||
[totalResults]="communitySearchUtils.totalResults"></results-and-pages>
|
||||
</div>
|
||||
<div class="uk-grid uk-flex-middle uk-margin-medium-top" uk-grid>
|
||||
<div *ngIf="allOptions.length > 0">
|
||||
<div *ngIf="allFunderOptions.length > 0">
|
||||
<dropdown-filter #dropdownFilter dropdownClass="uk-width-medium uk-padding-small"
|
||||
name="Filter by Funder" [count]="filterForm.get('funder').value.length">
|
||||
name="Filter by Funder" [count]="filterForm.get('funder').value?1:null">
|
||||
<h6 class="uk-margin-remove-bottom" title="Filter by Funder">Funder</h6>
|
||||
<ul class="uk-list uk-margin-remove-bottom">
|
||||
<li *ngFor="let option of allOptions">
|
||||
<a class="uk-link-text">
|
||||
<label (click)="select(option.value, $event, dropdownFilter)" class="uk-flex uk-flex-middle">
|
||||
|
||||
<li *ngFor="let option of previewFunderOptions">
|
||||
<a class="uk-link-text" >
|
||||
<label (click)="select(option, $event, dropdownFilter)" class="uk-flex uk-flex-middle">
|
||||
<input class="uk-checkbox"
|
||||
type="checkbox" [checked]="isSelected(option.value)">
|
||||
type="checkbox" [checked]="isSelected(option.value.id)">
|
||||
<span class="uk-margin-small-left">{{option.label}}</span>
|
||||
</label>
|
||||
</a>
|
||||
|
@ -55,9 +56,9 @@
|
|||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="uk-width-expand@l uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center">
|
||||
<paging-no-load *ngIf="previewCommunityProjects.length > 0"
|
||||
<paging-no-load *ngIf="communitySearchUtils.totalResults> 0" [currentPage]="communitySearchUtils.page"
|
||||
(pageChange)="updatePage($event)" [size]="resultsPerPage"
|
||||
[totalResults]="previewCommunityProjects.length" customClasses="uk-flex-right">
|
||||
[totalResults]="communitySearchUtils.totalResults" customClasses="uk-flex-right">
|
||||
</paging-no-load>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -67,18 +68,17 @@
|
|||
<loading></loading>
|
||||
</div>
|
||||
<div *ngIf="!loading">
|
||||
|
||||
<div class="uk-margin-medium-bottom">
|
||||
<div *ngIf="previewCommunityProjects.length == 0"
|
||||
class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
|
||||
<div>No {{openaireEntiites.PROJECTS | lowercase}}
|
||||
<span *ngIf="communityProjects.length == 0; else: notFound">for {{community.shortTitle}}</span>
|
||||
<span *ngIf="communitySearchUtils.totalResults == 0; else: notFound">for {{community.shortTitle}}</span>
|
||||
<ng-template #notFound>found</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="previewCommunityProjects.length > 0"
|
||||
class="uk-grid uk-grid-large uk-child-width-1-1 uk-child-width-1-2@m uk-margin-bottom" uk-grid uk-height-match="target: .uk-card-body">
|
||||
<div *ngFor="let item of previewCommunityProjects.slice((page - 1)*resultsPerPage, page*resultsPerPage); let i=index">
|
||||
<div *ngFor="let item of previewCommunityProjects; let i=index">
|
||||
<div class="uk-card uk-card-default">
|
||||
<div class="uk-card-body">
|
||||
<h6 class="uk-margin-bottom">
|
||||
|
@ -124,7 +124,7 @@
|
|||
</div>
|
||||
<div class="uk-margin-small-top">
|
||||
<paging-no-load [currentPage]="page"
|
||||
[totalResults]="previewCommunityProjects.length" [size]="resultsPerPage"
|
||||
[totalResults]="communitySearchUtils.totalResults" [size]="resultsPerPage"
|
||||
(pageChange)="updatePage($event)" customClasses="uk-flex-right@m uk-flex-center">
|
||||
</paging-no-load>
|
||||
</div>
|
||||
|
|
|
@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
|
|||
import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
|
||||
import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
|
||||
import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service";
|
||||
import {debounceTime, distinctUntilChanged} from "rxjs/operators";
|
||||
|
||||
@Component({
|
||||
selector: 'remove-projects',
|
||||
|
@ -35,7 +36,7 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
public projectUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToProject.split("?")[0];
|
||||
|
||||
@Output() communityProjectsChanged = new EventEmitter();
|
||||
@Input() public communityProjects = [];
|
||||
// @Input() public communityProjects = [];
|
||||
public previewCommunityProjects = [];
|
||||
public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass();
|
||||
public errorCodes: ErrorCodes;
|
||||
|
@ -51,17 +52,13 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
/* Search */
|
||||
@ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
|
||||
filterForm: UntypedFormGroup;
|
||||
public fundersCtrl: UntypedFormArray;
|
||||
private searchText: RegExp = new RegExp('');
|
||||
public keyword: string = '';
|
||||
selectedFunders: string[] = [];
|
||||
allOptions: Option[] = [];
|
||||
allFunderOptions: Option[] = [];
|
||||
previewFunderOptions: Option[] = [];
|
||||
sortOptions: Option[] = [
|
||||
//{label:"Title (desc) ", value:{ sort: "title",descending: true }},
|
||||
{label: "Title ", value: {sort: "title", descending: false}},
|
||||
//{label:"Grant ID (desc) ", value:{ sort: "grant",descending: true }},
|
||||
{label: "Grant ID ", value: {sort: "grant", descending: false}},
|
||||
//{label:"Funder (desc) ", value:{ sort: "funder",descending: true }},
|
||||
{label: "Title ", value: {sort: "name", descending: false}},
|
||||
{label: "Grant ID ", value: {sort: "grantId", descending: false}},
|
||||
{label: "Funder ", value: {sort: "funder", descending: false}}
|
||||
];
|
||||
|
||||
|
@ -80,27 +77,21 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
ngOnInit() {
|
||||
this.communitySearchUtils.keyword = "";
|
||||
|
||||
this.fundersCtrl = this._fb.array([]);
|
||||
this.filterForm = this._fb.group({
|
||||
keyword: [''],
|
||||
funder: this.fundersCtrl,
|
||||
funder: this._fb.control(null),
|
||||
sort: this._fb.control(this.sortOptions[0].value)
|
||||
});
|
||||
|
||||
this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
|
||||
this.searchText = new RegExp(value, 'i');
|
||||
this.subscriptions.push(this.filterForm.get('keyword').valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
|
||||
this.page = 1;
|
||||
this.applyFilters();
|
||||
}));
|
||||
this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,(this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null),
|
||||
this.filterForm.get("sort").value.sort );
|
||||
|
||||
this.subscriptions.push(this.filterForm.get('funder').valueChanges.subscribe(value => {
|
||||
this.page = 1;
|
||||
this.applyFilters();
|
||||
}));
|
||||
|
||||
this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => {
|
||||
this.page = 1;
|
||||
this.sort();
|
||||
this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null, this.filterForm.get("sort").value.sort );
|
||||
}));
|
||||
|
||||
this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => {
|
||||
|
@ -111,7 +102,8 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
+ this.community.communityId + ".openaire.eu" + this.properties.searchLinkToProject.split("?")[0];
|
||||
|
||||
this.keyword = '';
|
||||
this._getCommunityProjects();
|
||||
this._getCommunityFunders();
|
||||
this._getCommunityProjects(1,this.keyword, null);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
@ -133,18 +125,13 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
}
|
||||
|
||||
public confirmedDeleteProject(data: any) {
|
||||
this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.id).subscribe(
|
||||
this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe(
|
||||
data => {
|
||||
let index = this.communityProjects.indexOf(this.selectedCommunityProject);
|
||||
this.communityProjects.splice(index, 1);
|
||||
this.applyFilters();
|
||||
|
||||
this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId);
|
||||
NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!');
|
||||
this.communityProjectsChanged.emit({
|
||||
value: this.communityProjects,
|
||||
});
|
||||
this.communitySearchUtils.totalResults--;
|
||||
this.communitySearchUtils.page = 1;
|
||||
this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null);
|
||||
|
||||
},
|
||||
err => {
|
||||
this.handleError('An error has been occurred. Try again later!');
|
||||
|
@ -179,29 +166,21 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
this.alertModalDeleteCommunity.okButtonText = "Yes";
|
||||
this.alertModalDeleteCommunity.open();
|
||||
}
|
||||
|
||||
public _getCommunityProjects() {
|
||||
public getCommunityProjects() {
|
||||
this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null );
|
||||
}
|
||||
public _getCommunityProjects(page, keyword, funder, orderBy = "name" ) {
|
||||
this.communitySearchUtils.status = this.errorCodes.LOADING;
|
||||
this.communityProjects = [];
|
||||
this.communitySearchUtils.totalResults = 0;
|
||||
this.communitySearchUtils.page = 1;
|
||||
this.communitySearchUtils.keyword = "";
|
||||
|
||||
this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe(
|
||||
this.communitySearchUtils.page = page;
|
||||
this.communitySearchUtils.keyword = keyword;
|
||||
this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder, orderBy).subscribe(
|
||||
data => {
|
||||
this.communityProjects = data;
|
||||
this.previewCommunityProjects = this.communityProjects;
|
||||
this.sort();
|
||||
|
||||
this.communitySearchUtils.totalResults = data.length;
|
||||
this.previewCommunityProjects = data.content;
|
||||
this.communitySearchUtils.totalResults = data.totalElements;
|
||||
this.communitySearchUtils.status = this.errorCodes.DONE;
|
||||
|
||||
this.communityProjectsChanged.emit({
|
||||
value: this.communityProjects,
|
||||
value: this.communitySearchUtils.totalResults
|
||||
});
|
||||
|
||||
this.createFunderFilter();
|
||||
|
||||
this.loading = false;
|
||||
},
|
||||
err => {
|
||||
|
@ -215,90 +194,33 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
} else {
|
||||
this.communitySearchUtils.status = this.errorCodes.NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
this.loading = false;
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
public createFunderFilter(): void {
|
||||
let funders: Set<string> = new Set<string>();
|
||||
this.allOptions = [];
|
||||
let i;
|
||||
for (i = 0; i < this.communityProjects.length; i++) {
|
||||
let funder = this.communityProjects[i].funder;
|
||||
if (funder && !funders.has(funder)) {
|
||||
funders.add(funder);
|
||||
this.allOptions.push({label: funder, value: {id: funder, label: funder}});
|
||||
public _getCommunityFunders() {
|
||||
this.subscriptions.push(this._searchCommunityProjectsService.getProjectFunders(this.properties, this.community.communityId).subscribe(
|
||||
data => {
|
||||
for (let funder of data) {
|
||||
this.allFunderOptions.push({label: funder, value: {id: funder, label: funder}});
|
||||
}
|
||||
this.previewFunderOptions =[...this.allFunderOptions];
|
||||
},
|
||||
err => {
|
||||
}
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
public updatePage($event) {
|
||||
HelperFunctions.scroll();
|
||||
this.page = $event.value;
|
||||
this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, null);
|
||||
}
|
||||
|
||||
addNew() {
|
||||
this.addProjects.emit();
|
||||
}
|
||||
|
||||
public applyFilters() {
|
||||
this.previewCommunityProjects = this.communityProjects.filter(project => {
|
||||
return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project));
|
||||
});
|
||||
// check paging here!!!
|
||||
if (this.previewCommunityProjects.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) {
|
||||
this.page = 1;
|
||||
}
|
||||
|
||||
this.sort();
|
||||
}
|
||||
|
||||
public filterCommunityProjectByKeyword(project): boolean {
|
||||
return this.searchText.toString() === ''
|
||||
|| ((project.name + " " + project.acronym + " " + project.grantId + " " + project.funder)).match(this.searchText) != null;
|
||||
}
|
||||
|
||||
public filterCommunityProjectByFunder(project): boolean {
|
||||
if (this.fundersCtrl.getRawValue().length == 0) {
|
||||
return true;
|
||||
}
|
||||
for (let funder of this.fundersCtrl.getRawValue()) {
|
||||
if (project.funder.toLowerCase().indexOf(funder.label.toLowerCase()) != -1) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private sort() {
|
||||
let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value;
|
||||
|
||||
this.previewCommunityProjects.sort((left, right): number => {
|
||||
if (sortOption.sort == "title") {
|
||||
if ((left.name + left.acronym) > (right.name + right.acronym)) {
|
||||
return sortOption.descending ? -1 : 1;
|
||||
} else if ((left.name + left.acronym) < (right.name + right.acronym)) {
|
||||
return sortOption.descending ? 1 : -1;
|
||||
}
|
||||
} else if (sortOption.sort == "grant") {
|
||||
if (left.grantId > right.grantId) {
|
||||
return sortOption.descending ? -1 : 1;
|
||||
} else if (left.grantId < right.grantId) {
|
||||
return sortOption.descending ? 1 : -1;
|
||||
}
|
||||
} else if (sortOption.sort == "funder") {
|
||||
if (left.funder > right.funder) {
|
||||
return sortOption.descending ? -1 : 1;
|
||||
} else if (left.funder < right.funder) {
|
||||
return sortOption.descending ? 1 : -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
|
||||
public onSearchClose() {
|
||||
this.communitySearchUtils.keyword = this.filterForm.get('keyword').value;
|
||||
|
@ -313,23 +235,23 @@ export class RemoveProjectsComponent implements OnInit {
|
|||
NotificationHandler.rise(message, 'danger');
|
||||
}
|
||||
|
||||
select(value: string, event, dropdownFilter: DropdownFilterComponent) {
|
||||
select(option, event, dropdownFilter: DropdownFilterComponent) {
|
||||
console.log(option)
|
||||
if(event.target instanceof HTMLInputElement) {
|
||||
dropdownFilter.closeDropdown();
|
||||
if(event.target.checked && !this.selectedFunders.find(entity => value === entity)) {
|
||||
this.selectedFunders.push(value);
|
||||
this.fundersCtrl.setControl(this.fundersCtrl.value.length, this._fb.control(value));
|
||||
if(event.target.checked) {
|
||||
this.filterForm.get("funder").setValue(option.value);
|
||||
this._getCommunityProjects(1, this.filterForm.get('keyword').value, this.filterForm.get('funder').value.id );
|
||||
this.previewFunderOptions =[option];
|
||||
} else if(!event.target.checked) {
|
||||
let index = this.selectedFunders.indexOf(value);
|
||||
if(index !== -1) {
|
||||
this.selectedFunders.splice(index, 1);
|
||||
this.fundersCtrl.removeAt(index);
|
||||
}
|
||||
this.filterForm.get("funder").setValue(null);
|
||||
this._getCommunityProjects(1, this.filterForm.get('keyword').value,null);
|
||||
this.previewFunderOptions =[...this.allFunderOptions];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
isSelected(value: string) {
|
||||
return this.filterForm && this.filterForm.get('funder').value.find(funder => funder === value)
|
||||
return this.filterForm && this.filterForm.get('funder').value && this.filterForm.get('funder').value.id === value;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -194,7 +194,7 @@ export class AddZenodoCommunitiesComponent implements OnInit {
|
|||
public getOpenaireId(community: any): string {
|
||||
for (let com of this.selectedCommunities) {
|
||||
if (com.id == community.id) {
|
||||
return com.openaireId;
|
||||
return com.id;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
|
|
@ -88,7 +88,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
|
||||
public confirmedDeleteCommunity(data: any) {
|
||||
this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.openaireId).subscribe(
|
||||
this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe(
|
||||
data => {
|
||||
var pos = -1;
|
||||
for (var i = 0; i < this.selectedCommunities.length; i++) {
|
||||
|
|
|
@ -3,8 +3,6 @@ import {ActivatedRoute, Router} from '@angular/router';
|
|||
|
||||
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
|
||||
import {ZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service';
|
||||
import {SearchZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service';
|
||||
|
||||
import {CommunityService} from '../../openaireLibrary/connect/community/community.service';
|
||||
import {CommunityInfo} from '../../openaireLibrary/connect/community/communityInfo';
|
||||
import {ZenodoCommunityInfo} from '../../openaireLibrary/connect/zenodoCommunities/zenodoCommunityInfo';
|
||||
|
@ -50,8 +48,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
|
|||
|
||||
constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router,
|
||||
private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title,
|
||||
private _communityService: CommunityService,
|
||||
private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService) {
|
||||
private _communityService: CommunityService) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
@ -65,8 +62,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
|
|||
this.masterZenodoCommunityId = this.community.zenodoCommunity;
|
||||
if (this.masterZenodoCommunityId) {
|
||||
this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
|
||||
this.properties.zenodoCommunities + this.masterZenodoCommunityId,
|
||||
null).subscribe(
|
||||
this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe(
|
||||
result => {
|
||||
this.masterZenodoCommunity = result;
|
||||
this.selectedCommunities.unshift(this.masterZenodoCommunity);
|
||||
|
@ -81,25 +77,24 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
this.zenodoSearchUtils.status = this.errorCodes.LOADING;
|
||||
this.zenodoSearchUtils.status = this.errorCodes.LOADING;
|
||||
this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe(
|
||||
result => {
|
||||
this.selectedCommunityIds = result;
|
||||
// this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe(
|
||||
// result => {
|
||||
this.selectedCommunityIds = this.community.otherZenodoCommunities;
|
||||
this.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length;
|
||||
if (this.selectedCommunityIds.length === 0) {
|
||||
this.zenodoSearchUtils.status = this.errorCodes.NONE;
|
||||
}
|
||||
for (let i = 0; i < this.selectedCommunityIds.length; i++) {
|
||||
this.getZenodoCommunityById(
|
||||
this.selectedCommunityIds[i]['zenodoid'],
|
||||
this.selectedCommunityIds[i]['id']);
|
||||
this.selectedCommunityIds[i]);
|
||||
}
|
||||
|
||||
},
|
||||
error => {
|
||||
console.log('list of zenodo communities couldn\'t be loaded');
|
||||
this.zenodoSearchUtils.status = this.errorCodes.DONE;
|
||||
}
|
||||
);
|
||||
// },
|
||||
// error => {
|
||||
// console.log('list of zenodo communities couldn\'t be loaded');
|
||||
// this.zenodoSearchUtils.status = this.errorCodes.DONE;
|
||||
// }
|
||||
// );
|
||||
})
|
||||
);
|
||||
|
||||
|
@ -116,9 +111,9 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
|
|||
});
|
||||
}
|
||||
|
||||
getZenodoCommunityById(zenodoid, openaireId) {
|
||||
getZenodoCommunityById(zenodoid) {
|
||||
this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
|
||||
this.properties.zenodoCommunities + zenodoid, openaireId).subscribe(
|
||||
this.properties.zenodoCommunities + zenodoid).subscribe(
|
||||
result => {
|
||||
this.selectedCommunities.push(result);
|
||||
this.zenodocommunitiesloadedCount++;
|
||||
|
@ -131,7 +126,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
|
|||
error => {
|
||||
const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo();
|
||||
emptyCommunity.id = zenodoid;
|
||||
emptyCommunity.openaireId = openaireId;
|
||||
emptyCommunity.title = zenodoid;
|
||||
this.selectedCommunities.push(emptyCommunity);
|
||||
this.zenodocommunitiesloadedCount++;
|
||||
|
|
|
@ -5,7 +5,6 @@ import {RouterModule} from '@angular/router';
|
|||
import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component';
|
||||
import {AddZenodoCommunitiesComponent} from './add-zenodo-communities.component';
|
||||
import {ZenodoCommunitiesComponent} from './zenodo-communities.component';
|
||||
import {SearchZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';
|
||||
import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service';
|
||||
import {ZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
|
||||
import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
|
||||
|
@ -22,7 +21,7 @@ import {PagingModule} from "../../openaireLibrary/utils/paging.module";
|
|||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, RouterModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule,
|
||||
CommonModule, FormsModule, RouterModule, ZenodoCommunitiesServiceModule,
|
||||
AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule
|
||||
],
|
||||
declarations: [
|
||||
|
|
|
@ -11,7 +11,7 @@ export class ManageCommunityContentProvidersService {
|
|||
|
||||
removeContentProvider(properties: EnvProperties, pid: string, id: string): any {
|
||||
let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
|
||||
let url = properties.communityAPI + pid + '/contentproviders';
|
||||
let url = properties.communityAPI + pid + '/contentproviders?contentproviderId=' +id;
|
||||
return this.http.request('delete', url, {body: id, headers: headers});
|
||||
}
|
||||
|
||||
|
|
|
@ -12,9 +12,9 @@ export class ManageCommunityProjectsService {
|
|||
|
||||
let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
|
||||
|
||||
let url = properties.communityAPI+pid+"/projects";
|
||||
let url = properties.communityAPI+pid+"/projects?projectId="+id;
|
||||
//return this.http.delete(url, options)
|
||||
return this.http.request('delete', url, { body: id, headers: headers})
|
||||
return this.http.request('delete', url, { headers: headers})
|
||||
}
|
||||
|
||||
addProject(properties:EnvProperties, pid: string, project: any) {
|
||||
|
|
|
@ -11,10 +11,10 @@ export class ManageZenodoCommunitiesService {
|
|||
//let options = new RequestOptions({headers: headers, body: id});
|
||||
|
||||
let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
|
||||
let url = properties.communityAPI + pid + "/zenodocommunities";
|
||||
let url = properties.communityAPI + pid + "/zenodocommunities?zenodocommunity="+id;
|
||||
|
||||
//return this.http.delete(url, options);
|
||||
return this.http.request('delete', url, { body: id, headers: headers})
|
||||
return this.http.request('delete', url, { headers: headers})
|
||||
}
|
||||
|
||||
addZCommunity(properties:EnvProperties, pid: string,zenodoid: string) {
|
||||
|
@ -23,13 +23,9 @@ export class ManageZenodoCommunitiesService {
|
|||
|
||||
let headers = new HttpHeaders({'Content-Type': 'application/json'});
|
||||
|
||||
let url = properties.communityAPI+pid+"/zenodocommunities";
|
||||
var zCommunity: any = {
|
||||
"communityId": pid,
|
||||
let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid;
|
||||
|
||||
"zenodoid": zenodoid
|
||||
};
|
||||
return this.http.post<any>(url, JSON.stringify(zCommunity), {headers: headers});
|
||||
return this.http.post<any>(url, headers);
|
||||
//.map(res => <any> res.json())
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df
|
||||
Subproject commit fe7394ea9ed4319a3234a00b0c8ce09023f50799
|
|
@ -25,6 +25,7 @@ export let properties: EnvProperties = {
|
|||
cordisURL: "http://cordis.europa.eu/projects/",
|
||||
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
|
||||
r3DataURL: "http://service.re3data.org/repository/",
|
||||
swhURL: "https://archive.softwareheritage.org/",
|
||||
sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=",
|
||||
zenodo: "https://zenodo.org/",
|
||||
zenodoCommunities: "https://zenodo.org/api/communities/",
|
||||
|
|
|
@ -25,6 +25,7 @@ export let properties: EnvProperties = {
|
|||
cordisURL: "http://cordis.europa.eu/projects/",
|
||||
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
|
||||
r3DataURL: "http://service.re3data.org/repository/",
|
||||
swhURL: "https://archive.softwareheritage.org/",
|
||||
sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=",
|
||||
zenodo: "https://zenodo.org/",
|
||||
zenodoCommunities: "https://zenodo.org/api/communities/",
|
||||
|
|
|
@ -30,6 +30,7 @@ export let properties: EnvProperties = {
|
|||
cordisURL: 'http://cordis.europa.eu/projects/',
|
||||
openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/',
|
||||
r3DataURL: 'http://service.re3data.org/repository/',
|
||||
swhURL: "https://archive.softwareheritage.org/",
|
||||
sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=',
|
||||
zenodo: 'https://zenodo.org/',
|
||||
zenodoCommunities: 'https://zenodo.org/api/communities/',
|
||||
|
|
Loading…
Reference in New Issue