-
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 1bcccee..e91838e 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -27,7 +27,7 @@ export class AppComponent implements OnInit {
params: BehaviorSubject = new BehaviorSubject(null);
data: BehaviorSubject = new BehaviorSubject(null);
hasSidebar: boolean = false;
- hasHeader: boolean = false;
+ hasHeader: boolean = true;
hasAdminMenu: boolean = false;
isFrontPage: boolean = false;
sideBarItems: MenuItem[] = [];
@@ -83,6 +83,11 @@ export class AppComponent implements OnInit {
}));
this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => {
this.hasHeader = hasHeader;
+ if(!this.hasHeader) {
+ document.documentElement.style.setProperty('--header-height', '0');
+ } else {
+ document.documentElement.style.setProperty('--header-height', '65px');
+ }
this.cdr.detectChanges();
}));
this.subscriptions.push(this.layoutService.hasAdminMenu.subscribe(hasAdminMenu => {
@@ -113,14 +118,14 @@ export class AppComponent implements OnInit {
}
}));
} else {
- this.buildMenu();
this.loading = false;
}
} else {
- this.communityService.setCommunity(null);
- this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219));
- this.community = null;
- this.buildMenu();
+ if(this.community) {
+ this.communityService.setCommunity(null);
+ this.community = null;
+ this.buildMenu();
+ }
this.loading = false;
}
}
@@ -212,12 +217,12 @@ export class AppComponent implements OnInit {
badge: false,
stickyAnimation: false
};
- this.sideBarItems.push(new MenuItem("community", "Community Info", "", "/" + this.community.communityId, false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info"));
- this.sideBarItems.push(new MenuItem("users", "Users", "", "/" + this.community.communityId + "/users", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/users"));
- this.sideBarItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/" + this.community.communityId + "/admin-tools/pages", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/admin-tools"));
- this.sideBarItems.push(new MenuItem("customization", "Customization", "", "/" + this.community.communityId + "/customize-layout", false, [], [], {}));
+ this.sideBarItems.push(new MenuItem("community", "Community Info", "", "/" + this.community.communityId, false, [], [], {}, {name: 'badge'}, null, null, "/" + this.community.communityId + "/info"));
+ this.sideBarItems.push(new MenuItem("users", "Users", "", "/" + this.community.communityId + "/users", false, [], [], {}, {name: 'group'}, null, null, "/" + this.community.communityId + "/users"));
+ this.sideBarItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/" + this.community.communityId + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, null, "/" + this.community.communityId + "/admin-tools"));
+ this.sideBarItems.push(new MenuItem("customization", "Customization", "", "/" + this.community.communityId + "/customize-layout", false, [], [], {}, {name: 'brush'}));
if (this.community.type === 'ri') {
- this.sideBarItems.push(new MenuItem("mining", "Mining", "", "/" + this.community.communityId + "/mining/manage-profiles", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/mining"));
+ this.sideBarItems.push(new MenuItem("mining", "Mining", "", "/" + this.community.communityId + "/mining/manage-profiles", false, [], [], {}, {name: 'architecture'}, null, null, "/" + this.community.communityId + "/mining"));
}
this.specialSideBarMenuItem = new MenuItem("back", "Manage communities", "", "/", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'});
@@ -283,7 +288,9 @@ export class AppComponent implements OnInit {
badge: false,
stickyAnimation: false
};
- this.sideBarItems.push(new MenuItem("communities", "Manage Communities", "", "/", false, [], [], {}, {name: 'settings'}));
+ if(this.isCurator()) {
+ this.sideBarItems.push(new MenuItem("communities", "Manage Communities", "", "/", false, [], [], {}, {name: 'settings'}));
+ }
if (Session.isPortalAdministrator(this.user)) {
this.sideBarItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin-tools'));
this.sideBarItems.push(new MenuItem("connect", "Connect Options", "", "/connect/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/connect/admin-tools'));
@@ -291,6 +298,7 @@ export class AppComponent implements OnInit {
}
this.specialSideBarMenuItem = null;
}
+ this.hasSidebar = this.hasSidebar && this.sideBarItems.length > 0;
}
private isCurator() {
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
index 213ee2a..b65ae0f 100644
--- a/src/app/app.routing.ts
+++ b/src/app/app.routing.ts
@@ -1,5 +1,5 @@
import {NgModule} from '@angular/core';
-import {PreloadAllModules, RouterModule, Routes} from '@angular/router';
+import {RouterModule, Routes} from '@angular/router';
import {IsCommunity} from './openaireLibrary/connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from './openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard';
import {AdminErrorPageComponent} from './pages/error/errorPage.component';
@@ -60,10 +60,7 @@ const routes: Routes = [
];
@NgModule({
- imports: [RouterModule.forRoot(routes, {
- preloadingStrategy: PreloadAllModules,
- onSameUrlNavigation: "reload"
- })],
+ imports: [RouterModule.forRoot(routes)],
exports: [ RouterModule ]
})
export class AppRoutingModule {}
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 936c870..a738d3b 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 936c870abcb48b632f3a1433130e8701c813fa65
+Subproject commit a738d3bb49d1af38f7eaf3ce34d519c76f075e4a
diff --git a/src/app/pages/affiliations/affiliations.component.html b/src/app/pages/affiliations/affiliations.component.html
index 54b4486..224a528 100644
--- a/src/app/pages/affiliations/affiliations.component.html
+++ b/src/app/pages/affiliations/affiliations.component.html
@@ -35,47 +35,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
{
this.deletePhoto();
this.communityFb.get('logoUrl').setValue(res.filename);
@@ -211,7 +210,7 @@ export class EditCommunityComponent {
if (this.isNew) {
this.removePhoto();
this.subscriptions.push(this.communityService.updateCommunity(
- this.properties.communityAPI + this.community.communityId, this.communityFb.value).subscribe(() => {
+ this.properties.communityAPI + this.community.communityId, this.communityFb.getRawValue()).subscribe(() => {
this.communityService.getCommunity(this.community.communityId, true).subscribe(community => {
UIkit.notification(community.shortTitle + ' has been successfully created', {
status: 'success',
@@ -231,7 +230,7 @@ export class EditCommunityComponent {
}
}));
} else {
- this.subscriptions.push(this.communityService.updateCommunity(this.properties.communityAPI + this.community.communityId, this.communityFb.value).subscribe(() => {
+ this.subscriptions.push(this.communityService.updateCommunity(this.properties.communityAPI + this.community.communityId, this.communityFb.getRawValue()).subscribe(() => {
this.communityService.getCommunity(this.community.communityId, true).subscribe(community => {
UIkit.notification(community.shortTitle + ' has been successfully saved', {
status: 'success',
diff --git a/src/app/pages/content-providers/communityContentProviders.module.ts b/src/app/pages/content-providers/communityContentProviders.module.ts
index 60bb644..3947c2f 100644
--- a/src/app/pages/content-providers/communityContentProviders.module.ts
+++ b/src/app/pages/content-providers/communityContentProviders.module.ts
@@ -17,7 +17,7 @@ import {NoLoadPaging} from "../../openaireLibrary/searchPages/searchUtils/no-loa
import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module";
import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module";
import {IconsService} from "../../openaireLibrary/utils/icons/icons.service";
-import {add, arrow_left, close, edit, remove_circle_outline} from "../../openaireLibrary/utils/icons/icons";
+import {add, arrow_left, close, edit, filters, remove_circle_outline} from "../../openaireLibrary/utils/icons/icons";
import {FullScreenModalModule} from "../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module";
import {ResultPreviewModule} from "../../openaireLibrary/utils/result-preview/result-preview.module";
import {SearchDataprovidersServiceModule} from "../../openaireLibrary/connect/contentProviders/searchDataprovidersService.module";
@@ -63,6 +63,6 @@ import {SearchDataprovidersService} from "../../openaireLibrary/services/searchD
export class CommunityContentProvidersModule {
constructor(private iconsService: IconsService) {
- this.iconsService.registerIcons([remove_circle_outline, add, edit, close, arrow_left]);
+ this.iconsService.registerIcons([filters]);
}
}
diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts
index d96550d..362c86c 100644
--- a/src/app/pages/content-providers/manage-content-providers.component.ts
+++ b/src/app/pages/content-providers/manage-content-providers.component.ts
@@ -1,34 +1,35 @@
import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
-import {ActivatedRoute, Router} from "@angular/router";
+import {Router} from "@angular/router";
import {RemoveContentProvidersComponent} from './remove-content-providers.component';
-
-import {Session} from '../../openaireLibrary/login/utils/helper.class';
-import {LoginErrorCodes} from '../../openaireLibrary/login/utils/guardHelper.class';
import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
import {Title} from '@angular/platform-browser';
-import {FullScreenModalComponent} from "../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component";
+import {
+ FullScreenModalComponent
+} from "../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component";
import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {properties} from "../../../environments/environment";
import {Subscriber} from "rxjs";
+import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo";
+import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
@Component({
selector: 'manage-content-providers',
template: `
+
+
-
+
-
-
-
+
+
-
+
If you cannot find a content provider relevant to your community, probably it is not OpenAIRE compliant.
Feel free to contact us
({{properties.feedbackmailForMissingEntities}})
to let us know and we'll try to get the provider on board!
@@ -45,33 +46,27 @@ export class ManageContentProvidersComponent implements OnInit {
@Input() communityContentProviders = [];
@ViewChild(RemoveContentProvidersComponent) removeContentProvidersComponent: RemoveContentProvidersComponent;
@ViewChild('fsModal', { static: true }) fullscreen: FullScreenModalComponent;
-
public toggle: boolean = false;
-
private subscriptions: any[] = [];
-
public showLoadingInRemove: boolean = true;
-
public body: string = "Send from page";
public properties: EnvProperties = properties;
- public communityId: string = "";
+ public community: CommunityInfo;
constructor(private element: ElementRef,
private title: Title,
- private route: ActivatedRoute, private _router: Router) {
+ private communityService: CommunityService, private _router: Router) {
}
ngOnInit() {
- this.subscriptions.push(this.route.params.subscribe(params => {
- this.communityId = params['community'];
-
- if (this.communityId) {
- this.title.setTitle(this.communityId.toUpperCase() + ' | Content Providers');
+ this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => {
+ this.community = community;
+ if (this.community) {
+ this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Content Providers');
this.body = "[Please write your message here]";
this.body = StringUtils.URIEncode(this.body);
}
}));
-
this.fullscreen.title = "Search and Add Content Providers";
this.fullscreen.okButtonText = "Done";
this.fullscreen.okButton = true;
@@ -86,17 +81,10 @@ export class ManageContentProvidersComponent implements OnInit {
}
public toggleAction() {
- if (!Session.isLoggedIn()) {
- this._router.navigate(['/user-info'], {
- queryParams: {'errorCode': LoginErrorCodes.NOT_VALID, 'redirectUrl': this._router.url}
- });
- } else {
- HelperFunctions.scroll();
-
- this.toggle = !this.toggle;
- if (this.toggle) {
- this.fullscreen.open();
- }
+ HelperFunctions.scroll();
+ this.toggle = !this.toggle;
+ if (this.toggle) {
+ this.fullscreen.open();
}
}
diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html
index 7fad95a..3e1c700 100644
--- a/src/app/pages/content-providers/remove-content-providers.component.html
+++ b/src/app/pages/content-providers/remove-content-providers.component.html
@@ -1,150 +1,111 @@
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No content providers for {{name}}
-
-
-
+
+ = new EventEmitter();
@Input() public toggle: boolean = true;
-
+
constructor(private route: ActivatedRoute, private _router: Router,
- private _fb: FormBuilder, private communityService: CommunityService,
+ private _fb: FormBuilder,
private _manageCommunityContentProvidersService: ManageCommunityContentProvidersService,
private _searchCommunityContentProvidersService: SearchCommunityDataprovidersService) {
- this.errorCodes = new ErrorCodes();
- this.communitySearchUtils.status = this.errorCodes.LOADING;
}
-
+
ngOnInit() {
- this.communitySearchUtils.keyword = "";
-
this.filterForm = this._fb.group({
keyword: [''],
- // 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.page = 1;
this.applyFilters();
}));
-
- // this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => {
- // this.page = 1;
- // this.sort();
- // }));
-
- this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => {
- if (community) {
- this.portal = community.communityId;
- this.name = community.shortTitle;
- this.contentProviderUrl = "https://"
- + ((this.properties.environment == "beta" || this.properties.environment == "development") ? "beta." : "")
- + this.portal + ".openaire.eu" + this.properties.searchLinkToDataProvider;
-
- this.keyword = '';
- this._getCommunityContentProviders();
- }
- }));
+ this.contentProviderUrl = "https://"
+ + ((this.properties.environment == "beta" || this.properties.environment == "development") ? "beta." : "")
+ + this.community.communityId + ".openaire.eu" + this.properties.searchLinkToDataProvider;
+ this.getCommunityContentProviders();
}
-
+
public ngOnDestroy() {
this.subscriptions.forEach(sub => {
if (sub instanceof Subscriber) {
@@ -107,273 +78,117 @@ export class RemoveContentProvidersComponent implements OnInit {
}
});
}
-
- public getCriteriaLabel(selectionCriteria: SelectionCriteria): string {
- if (selectionCriteria && selectionCriteria.criteria.length > 0) {
- return (selectionCriteria.criteria.length === 1) ? '1 criterion' : (selectionCriteria.criteria.length + ' criteria')
- } else {
- return 'no criteria';
- }
- }
-
- // filterData(row: any, query: string) {
- // let returnValue: boolean = false;
- //
- // if(query) {
- // for(var i=0; i <2; i++){
- // var r= this.filterQuery(row[i], query);
- // if(r) {
- // returnValue = true;
- // break;
- // }
- // }
- //
- // if(!returnValue) {
- // return false;
- // }
- // }
- //
- // return true;
- // }
- //
- // filterQuery(data, query){
- // if(data.toLowerCase().indexOf(query.toLowerCase()) > -1){
- // return true;
- // }else{
- // return false;
- // }
- // }
-
- public inCommunity(result: any): any {
- let found = false;
- for (let contentProvider of this.communityContentProviders) {
- if (contentProvider.opeaireId == result.id) {
- return true;
- }
- }
- return found;
-
- }
-
- totalPages(): number {
- let totalPages: any = this.communitySearchUtils.totalResults / (this.resultsPerPage);
- if (!(Number.isInteger(totalPages))) {
- totalPages = (parseInt(totalPages, 10) + 1);
- }
- return totalPages;
- }
getFiltersAsText(criteria: Criteria[]): string {
- let text = criteria.slice(0,3).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => {
+ let text = criteria.slice(0, 3).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => {
let field = this.fields.find(field => field.value === constraint.field).label;
let matchCase = false;
- if(!constraint.verb.includes('_caseinsensitive')) {
+ if (!constraint.verb.includes('_caseinsensitive')) {
matchCase = true;
}
let verb = this.verbs.find(verb => verb.value === constraint.verb.replace("_caseinsensitive", "")).label;
- let value = '"' + constraint.value + '"' + (matchCase?" (Match case)":"");
+ let value = '"' + constraint.value + '"' + (matchCase ? " (Match case)" : "");
return field + " " + verb + " " + value;
}).join(" and "));
return text.join("
"); } - - // goTo(page:number = 1){ - // this.communitySearchUtils.page=page; - // - // var table = $('#dpTable').DataTable(); - // table.page( page - 1 ).draw( false ); - // - // var info = table.page.info(); - // this.communitySearchUtils.totalResults = info.recordsDisplay; - // } - - public confirmedDeleteContentProvider(data: any) { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: { - "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this._router.url - } - }); - } else { - this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.portal, this.selectedCommunityContentProvider.id).subscribe( - data => { - let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); - this.communityContentProviders.splice(index, 1); - - this.applyFilters(); - - UIkit.notification('Content Provider successfully removed!', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - - this.communityContentProvidersChanged.emit({ - value: this.communityContentProviders, - }); - - this.communitySearchUtils.totalResults--; - this.communitySearchUtils.page = 1; - }, - err => { - this.handleError('An error has been occurred. Try again later!'); - console.error(err); - } - )); - } + + public confirmedDeleteContentProvider() { + this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe( + () => { + let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); + this.communityContentProviders.splice(index, 1); + this.applyFilters(); + this.handleSuccess('Content Provider successfully removed!') + this.communityContentProvidersChanged.emit({ + value: this.communityContentProviders, + }); + }, + err => { + this.handleError('An error has been occurred. Try again later!'); + console.error(err); + } + )); } - + public removeContentProvider(communityContentProvider: any) { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: { - "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this._router.url - } - }); - } else { - this.selectedCommunityContentProvider = communityContentProvider; - this.alertModalDeleteCommunity.cancelButton = true; - this.alertModalDeleteCommunity.okButton = true; - this.alertModalDeleteCommunity.alertTitle = "Remove content provider?"; - let title = ""; - if (communityContentProvider.name) { - title = communityContentProvider.name; - } - if (communityContentProvider.name && communityContentProvider.acronym) { - title += " ("; - } - if (communityContentProvider.acronym) { - title += communityContentProvider.acronym; - } - if (communityContentProvider.name && communityContentProvider.acronym) { - title += ")"; - } - this.alertModalDeleteCommunity.message = "Content Provider"; - if (title) { - this.alertModalDeleteCommunity.message += " '" + title + "' "; - } - this.alertModalDeleteCommunity.message += "will be removed from your community. Are you sure?"; - this.alertModalDeleteCommunity.okButtonText = "Yes"; - this.alertModalDeleteCommunity.open(); + this.selectedCommunityContentProvider = communityContentProvider; + this.deleteModal.alertTitle = "Remove content provider"; + let title = ""; + if (communityContentProvider.name) { + title = communityContentProvider.name; } - } - - public _getCommunityContentProviders() { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: { - "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this._router.url - } - }); - } else { - this.communitySearchUtils.status = this.errorCodes.LOADING; - this.communityContentProviders = []; - this.communitySearchUtils.totalResults = 0; - this.communitySearchUtils.page = 1; - this.communitySearchUtils.keyword = ""; - - this.subscriptions.push(this._searchCommunityContentProvidersService.searchDataproviders(this.properties, this.portal).subscribe( - data => { - this.communityContentProviders = data; - this.previewCommunityContentProviders = this.communityContentProviders; - // this.sort(); - - this.communitySearchUtils.totalResults = data.length; - this.communitySearchUtils.status = this.errorCodes.DONE; - - this.communityContentProvidersChanged.emit({ - value: this.communityContentProviders, - }); - - this.showLoading = false; - }, - err => { - console.error(err); - //TODO check erros (service not available, bad request) - - if (err.status == '404') { - this.communitySearchUtils.status = this.errorCodes.NOT_FOUND; - } else if (err.status == '500') { - this.communitySearchUtils.status = this.errorCodes.ERROR; - } else { - this.communitySearchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - - this.showLoading = false; - } - )); + if (communityContentProvider.name && communityContentProvider.acronym) { + title += " ("; } + if (communityContentProvider.acronym) { + title += communityContentProvider.acronym; + } + if (communityContentProvider.name && communityContentProvider.acronym) { + title += ")"; + } + this.deleteModal.message = "Content Provider"; + if (title) { + this.deleteModal.message += " '" + title + "' "; + } + this.deleteModal.message += "will be removed from your community. Are you sure?"; + this.deleteModal.okButtonText = "Yes"; + this.deleteModal.cancelButtonText = "No"; + this.deleteModal.open(); } - + + public getCommunityContentProviders() { + this.communityContentProviders = []; + this.subscriptions.push(this._searchCommunityContentProvidersService.searchDataproviders(this.properties, this.community.communityId).subscribe( + data => { + this.communityContentProviders = data; + this.previewCommunityContentProviders = this.communityContentProviders; + this.communityContentProvidersChanged.emit({ + value: this.communityContentProviders, + }); + this.loading = false; + }, + err => { + this.handleError('An error has been occurred. Try again later!', err) + this.loading = false; + } + )); + } + public updatePage($event) { this.page = $event.value; } - + + get currentPage(): any[] { + return this.previewCommunityContentProviders.slice((this.page - 1)*this.resultsPerPage, this.page*this.resultsPerPage); + } + addNew() { this.toggleView.emit(null); } - + public applyFilters() { this.previewCommunityContentProviders = this.communityContentProviders.filter(contentProvider => { return this.filterCommunityContentProviderByKeyword(contentProvider); }); - - // check paging here!!! - if (this.previewCommunityContentProviders.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) { - this.page = 1; - } - - // this.sort(); } - + public filterCommunityContentProviderByKeyword(contentProvider): boolean { - const textFlag = this.searchText.toString() === '' + return this.searchText.toString() === '' || (contentProvider.name + " " + contentProvider.officialname).match(this.searchText) != null; - return textFlag; } - - private sort() { - let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value; - - this.previewCommunityContentProviders.sort((left, right): number => { - if (sortOption.sort == "name") { - if (left.name > right.name) { - return sortOption.descending ? -1 : 1; - } else if (left.name < right.name) { - return sortOption.descending ? 1 : -1; - } - } else if (sortOption.sort == "officialname") { - if (left.officialname > right.officialname) { - return sortOption.descending ? -1 : 1; - } else if (left.officialname < right.officialname) { - return sortOption.descending ? 1 : -1; - } - } - - return 0; - }); + + handleSuccess(message) { + NotificationHandler.rise(message); } - - public onSearchClose() { - this.communitySearchUtils.keyword = this.filterForm.get('keyword').value; + + handleError(message: string, error = null) { + if (error) { + console.error(error); + } + NotificationHandler.rise(message, 'danger'); } - - public resetInput() { - this.communitySearchUtils.keyword = null; - this.searchInputComponent.reset() - } - - handleError(message: string) { - UIkit.notification(message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); - } - + goToCriteria(openaireId: string) { this._router.navigate([openaireId], { queryParams: { diff --git a/src/app/pages/error/errorPage.component.ts b/src/app/pages/error/errorPage.component.ts index 6db8884..e3f90f2 100644 --- a/src/app/pages/error/errorPage.component.ts +++ b/src/app/pages/error/errorPage.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-error', template: ` -
+
+
+
+
+
+ No content providers found
+
+
+
+
+
-
+
-
+
-
+
-
+ {{item.officialname}} {{item.name}} [no title available] - - {{item.officialname}} - {{item.name}} - [no title available] - + {{item.officialname}} + {{item.name}} + [no title available] +
- - - - - - -
+
+
+
"); } - - // goTo(page:number = 1){ - // this.communitySearchUtils.page=page; - // - // var table = $('#dpTable').DataTable(); - // table.page( page - 1 ).draw( false ); - // - // var info = table.page.info(); - // this.communitySearchUtils.totalResults = info.recordsDisplay; - // } - - public confirmedDeleteContentProvider(data: any) { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: { - "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this._router.url - } - }); - } else { - this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.portal, this.selectedCommunityContentProvider.id).subscribe( - data => { - let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); - this.communityContentProviders.splice(index, 1); - - this.applyFilters(); - - UIkit.notification('Content Provider successfully removed!', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - - this.communityContentProvidersChanged.emit({ - value: this.communityContentProviders, - }); - - this.communitySearchUtils.totalResults--; - this.communitySearchUtils.page = 1; - }, - err => { - this.handleError('An error has been occurred. Try again later!'); - console.error(err); - } - )); - } + + public confirmedDeleteContentProvider() { + this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe( + () => { + let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); + this.communityContentProviders.splice(index, 1); + this.applyFilters(); + this.handleSuccess('Content Provider successfully removed!') + this.communityContentProvidersChanged.emit({ + value: this.communityContentProviders, + }); + }, + err => { + this.handleError('An error has been occurred. Try again later!'); + console.error(err); + } + )); } - + public removeContentProvider(communityContentProvider: any) { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: { - "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this._router.url - } - }); - } else { - this.selectedCommunityContentProvider = communityContentProvider; - this.alertModalDeleteCommunity.cancelButton = true; - this.alertModalDeleteCommunity.okButton = true; - this.alertModalDeleteCommunity.alertTitle = "Remove content provider?"; - let title = ""; - if (communityContentProvider.name) { - title = communityContentProvider.name; - } - if (communityContentProvider.name && communityContentProvider.acronym) { - title += " ("; - } - if (communityContentProvider.acronym) { - title += communityContentProvider.acronym; - } - if (communityContentProvider.name && communityContentProvider.acronym) { - title += ")"; - } - this.alertModalDeleteCommunity.message = "Content Provider"; - if (title) { - this.alertModalDeleteCommunity.message += " '" + title + "' "; - } - this.alertModalDeleteCommunity.message += "will be removed from your community. Are you sure?"; - this.alertModalDeleteCommunity.okButtonText = "Yes"; - this.alertModalDeleteCommunity.open(); + this.selectedCommunityContentProvider = communityContentProvider; + this.deleteModal.alertTitle = "Remove content provider"; + let title = ""; + if (communityContentProvider.name) { + title = communityContentProvider.name; } - } - - public _getCommunityContentProviders() { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: { - "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this._router.url - } - }); - } else { - this.communitySearchUtils.status = this.errorCodes.LOADING; - this.communityContentProviders = []; - this.communitySearchUtils.totalResults = 0; - this.communitySearchUtils.page = 1; - this.communitySearchUtils.keyword = ""; - - this.subscriptions.push(this._searchCommunityContentProvidersService.searchDataproviders(this.properties, this.portal).subscribe( - data => { - this.communityContentProviders = data; - this.previewCommunityContentProviders = this.communityContentProviders; - // this.sort(); - - this.communitySearchUtils.totalResults = data.length; - this.communitySearchUtils.status = this.errorCodes.DONE; - - this.communityContentProvidersChanged.emit({ - value: this.communityContentProviders, - }); - - this.showLoading = false; - }, - err => { - console.error(err); - //TODO check erros (service not available, bad request) - - if (err.status == '404') { - this.communitySearchUtils.status = this.errorCodes.NOT_FOUND; - } else if (err.status == '500') { - this.communitySearchUtils.status = this.errorCodes.ERROR; - } else { - this.communitySearchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - - this.showLoading = false; - } - )); + if (communityContentProvider.name && communityContentProvider.acronym) { + title += " ("; } + if (communityContentProvider.acronym) { + title += communityContentProvider.acronym; + } + if (communityContentProvider.name && communityContentProvider.acronym) { + title += ")"; + } + this.deleteModal.message = "Content Provider"; + if (title) { + this.deleteModal.message += " '" + title + "' "; + } + this.deleteModal.message += "will be removed from your community. Are you sure?"; + this.deleteModal.okButtonText = "Yes"; + this.deleteModal.cancelButtonText = "No"; + this.deleteModal.open(); } - + + public getCommunityContentProviders() { + this.communityContentProviders = []; + this.subscriptions.push(this._searchCommunityContentProvidersService.searchDataproviders(this.properties, this.community.communityId).subscribe( + data => { + this.communityContentProviders = data; + this.previewCommunityContentProviders = this.communityContentProviders; + this.communityContentProvidersChanged.emit({ + value: this.communityContentProviders, + }); + this.loading = false; + }, + err => { + this.handleError('An error has been occurred. Try again later!', err) + this.loading = false; + } + )); + } + public updatePage($event) { this.page = $event.value; } - + + get currentPage(): any[] { + return this.previewCommunityContentProviders.slice((this.page - 1)*this.resultsPerPage, this.page*this.resultsPerPage); + } + addNew() { this.toggleView.emit(null); } - + public applyFilters() { this.previewCommunityContentProviders = this.communityContentProviders.filter(contentProvider => { return this.filterCommunityContentProviderByKeyword(contentProvider); }); - - // check paging here!!! - if (this.previewCommunityContentProviders.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) { - this.page = 1; - } - - // this.sort(); } - + public filterCommunityContentProviderByKeyword(contentProvider): boolean { - const textFlag = this.searchText.toString() === '' + return this.searchText.toString() === '' || (contentProvider.name + " " + contentProvider.officialname).match(this.searchText) != null; - return textFlag; } - - private sort() { - let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value; - - this.previewCommunityContentProviders.sort((left, right): number => { - if (sortOption.sort == "name") { - if (left.name > right.name) { - return sortOption.descending ? -1 : 1; - } else if (left.name < right.name) { - return sortOption.descending ? 1 : -1; - } - } else if (sortOption.sort == "officialname") { - if (left.officialname > right.officialname) { - return sortOption.descending ? -1 : 1; - } else if (left.officialname < right.officialname) { - return sortOption.descending ? 1 : -1; - } - } - - return 0; - }); + + handleSuccess(message) { + NotificationHandler.rise(message); } - - public onSearchClose() { - this.communitySearchUtils.keyword = this.filterForm.get('keyword').value; + + handleError(message: string, error = null) { + if (error) { + console.error(error); + } + NotificationHandler.rise(message, 'danger'); } - - public resetInput() { - this.communitySearchUtils.keyword = null; - this.searchInputComponent.reset() - } - - handleError(message: string) { - UIkit.notification(message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); - } - + goToCriteria(openaireId: string) { this._router.navigate([openaireId], { queryParams: { diff --git a/src/app/pages/error/errorPage.component.ts b/src/app/pages/error/errorPage.component.ts index 6db8884..e3f90f2 100644 --- a/src/app/pages/error/errorPage.component.ts +++ b/src/app/pages/error/errorPage.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-error', template: ` -
+
-
+
-
- ![]()
+
+ ![]()
{{affiliation.value.name}}
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 65cbf34..052d94e 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 65cbf342bc890aff15a8831711f69d9b35e6f85d
+Subproject commit 052d94e27ce698a119755973e0b7285d2b64370b
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index 8818983..318b3cd 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit 8818983564cb9e9232979af27fa568c18fa4eba8
+Subproject commit 318b3cdf42922d8b04400bb010733b78fcf1fe1c