diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index bfdf853..cb27fba 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -15,6 +15,7 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper';
import {ConfigurationService} from './openaireLibrary/utils/configuration/configuration.service';
import {StringUtils} from "./openaireLibrary/utils/string-utils.class";
import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields";
+import {mining} from "./openaireLibrary/utils/icons/icons";
@Component({
selector: 'app-root',
@@ -215,7 +216,7 @@ export class AppComponent implements OnInit {
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, [], [], {}, {name: 'architecture'}, null, null, "/" + this.community.communityId + "/mining"));
+ this.sideBarItems.push(new MenuItem("mining", "Mining", "", "/" + this.community.communityId + "/mining/manage-profiles", false, [], [], {}, {svg: mining.data}, null, null, "/" + this.community.communityId + "/mining"));
}
this.specialSideBarMenuItem = new MenuItem("back", "Manage communities", "", "/", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'});
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3800ab0..46ebb0b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,7 +11,6 @@ import {IsCommunity} from './openaireLibrary/connect/communityGuard/isCommunity.
import {AdminErrorPageComponent} from './pages/error/errorPage.component';
import {ErrorModule} from './openaireLibrary/error/error.module';
import {TitleCasePipe} from '@angular/common';
-import {CommunityService} from './openaireLibrary/connect/community/community.service';
import {SubscribeService} from './openaireLibrary/utils/subscribe/subscribe.service';
import {ConnectRIGuard} from './openaireLibrary/connect/communityGuard/connectRIGuard.guard';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index e61d449..f08c63d 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit e61d4495aee212f7e991f0ad9c54c0429cf01757
+Subproject commit f08c63d3849e966bcfe916f0ca48788e0b401306
diff --git a/src/app/pages/affiliations/affiliations.component.html b/src/app/pages/affiliations/affiliations.component.html
index b89164a..0360d8f 100644
--- a/src/app/pages/affiliations/affiliations.component.html
+++ b/src/app/pages/affiliations/affiliations.component.html
@@ -40,8 +40,8 @@
-
-
+
+
{{affiliation.name}}
@@ -87,7 +87,7 @@
-
+
-
+
diff --git a/src/app/pages/affiliations/affiliations.component.ts b/src/app/pages/affiliations/affiliations.component.ts
index 011ac0e..d800ef7 100644
--- a/src/app/pages/affiliations/affiliations.component.ts
+++ b/src/app/pages/affiliations/affiliations.component.ts
@@ -15,6 +15,7 @@ import {Subscription} from "rxjs";
import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo";
import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
+import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
@Component({
selector: 'affiliations',
@@ -67,8 +68,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
getAffiliations() {
this.loading = true;
- this.affiliationService.initAffiliations(this.community.communityId);
- this.affiliationService.affiliations.subscribe(
+ this.affiliationService.getAffiliations(this.community.communityId).subscribe(
affiliations => {
this.affiliations = affiliations;
this.loading = false;
@@ -133,6 +133,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
}
public updatePage(event) {
+ HelperFunctions.scroll();
this.page = event.value;
}
diff --git a/src/app/pages/affiliations/affiliations.module.ts b/src/app/pages/affiliations/affiliations.module.ts
index 6dd1d69..3c5142c 100644
--- a/src/app/pages/affiliations/affiliations.module.ts
+++ b/src/app/pages/affiliations/affiliations.module.ts
@@ -13,8 +13,6 @@ import {InputModule} from "../../openaireLibrary/sharedComponents/input/input.mo
import {PageContentModule} from "../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
import {CommunityInfoModule} from "../community-info/community-info.module";
import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module";
-import {IconsService} from "../../openaireLibrary/utils/icons/icons.service";
-import {add, edit, preview, remove} from "../../openaireLibrary/utils/icons/icons";
import {NoLoadPaging} from "../../openaireLibrary/searchPages/searchUtils/no-load-paging.module";
import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module";
import {UrlPrefixModule} from "../../openaireLibrary/utils/pipes/url-prefix.module";
@@ -38,8 +36,4 @@ import {PagingModule} from "../../openaireLibrary/utils/paging.module";
})
export class AffiliationsModule {
-
- constructor(private iconsService: IconsService) {
- this.iconsService.registerIcons([add, preview, remove])
- }
}
diff --git a/src/app/pages/community-info/community-info-routing.module.ts b/src/app/pages/community-info/community-info-routing.module.ts
index a5ffc9f..a8afa4e 100644
--- a/src/app/pages/community-info/community-info-routing.module.ts
+++ b/src/app/pages/community-info/community-info-routing.module.ts
@@ -10,7 +10,6 @@ import {ConnectCommunityGuard} from "../../openaireLibrary/connect/communityGuar
{path: 'organizations', loadChildren: () => import('../affiliations/affiliations.module').then(m => m.AffiliationsModule)},
{path: 'projects', loadChildren: () => import('../projects/communityProjects.module').then(m => m.CommunityProjectsModule)},
{path: 'content-providers', loadChildren: () => import('../content-providers/communityContentProviders.module').then(m => m.CommunityContentProvidersModule)},
- {path: 'content-providers/:provider', loadChildren: () => import('../content-providers/criteria/criteria.module').then(m => m.CriteriaModule)},
{path: 'zenodo-communities', loadChildren: () => import('../zenodo-communities/zenodo-communities.module').then(m => m.ZenodoCommunitiesModule)},
{path: 'subjects', canActivateChild: [ConnectCommunityGuard], loadChildren: () => import('../subjects/subjects-edit-form/subjects-edit-form.module').then(m => m.SubjectsEditFormModule)},
])
diff --git a/src/app/pages/community-info/community-info.component.ts b/src/app/pages/community-info/community-info.component.ts
index a048115..4f579af 100644
--- a/src/app/pages/community-info/community-info.component.ts
+++ b/src/app/pages/community-info/community-info.component.ts
@@ -2,17 +2,18 @@ import {Component, Input, OnInit} from '@angular/core';
import {CommunityInfo} from '../../openaireLibrary/connect/community/communityInfo';
import {CommunityService} from '../../openaireLibrary/connect/community/community.service';
import {Subscription} from 'rxjs';
+import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields";
@Component({
selector: 'community-info',
template: `
-
@@ -20,10 +20,10 @@
-
No content providers found
+
No {{openAIREEntities.DATASOURCE}} found
0">
-
diff --git a/src/app/pages/content-providers/add-content-providers.component.ts b/src/app/pages/content-providers/add-content-providers.component.ts
index 7220ba5..4d51d18 100644
--- a/src/app/pages/content-providers/add-content-providers.component.ts
+++ b/src/app/pages/content-providers/add-content-providers.component.ts
@@ -18,6 +18,9 @@ import {debounceTime, distinctUntilChanged} from "rxjs/operators";
import {ResultPreview} from "../../openaireLibrary/utils/result-preview/result-preview";
import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo";
+import {ContentProvider} from "../../openaireLibrary/utils/entities/contentProvider";
+import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields";
+import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
@Component({
selector: 'add-content-providers',
@@ -32,8 +35,9 @@ export class AddContentProvidersComponent implements OnInit {
public errorCodes: ErrorCodes;
public openaireSearchUtils: SearchUtilsClass = new SearchUtilsClass();
@Output() communityContentProvidersChanged = new EventEmitter();
- @Input() communityContentProviders = [];
- public openaireContentProviders = [];
+ @Input() communityContentProviders: ContentProvider[] = [];
+ public openaireContentProviders: SearchResult[] = [];
+ public openAIREEntities = OpenaireEntities;
public queryParameters: string = "";
public resultsPerPage: number = properties.resultsPerPage;
filterForm: FormGroup;
@@ -183,6 +187,7 @@ export class AddContentProvidersComponent implements OnInit {
}
goTo(page: number = 1) {
+ HelperFunctions.scroll();
this.openaireSearchUtils.page = page;
this.openaireSearchUtils.status = this.errorCodes.LOADING;
this._getOpenaireContentProviders(this.queryParameters, page, this.resultsPerPage);
diff --git a/src/app/pages/content-providers/communityContentProviders.module.ts b/src/app/pages/content-providers/communityContentProviders.module.ts
index 3947c2f..5d29600 100644
--- a/src/app/pages/content-providers/communityContentProviders.module.ts
+++ b/src/app/pages/content-providers/communityContentProviders.module.ts
@@ -17,15 +17,18 @@ 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, filters, remove_circle_outline} from "../../openaireLibrary/utils/icons/icons";
+import {filters} 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";
+import {
+ SearchDataprovidersServiceModule
+} from "../../openaireLibrary/connect/contentProviders/searchDataprovidersService.module";
import {ManageContentProvidersComponent} from "./manage-content-providers.component";
import {RemoveContentProvidersComponent} from "./remove-content-providers.component";
import {AddContentProvidersComponent} from "./add-content-providers.component";
import {ManageCommunityContentProvidersService} from "../../services/manageContentProviders.service";
import {SearchDataprovidersService} from "../../openaireLibrary/services/searchDataproviders.service";
+import {CriteriaModule} from "./criteria/criteria.module";
@NgModule({
imports: [
@@ -47,7 +50,7 @@ import {SearchDataprovidersService} from "../../openaireLibrary/services/searchD
path: '', component: ManageContentProvidersComponent
}
]),
- NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule
+ NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule
],
declarations: [
ManageContentProvidersComponent,
diff --git a/src/app/pages/content-providers/criteria/criteria-routing.module.ts b/src/app/pages/content-providers/criteria/criteria-routing.module.ts
deleted file mode 100644
index 745c32f..0000000
--- a/src/app/pages/content-providers/criteria/criteria-routing.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-import {CriteriaComponent} from './criteria.component';
-
-@NgModule({
- imports: [
- RouterModule.forChild([
- {path: '', component: CriteriaComponent}
- ])
- ]
-})
-export class CriteriaRoutingModule {
-}
diff --git a/src/app/pages/content-providers/criteria/criteria.component.css b/src/app/pages/content-providers/criteria/criteria.component.css
deleted file mode 100644
index 18e6796..0000000
--- a/src/app/pages/content-providers/criteria/criteria.component.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.criterion {
- border: rgba(26,26,26,0.5) solid 1px;
- border-radius: 4px;
- max-height: 400px;
- overflow: auto;
-}
diff --git a/src/app/pages/content-providers/criteria/criteria.component.html b/src/app/pages/content-providers/criteria/criteria.component.html
index d70b17f..6357dd2 100644
--- a/src/app/pages/content-providers/criteria/criteria.component.html
+++ b/src/app/pages/content-providers/criteria/criteria.component.html
@@ -1,54 +1,34 @@
-