From 7c9d0936b3a98a7f049459e781c93b1277e5f7a9 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 4 Jul 2022 21:45:20 +0300 Subject: [PATCH] Finish UI of Content Providers and their Criteria. Fix search width in subjects --- src/app/app.component.ts | 3 +- src/app/app.module.ts | 1 - src/app/openaireLibrary | 2 +- .../affiliations/affiliations.component.html | 8 +- .../affiliations/affiliations.component.ts | 5 +- .../pages/affiliations/affiliations.module.ts | 6 - .../community-info-routing.module.ts | 1 - .../community-info.component.ts | 16 +- .../add-content-providers.component.html | 8 +- .../add-content-providers.component.ts | 9 +- .../communityContentProviders.module.ts | 9 +- .../criteria/criteria-routing.module.ts | 13 -- .../criteria/criteria.component.css | 6 - .../criteria/criteria.component.html | 156 ++++++------------ .../criteria/criteria.component.less | 8 + .../criteria/criteria.component.ts | 104 ++++-------- .../criteria/criteria.module.ts | 16 +- .../manage-content-providers.component.ts | 61 +++++-- .../remove-content-providers.component.html | 19 +-- .../remove-content-providers.component.ts | 31 ++-- src/app/pages/mining/mining.component.ts | 2 +- .../subjects-edit-form.component.html | 42 ++--- .../subjects-edit-form.module.ts | 11 +- .../personal-info/personal-info.component.ts | 10 +- src/assets/openaire-theme | 2 +- 25 files changed, 237 insertions(+), 312 deletions(-) delete mode 100644 src/app/pages/content-providers/criteria/criteria-routing.module.ts delete mode 100644 src/app/pages/content-providers/criteria/criteria.component.css create mode 100644 src/app/pages/content-providers/criteria/criteria.component.less 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 @@
- +
@@ -96,5 +96,5 @@
- + 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
- 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 @@ -
-
-
- - - - - - Go back to Content Providers - +
+
+ +
+ +
+ + + Add filter
-
-
-
-
-
-
Filters for
-
- {{dataProvider.officialname}} - (unsaved changes) -
-
-
- - -
+
+
No filters for {{dataProvider.officialname}}.
+
If no filters are specified, all research results of this content provider will be included in your + community.
-
-
-
-
No filters for {{dataProvider.officialname}}.
-
If no filters are specified, all research results of this content provider will be included in your - community. -
-
-
-
- - -
-
Filter {{getIndex(i) + 1}}
-
-
-
+ +
+ + + +
+ +
-
- -
-
-
+ +
diff --git a/src/app/pages/content-providers/criteria/criteria.component.less b/src/app/pages/content-providers/criteria/criteria.component.less new file mode 100644 index 0000000..6bec815 --- /dev/null +++ b/src/app/pages/content-providers/criteria/criteria.component.less @@ -0,0 +1,8 @@ +@import (reference) "~src/assets/openaire-theme/less/_import-variables.less"; + +.criterion { + border: @global-border solid @global-border-width; + border-radius: @global-border-radius; + max-height: 400px; + overflow: auto; +} diff --git a/src/app/pages/content-providers/criteria/criteria.component.ts b/src/app/pages/content-providers/criteria/criteria.component.ts index 4c3e0a9..5a3d659 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.ts +++ b/src/app/pages/content-providers/criteria/criteria.component.ts @@ -1,6 +1,4 @@ -import {ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {SearchCommunityDataprovidersService} from '../../../openaireLibrary/connect/contentProviders/searchDataproviders.service'; +import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; import {EnvProperties} from '../../../openaireLibrary/utils/properties/env-properties'; import { Constraint, @@ -10,25 +8,21 @@ import { } from '../../../openaireLibrary/utils/entities/contentProvider'; import {AbstractControl, FormArray, FormBuilder, FormGroup, Validators} from '@angular/forms'; import {ManageCommunityContentProvidersService} from '../../../services/manageContentProviders.service'; -import {Title} from '@angular/platform-browser'; import {properties} from "../../../../environments/environment"; -import {Subscription} from "rxjs"; import {Option} from "../../../openaireLibrary/sharedComponents/input/input.component"; import {MatSlideToggleChange} from "@angular/material/slide-toggle"; import {HelperFunctions} from "../../../openaireLibrary/utils/HelperFunctions.class"; import {CriteriaUtils} from "../criteria-utils"; - -declare var UIkit; +import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler"; @Component({ selector: 'criteria', - templateUrl: './criteria.component.html', - styleUrls: ['criteria.component.css'], + templateUrl: 'criteria.component.html', + styleUrls: ['criteria.component.less'] }) -export class CriteriaComponent implements OnInit, OnDestroy { - public community: string = ''; - public openaireId: string = ''; - public dataProvider: ContentProvider = null; +export class CriteriaComponent implements OnInit { + @Input() + public dataProvider: ContentProvider; public selectionCriteria: FormGroup; public properties: EnvProperties = properties; public fields: Option[] = CriteriaUtils.fields; @@ -37,51 +31,15 @@ export class CriteriaComponent implements OnInit, OnDestroy { /** Paging */ public page: number = 1; public pageSize: number = 5; - private subs: any[] = []; - constructor(private route: ActivatedRoute, private router: Router, - private title: Title, - private searchCommunityDataprovidersService: SearchCommunityDataprovidersService, - private manageCommunityContentProvidersService: ManageCommunityContentProvidersService, + constructor(private manageCommunityContentProvidersService: ManageCommunityContentProvidersService, private cdr: ChangeDetectorRef, private fb: FormBuilder) { } ngOnInit() { - this.subs.push(this.route.params.subscribe(params => { - this.community = params['community']; - this.route.params.subscribe(params => { - if (params['provider']) { - this.openaireId = params['provider']; - } - this.searchCommunityDataprovidersService.searchDataproviders(this.properties, this.community).subscribe(dataProviders => { - dataProviders.forEach(dataProvider => { - if (dataProvider.openaireId == this.openaireId) { - this.dataProvider = dataProvider; - this.title.setTitle(this.community.toUpperCase() + ' | Criteria for ' + this.dataProvider.officialname); - } - }); - if (!this.dataProvider) { - this.navigateToError(); - } else { - this.reset(); - this.loading = false; - } - }); - }); - })); - } - - public ngOnDestroy() { - this.subs.forEach(subscription => { - if (subscription instanceof Subscription) { - subscription.unsubscribe(); - } - }) - } - - private navigateToError() { - this.router.navigate(['/error'], {queryParams: {'page': this.properties.baseLink + this.router.url}}); + this.reset(); + this.loading = false; } reset() { @@ -110,6 +68,10 @@ export class CriteriaComponent implements OnInit, OnDestroy { } } + get disabled() { + return this.loading || !this.dirty || this.selectionCriteria.invalid; + } + get currentPage(): AbstractControl[] { if (this.criteria) { return this.criteria.controls.slice((this.page - 1) * this.pageSize, this.page * this.pageSize); @@ -162,8 +124,8 @@ export class CriteriaComponent implements OnInit, OnDestroy { constraintArray.removeAt(j); if (constraintArray.length === 0) { this.criteria.removeAt(i); - if (this.currentPage.length === 0) { - this.page = 1; + while(this.currentPage.length === 0 && this.page > 0) { + this.page--; } } this.cdr.detectChanges(); @@ -192,34 +154,31 @@ export class CriteriaComponent implements OnInit, OnDestroy { } } - save() { + save(callback: Function = null) { if (this.selectionCriteria.valid) { this.loading = true; this.dataProvider.selectioncriteria = this.parseForm(this.selectionCriteria.value); this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { this.reset(); + if(callback) { + callback(); + } this.loading = false; - UIkit.notification('Filters has been successfully updated', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise('Filters have been successfully updated'); }, error => { - UIkit.notification('An error has been occurred. Try again later!', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + this.loading = false; + this.handeError('An error has been occurred. Try again later!', error); }); } else { - UIkit.notification('An error has been occurred. Try again later!', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + this.handeError('An error has been occurred. Try again later!'); } } + handeError(message, error = null) { + console.error(error); + NotificationHandler.rise(message, 'danger'); + } + caseSensitive(event: MatSlideToggleChange, constraint: AbstractControl) { if(event.checked) { constraint.get('verb_suffix').setValue(''); @@ -254,4 +213,9 @@ export class CriteriaComponent implements OnInit, OnDestroy { }) return selectionCriteria; } + + public updatePage(event) { + this.page = event.value; + HelperFunctions.scroll(); + } } diff --git a/src/app/pages/content-providers/criteria/criteria.module.ts b/src/app/pages/content-providers/criteria/criteria.module.ts index aecf8ba..b73bd68 100644 --- a/src/app/pages/content-providers/criteria/criteria.module.ts +++ b/src/app/pages/content-providers/criteria/criteria.module.ts @@ -1,25 +1,24 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {CriteriaComponent} from './criteria.component'; -import {CriteriaRoutingModule} from './criteria-routing.module'; -import {SearchCommunityDataprovidersService} from '../../../openaireLibrary/connect/contentProviders/searchDataproviders.service'; +import { + SearchCommunityDataprovidersService +} from '../../../openaireLibrary/connect/contentProviders/searchDataproviders.service'; import {RouterModule} from '@angular/router'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {ManageCommunityContentProvidersService} from '../../../services/manageContentProviders.service'; import {PageContentModule} from "../../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; import {IconsModule} from "../../../openaireLibrary/utils/icons/icons.module"; -import {IconsService} from "../../../openaireLibrary/utils/icons/icons.service"; -import {add, arrow_left, close} from "../../../openaireLibrary/utils/icons/icons"; import {LoadingModule} from "../../../openaireLibrary/utils/loading/loading.module"; import {InputModule} from "../../../openaireLibrary/sharedComponents/input/input.module"; import {MatSlideToggleModule} from "@angular/material/slide-toggle"; import {ScrollingModule} from "@angular/cdk/scrolling"; import {NoLoadPaging} from "../../../openaireLibrary/searchPages/searchUtils/no-load-paging.module"; +import {PagingModule} from "../../../openaireLibrary/utils/paging.module"; @NgModule({ imports: [ CommonModule, - CriteriaRoutingModule, RouterModule, FormsModule, ReactiveFormsModule, @@ -30,6 +29,7 @@ import {NoLoadPaging} from "../../../openaireLibrary/searchPages/searchUtils/no- MatSlideToggleModule, ScrollingModule, NoLoadPaging, + PagingModule, ], declarations: [ CriteriaComponent @@ -41,8 +41,4 @@ import {NoLoadPaging} from "../../../openaireLibrary/searchPages/searchUtils/no- exports: [CriteriaComponent] }) -export class CriteriaModule { - constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([arrow_left, add, close]) - } -} +export class CriteriaModule {} 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 3f15e5e..d86a0d8 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -1,5 +1,4 @@ -import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core'; -import {Router} from "@angular/router"; +import {Component, OnInit, ViewChild} from '@angular/core'; import {RemoveContentProvidersComponent} from './remove-content-providers.component'; import {Title} from '@angular/platform-browser'; import { @@ -11,41 +10,53 @@ import {properties} from "../../../environments/environment"; import {Subscriber} from "rxjs"; import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; import {CommunityService} from "../../openaireLibrary/connect/community/community.service"; +import {ContentProvider} from "../../openaireLibrary/utils/entities/contentProvider"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; +import {CriteriaComponent} from "./criteria/criteria.component"; @Component({ selector: 'manage-content-providers', template: ` - - + + +
+ +
+ ` }) export class ManageContentProvidersComponent implements OnInit { - @Input() communityContentProviders = []; + communityContentProviders: ContentProvider[] = []; @ViewChild(RemoveContentProvidersComponent) removeContentProvidersComponent: RemoveContentProvidersComponent; - @ViewChild('fsModal', { static: true }) fullscreen: FullScreenModalComponent; + @ViewChild('criteria') criteria: CriteriaComponent; + @ViewChild('addContentProvidersModal', { static: true }) addContentProvidersModal: FullScreenModalComponent; + @ViewChild('filtersModal', { static: true }) filtersModal: FullScreenModalComponent; private subscriptions: any[] = []; public showLoadingInRemove: boolean = true; public body: string = "Send from page"; public properties: EnvProperties = properties; public community: CommunityInfo; + public contentProvider: ContentProvider; - constructor(private element: ElementRef, - private title: Title, - private communityService: CommunityService, private _router: Router) { + constructor(private title: Title, + private communityService: CommunityService) { } ngOnInit() { this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { this.community = community; if (this.community) { - this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Content Providers'); + this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | ' + OpenaireEntities.DATASOURCES); this.body = "[Please write your message here]"; this.body = StringUtils.URIEncode(this.body); } @@ -61,18 +72,34 @@ export class ManageContentProvidersComponent implements OnInit { } public openAddContentProviders() { - this.fullscreen.title = "Search and Add Content Providers"; - this.fullscreen.okButtonText = "Done"; - this.fullscreen.back = true; - this.fullscreen.okButton = true; - this.fullscreen.open(); + this.addContentProvidersModal.title = "Search and Add " + OpenaireEntities.DATASOURCES; + this.addContentProvidersModal.okButtonText = "Done"; + this.addContentProvidersModal.back = true; + this.addContentProvidersModal.okButton = true; + this.addContentProvidersModal.open(); + } + + public openCriteria(contentProvider: ContentProvider) { + this.contentProvider = contentProvider; + this.filtersModal.title = 'Filters'; + this.filtersModal.okButtonText = "Save"; + this.filtersModal.back = true; + this.filtersModal.okButton = true; + this.filtersModal.open(); + } + + public saveCriteria() { + let callback: Function = () => { + this.removeContentProvidersComponent.getCommunityContentProviders(); + } + this.removeContentProvidersComponent.loading = true; + this.criteria.save(callback); } public communityContentProvidersChanged($event) { this.communityContentProviders = $event.value; this.showLoadingInRemove = false; - - if (this.fullscreen.isOpen) { + if (this.addContentProvidersModal.isOpen) { this.removeContentProvidersComponent.applyFilters(); } } 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 66a80a8..9f5f7ef 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -2,7 +2,7 @@
-
Admin Dashboard - Manage Content Providers +
Admin Dashboard - Manage {{openAIREEntities.DATASOURCES}}

{{community.shortTitle}}

@@ -12,15 +12,14 @@
@@ -31,10 +30,10 @@
-
No content providers found
+
No {{openAIREEntities.DATASOURCES}} found
@@ -70,7 +69,7 @@
- + diff --git a/src/app/pages/content-providers/remove-content-providers.component.ts b/src/app/pages/content-providers/remove-content-providers.component.ts index 0e832ae..6e8be80 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -9,7 +9,7 @@ import { SearchCommunityDataprovidersService } from '../../openaireLibrary/connect/contentProviders/searchDataproviders.service'; import {RouterHelper} from '../../openaireLibrary/utils/routerHelper.class'; -import {Criteria} from '../../openaireLibrary/utils/entities/contentProvider'; +import {ContentProvider, Criteria} from '../../openaireLibrary/utils/entities/contentProvider'; import {properties} from "../../../environments/environment"; import {SearchInputComponent} from "../../openaireLibrary/sharedComponents/search-input/search-input.component"; import {FormBuilder, FormGroup} from "@angular/forms"; @@ -17,6 +17,8 @@ import {CriteriaUtils} from "./criteria-utils"; import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; import {AlertModal} from "../../openaireLibrary/utils/modal/alert"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; +import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; @Component({ selector: 'remove-content-providers', @@ -25,12 +27,13 @@ import {AlertModal} from "../../openaireLibrary/utils/modal/alert"; export class RemoveContentProvidersComponent implements OnInit { public routerHelper: RouterHelper = new RouterHelper(); public contentProviderUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToDataProvider; - public previewCommunityContentProviders = []; + public previewCommunityContentProviders: ContentProvider[] = []; public errorCodes: ErrorCodes; + public openAIREEntities = OpenaireEntities; @Input() public loading: boolean = true; @Input() public disableAdd: boolean = false; @Input() public community: CommunityInfo; - @Input() public communityContentProviders = []; + @Input() public communityContentProviders: ContentProvider[] = []; @Output() communityContentProvidersChanged = new EventEmitter(); private properties: EnvProperties = properties; private subscriptions: any[] = []; @@ -49,7 +52,7 @@ export class RemoveContentProvidersComponent implements OnInit { private searchText: RegExp = new RegExp(''); public keyword: string = ''; @Output() addContentProviders: EventEmitter = new EventEmitter(); - @Input() public toggle: boolean = true; + @Output() editCriteria: EventEmitter = new EventEmitter(); constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, @@ -100,7 +103,7 @@ export class RemoveContentProvidersComponent implements OnInit { let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); this.communityContentProviders.splice(index, 1); this.applyFilters(); - this.handleSuccess('Content Provider successfully removed!') + this.handleSuccess(this.openAIREEntities.DATASOURCE + ' successfully removed!') this.communityContentProvidersChanged.emit({ value: this.communityContentProviders, }); @@ -114,7 +117,7 @@ export class RemoveContentProvidersComponent implements OnInit { public removeContentProvider(communityContentProvider: any) { this.selectedCommunityContentProvider = communityContentProvider; - this.deleteModal.alertTitle = "Remove content provider"; + this.deleteModal.alertTitle = "Remove " + this.openAIREEntities.DATASOURCE; let title = ""; if (communityContentProvider.name) { title = communityContentProvider.name; @@ -128,7 +131,7 @@ export class RemoveContentProvidersComponent implements OnInit { if (communityContentProvider.name && communityContentProvider.acronym) { title += ")"; } - this.deleteModal.message = "Content Provider"; + this.deleteModal.message = this.openAIREEntities.DATASOURCE; if (title) { this.deleteModal.message += " '" + title + "' "; } @@ -140,6 +143,7 @@ export class RemoveContentProvidersComponent implements OnInit { public getCommunityContentProviders() { this.communityContentProviders = []; + this.loading = true; this.subscriptions.push(this._searchCommunityContentProvidersService.searchDataproviders(this.properties, this.community.communityId).subscribe( data => { this.communityContentProviders = data; @@ -157,10 +161,11 @@ export class RemoveContentProvidersComponent implements OnInit { } public updatePage($event) { + HelperFunctions.scroll(); this.page = $event.value; } - get currentPage(): any[] { + get currentPage(): ContentProvider[] { return this.previewCommunityContentProviders.slice((this.page - 1)*this.resultsPerPage, this.page*this.resultsPerPage); } @@ -190,13 +195,7 @@ export class RemoveContentProvidersComponent implements OnInit { NotificationHandler.rise(message, 'danger'); } - goToCriteria(openaireId: string) { - this._router.navigate([openaireId], { - queryParams: { - // community: this.portal, - // provider: openaireId - }, - relativeTo: this.route - }) + openCriteria(contentProvider: ContentProvider) { + this.editCriteria.emit(contentProvider); } } diff --git a/src/app/pages/mining/mining.component.ts b/src/app/pages/mining/mining.component.ts index de410ea..1360314 100644 --- a/src/app/pages/mining/mining.component.ts +++ b/src/app/pages/mining/mining.component.ts @@ -8,7 +8,7 @@ import {Subscription} from "rxjs"; template: `
-
+
diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html index 368fbc3..a9b4205 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html @@ -10,26 +10,23 @@
-
-
-
-
-
- -
- -
+
+
+
+ +
+
@@ -80,6 +77,11 @@
+
+ + +
diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts index 9c96d1f..28af737 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts @@ -9,8 +9,6 @@ import {SubjectsService} from '../subjects.service'; import {SubjectsEditFormRoutingModule} from './subjects-edit-form-routing.module'; import {PageContentModule} from '../../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module'; import {IconsModule} from '../../../openaireLibrary/utils/icons/icons.module'; -import {IconsService} from '../../../openaireLibrary/utils/icons/icons.service'; -import {add, check_circle_outlined, close, edit, remove} from '../../../openaireLibrary/utils/icons/icons'; import {AlertModalModule} from '../../../openaireLibrary/utils/modal/alertModal.module'; import {NoLoadPaging} from '../../../openaireLibrary/searchPages/searchUtils/no-load-paging.module'; import {LoadingModule} from '../../../openaireLibrary/utils/loading/loading.module'; @@ -18,10 +16,11 @@ import {InputModule} from '../../../openaireLibrary/sharedComponents/input/input import {CommunityInfoModule} from '../../community-info/community-info.module'; import {SearchInputModule} from '../../../openaireLibrary/sharedComponents/search-input/search-input.module'; import {FullScreenModalModule} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module'; +import {PagingModule} from "../../../openaireLibrary/utils/paging.module"; @NgModule({ imports: [ - SubjectsEditFormRoutingModule, CommonModule, FormsModule, RouterModule, PageContentModule, IconsModule, AlertModalModule, NoLoadPaging, LoadingModule, InputModule, CommunityInfoModule, SearchInputModule, FullScreenModalModule + SubjectsEditFormRoutingModule, CommonModule, FormsModule, RouterModule, PageContentModule, IconsModule, AlertModalModule, NoLoadPaging, LoadingModule, InputModule, CommunityInfoModule, SearchInputModule, FullScreenModalModule, PagingModule ], declarations: [ SubjectsEditFormComponent @@ -33,8 +32,4 @@ import {FullScreenModalModule} from 'src/app/openaireLibrary/utils/modal/full-sc SubjectsEditFormComponent ] }) -export class SubjectsEditFormModule { - constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([add, edit, remove, close]) - } -} +export class SubjectsEditFormModule {} diff --git a/src/app/pages/users/personal-info/personal-info.component.ts b/src/app/pages/users/personal-info/personal-info.component.ts index e0c33a7..7847206 100644 --- a/src/app/pages/users/personal-info/personal-info.component.ts +++ b/src/app/pages/users/personal-info/personal-info.component.ts @@ -90,8 +90,8 @@ declare var UIkit;
-
- +
+
{{affiliation.value.name}}
@@ -148,7 +148,7 @@ declare var UIkit; if you have any inquiries.
-
@@ -161,9 +161,9 @@ declare var UIkit;
- + - + Your personal information has been successfully saved.

This information will be visible in Curators page of Research Community Dashboard, which is disabled. diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 35bca0f..8f8b85e 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 35bca0f68bf19337413167ecf770f1027902964f +Subproject commit 8f8b85e69d5c505ed59b12b8b70348096f339775