diff --git a/package.json b/package.json index 56cc303..f82f848 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "sass-loader": "7.3.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.12.0", + "uikit": "3.13.10", "zone.js": "~0.11.4" }, "devDependencies": { @@ -51,7 +51,7 @@ "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", - "@types/ckeditor": "^4.9.10", + "@types/ckeditor": "^4.9.10", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", @@ -64,4 +64,4 @@ "ts-node": "~7.0.0", "typescript": "~4.6.4" } -} \ No newline at end of file +} diff --git a/src/app/app.component.html b/src/app/app.component.html index 9971650..c6796f9 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,12 +2,13 @@
-
+
+ [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user">
- +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 104215e..74d22ca 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -32,7 +32,7 @@ export class AppComponent implements OnInit { hasAdminMenu: boolean = false; isFrontPage: boolean = false; sideBarItems: MenuItem[] = []; - specialSideBarMenuItem: MenuItem = null; + backItem: MenuItem = null; menuItems: MenuItem[] = []; menuHeader: Header = { route: "/", @@ -179,6 +179,10 @@ export class AppComponent implements OnInit { return this.layoutService.open; } + public get hover() { + return this.layoutService.hover; + } + private buildMenu() { this.userMenuItems = []; this.sideBarItems = []; @@ -211,14 +215,26 @@ export class AppComponent implements OnInit { position: 'left', badge: true }; - this.sideBarItems.push(new MenuItem("community", "Community Info", "", "/" + this.community.communityId, false, [], [], {}, {name: 'badge'}, null, null, "/" + this.community.communityId + "/info")); + let communityInfo = new MenuItem("community", "Community Info", "", "/" + this.community.communityId, false, [], [], {}, {name: 'badge'}, null, null, "/" + this.community.communityId + "/info"); + communityInfo.items = [ + new MenuItem("profile", "Profile", "", "/" + this.community.communityId + "/info/profile", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/profile"), + new MenuItem("organizations", "Organizations", "", "/" + this.community.communityId + "/info/organizations", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/organizations"), + new MenuItem("projects", OpenaireEntities.PROJECTS, "", "/" + this.community.communityId + "/info/projects", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/projects"), + new MenuItem("content-providers", OpenaireEntities.DATASOURCES, "", "/" + this.community.communityId + "/info/content-providers", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/content-providers"), + new MenuItem("zenodo-communities", "Zenodo Communities ", "", "/" + this.community.communityId + "/info/zenodo-communities", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/zenodo-communities"), + new MenuItem("advanced-criteria", "Advanced Criteria", "", "/" + this.community.communityId + "/info/advanced-criteria", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/advanced-criteria") + ] + if(this.community.type === 'community') { + communityInfo.items.splice(4, 0, new MenuItem("subjects", "Subjects", "", "/" + this.community.communityId + "/info/subjects", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/info/subjects")) + } + this.sideBarItems.push(communityInfo); 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 & Menus", "", "/" + 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, [], [], {}, {svg: mining.data}, null, null, "/" + this.community.communityId + "/mining")); } - this.specialSideBarMenuItem = new MenuItem("back", "Manage communities", "", "/", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'}); + this.backItem = new MenuItem("back", "Manage Communities", "", "/", false, [], null, {}, {name: 'west'}); this.menuItems = []; this.menuItems.push(new MenuItem("home", "Home", @@ -306,7 +322,7 @@ export class AppComponent implements OnInit { this.sideBarItems.push(new MenuItem("connect", "Connect Options", "", "/connect/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/connect/admin-tools')); this.sideBarItems.push(new MenuItem("explore", "Explore Options", "", "/openaire/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/openaire/admin-tools')); } - this.specialSideBarMenuItem = null; + this.backItem = null; } this.hasSidebar = this.hasSidebar && this.sideBarItems.length > 1; } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index faa57d9..d410335 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit faa57d99d193f6904c6a57363718d3269c843c13 +Subproject commit d4103354aa0254475df4aa29382999bc2f25bf29 diff --git a/src/app/pages/advanced-criteria/advanced-criteria.component.ts b/src/app/pages/advanced-criteria/advanced-criteria.component.ts new file mode 100644 index 0000000..1294a59 --- /dev/null +++ b/src/app/pages/advanced-criteria/advanced-criteria.component.ts @@ -0,0 +1,120 @@ +import {ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from "@angular/core"; +import {CommunityService} from "../../openaireLibrary/connect/community/community.service"; +import {AdvancedCriteriaService} from "./advanced-criteria.service"; +import {Subscription} from "rxjs"; +import {SelectionCriteria} from "../../openaireLibrary/utils/entities/contentProvider"; +import { + FullScreenModalComponent +} from "../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component"; +import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; +import {CriteriaComponent} from "../content-providers/criteria/criteria.component"; +import {CriteriaUtils} from "../content-providers/criteria-utils"; +import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; + +@Component({ + selector: 'advanced-criteria', + template: ` +
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
Criteria
+
+
+
+
No criteria yet
+ + Add multiple constraints in AND to define a criterion: results that satisfy at least one of the criteria will be included in your community. + +
+
+
+
+ +
+ +
+
No Criteria yet
+ + Add multiple constraints in AND to define a criterion: results that satisfy at least one of the criteria will be included in your community. + +
+ +
+ + ` +}) +export class AdvancedCriteriaComponent implements OnInit, OnDestroy { + public loading = true; + public selectionCriteria: SelectionCriteria; + public community: CommunityInfo; + public criteriaUtils: CriteriaUtils = new CriteriaUtils(); + private subscriptions: any[] = []; + @ViewChild('criteria') criteria: CriteriaComponent; + @ViewChild('filtersModal', { static: true }) filtersModal: FullScreenModalComponent; + + constructor(private communityService: CommunityService, + private cdr: ChangeDetectorRef, + private advancedCriteriaService: AdvancedCriteriaService) {} + + ngOnInit() { + this.loading = true; + this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { + this.community = community; + this.selectionCriteria = community.selectionCriteria; + this.loading = false; + })); + } + + saveCriteria() { + let callback = (selectionCriteria): void => { + this.advancedCriteriaService.saveAdvancedCriteria(this.community.communityId, selectionCriteria).subscribe(() => { + this.criteria.reset(); + this.criteria.loading = false; + NotificationHandler.rise('Filters have been successfully updated'); + }, error => { + this.criteria.loading = false; + this.criteria.handeError('An error has been occurred. Try again later!', error); + }); + } + this.loading = true; + this.criteria.save(callback); + } + + public openCriteria() { + this.criteria.reset(); + this.filtersModal.title = 'Criteria'; + this.filtersModal.okButtonText = "Save"; + this.filtersModal.back = true; + this.filtersModal.okButton = true; + this.filtersModal.open(); + this.cdr.detectChanges(); + } + + ngOnDestroy() { + this.subscriptions.forEach(subscription => { + if(subscription instanceof Subscription) { + subscription.unsubscribe(); + } + }) + } +} diff --git a/src/app/pages/advanced-criteria/advanced-criteria.module.ts b/src/app/pages/advanced-criteria/advanced-criteria.module.ts new file mode 100644 index 0000000..1645825 --- /dev/null +++ b/src/app/pages/advanced-criteria/advanced-criteria.module.ts @@ -0,0 +1,18 @@ +import {NgModule} from "@angular/core"; +import {CommonModule} from "@angular/common"; +import {RouterModule} from "@angular/router"; +import {AdvancedCriteriaComponent} from "./advanced-criteria.component"; +import {PageContentModule} from "../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; +import {FullScreenModalModule} from "../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module"; +import {CriteriaModule} from "../content-providers/criteria/criteria.module"; +import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module"; +import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module"; + +@NgModule({ + imports: [CommonModule, RouterModule.forChild([ + {path: '', component: AdvancedCriteriaComponent,} + ]), PageContentModule, FullScreenModalModule, CriteriaModule, IconsModule, LoadingModule], + declarations: [AdvancedCriteriaComponent], + exports: [AdvancedCriteriaComponent] +}) +export class AdvancedCriteriaModule {} diff --git a/src/app/pages/advanced-criteria/advanced-criteria.service.ts b/src/app/pages/advanced-criteria/advanced-criteria.service.ts new file mode 100644 index 0000000..703bd80 --- /dev/null +++ b/src/app/pages/advanced-criteria/advanced-criteria.service.ts @@ -0,0 +1,25 @@ +import {Injectable} from "@angular/core"; +import {SelectionCriteria} from "../../openaireLibrary/utils/entities/contentProvider"; +import {Observable} from "rxjs"; +import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; +import {HttpClient} from "@angular/common/http"; +import {properties} from "../../../environments/environment"; +import {map} from "rxjs/operators"; +import {CommunityService} from "../../openaireLibrary/connect/community/community.service"; + +@Injectable({ + providedIn: 'root' +}) +export class AdvancedCriteriaService { + + constructor(private httpClient: HttpClient, + private communityService: CommunityService) { + } + + public saveAdvancedCriteria(communityId, selectionCriteria: SelectionCriteria): Observable { + return this.httpClient.post(properties.communityAPI + communityId + '/advancedConstraint', selectionCriteria).pipe(map(community => { + this.communityService.updateAdvancedCriteria(this.communityService.parseCommunity(community).selectionCriteria); + })); + } + +} diff --git a/src/app/pages/affiliations/affiliations.component.html b/src/app/pages/affiliations/affiliations.component.html index 5144275..ccfdef9 100644 --- a/src/app/pages/affiliations/affiliations.component.html +++ b/src/app/pages/affiliations/affiliations.component.html @@ -1,16 +1,6 @@
-
-
-
-
Admin Dashboard - Manage Organizations -
-

{{community.shortTitle}}

-
-
- -
-
+
+ +
+
    +
  • +
    +

    + {{i + 1}} +

    +
    +
    +
    +
    -
    - +
    +
    -
    - +
    +
    -
    - +
    +
    -
    -
    - -
    - +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    + + (change)="caseSensitive($event, constraint)"> +
    -
    -
    -
    -
    -
    -
    -
    - +
    +
    +
    +
    +
    +
    +
    + -
    -
    - + (change)="caseSensitive($event, constraint)"> +
    +
    + +
    -
    -
    - - - Add Constraint - +
    + + + Add Constraint + +
    -
    -
    • -
-
- - + +
-
- + +
+
+ + + Add {{entityType}} + +
diff --git a/src/app/pages/content-providers/criteria/criteria.component.less b/src/app/pages/content-providers/criteria/criteria.component.less index 6bec815..6fff62f 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.less +++ b/src/app/pages/content-providers/criteria/criteria.component.less @@ -1,8 +1,3 @@ -@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; +.criteria { + padding-right: 20px; } diff --git a/src/app/pages/content-providers/criteria/criteria.component.ts b/src/app/pages/content-providers/criteria/criteria.component.ts index 8ae1e24..41a54ae 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.ts +++ b/src/app/pages/content-providers/criteria/criteria.component.ts @@ -1,93 +1,118 @@ -import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {EnvProperties} from '../../../openaireLibrary/utils/properties/env-properties'; import { - Constraint, - ContentProvider, - Criteria, - SelectionCriteria -} from '../../../openaireLibrary/utils/entities/contentProvider'; + AfterViewInit, + ChangeDetectorRef, + Component, + Input, + OnChanges, + OnDestroy, + OnInit, + SimpleChanges +} from '@angular/core'; +import {EnvProperties} from '../../../openaireLibrary/utils/properties/env-properties'; +import {Constraint, Criteria, SelectionCriteria} from '../../../openaireLibrary/utils/entities/contentProvider'; import {AbstractControl, UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms'; -import {ManageCommunityContentProvidersService} from '../../../services/manageContentProviders.service'; import {properties} from "../../../../environments/environment"; -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"; import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler"; import {OpenaireEntities} from "../../../openaireLibrary/utils/properties/searchFields"; +import {ISVocabulariesService} from "../../../openaireLibrary/utils/staticAutoComplete/ISVocabularies.service"; +import {Subscription} from "rxjs"; @Component({ selector: 'criteria', templateUrl: 'criteria.component.html', styleUrls: ['criteria.component.less'] }) -export class CriteriaComponent implements OnInit { +export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDestroy { @Input() - public dataProvider: ContentProvider; - public selectionCriteria: UntypedFormGroup; + public entityType: string = 'filter'; + @Input() + public entityTypePlural: string = 'filters'; + @Input() + public selectionCriteria: SelectionCriteria; + @Input() + public height: number = 0; + public criteriaHeight: number = 0; + public selectionCriteriaForm: UntypedFormGroup; public properties: EnvProperties = properties; - public fields: Option[] = CriteriaUtils.fields; - public verbs: Option[] = CriteriaUtils.verbs; + public criteriaUtils: CriteriaUtils = new CriteriaUtils(); + public fos: string[] = []; + public sdg: string[] = []; public loading = true; - /** Paging */ - public page: number = 1; - public pageSize: number = 5; public openaireEntities = OpenaireEntities; + private subscriptions: any[] = []; - constructor(private manageCommunityContentProvidersService: ManageCommunityContentProvidersService, - private cdr: ChangeDetectorRef, + constructor(private cdr: ChangeDetectorRef, private vocabulariesService: ISVocabulariesService, private fb: UntypedFormBuilder) { } ngOnInit() { this.reset(); this.loading = false; + this.subscriptions.push(this.vocabulariesService.getVocabularyByType('fos', null, properties).subscribe((fos: any[]) => { + this.fos = fos.map(element => element.id); + })); + this.subscriptions.push(this.vocabulariesService.getVocabularyByType('sdg', null, properties).subscribe((sdg: any[]) => { + this.sdg = sdg.map(element => element.id); + })); } - reset() { - this.page = 1; - if (this.dataProvider) { - this.selectionCriteria = this.fb.group({ - criteria: this.fb.array([]) - }); - let selectionCriteria = this.dataProvider.selectioncriteria; - if (selectionCriteria) { - selectionCriteria.criteria.forEach(criterion => { - let constraintArray: UntypedFormArray = this.fb.array([]); - criterion.constraint.forEach(constraint => { - constraintArray.push(this.fb.group({ - field: this.fb.control(constraint.field, Validators.required), - verb: this.fb.control(this.removeSuffix(constraint.verb), Validators.required), - value: this.fb.control(constraint.value, Validators.required), - verb_suffix: this.fb.control(this.getSuffix(constraint.verb)) - })); - }); - this.criteria.push(this.fb.group({ - constraint: constraintArray - })); - }); + ngOnChanges(changes: SimpleChanges) { + this.calculateMaxHeight(); + } + + ngAfterViewInit() { + this.calculateMaxHeight(); + } + + ngOnDestroy() { + this.subscriptions.forEach(subscription => { + if (subscription instanceof Subscription) { + subscription.unsubscribe(); + } + }); + } + + calculateMaxHeight() { + if(this.height) { + if(this.height > 0) { + /* Element height - margins(20 + 20) - button height(42) */ + this.criteriaHeight = this.height - 40 - 42; + this.cdr.detectChanges(); } } } - 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); - } else { - return []; + reset() { + if (this.selectionCriteria?.criteria) { + this.selectionCriteriaForm = this.fb.group({ + criteria: this.fb.array([]) + }); + this.selectionCriteria.criteria.forEach(criterion => { + let constraintArray: UntypedFormArray = this.fb.array([]); + criterion.constraint.forEach(constraint => { + constraintArray.push(this.fb.group({ + field: this.fb.control(constraint.field, Validators.required), + verb: this.fb.control(this.removeSuffix(constraint.verb), Validators.required), + value: this.fb.control(constraint.value, Validators.required), + verb_suffix: this.fb.control(this.getSuffix(constraint.verb)) + })); + }); + this.criteria.push(this.fb.group({ + constraint: constraintArray + })); + }); } } - getIndex(index: number): number { - return (this.page - 1)*this.pageSize + index; + get disabled() { + return this.loading || !this.dirty || this.selectionCriteriaForm.invalid; } public get criteria(): UntypedFormArray { - return this.selectionCriteria.get('criteria') as UntypedFormArray; + return this.selectionCriteriaForm.get('criteria') as UntypedFormArray; } public getConstraint(i: number): UntypedFormArray { @@ -103,11 +128,9 @@ export class CriteriaComponent implements OnInit { verb_suffix: this.fb.control('_caseinsensitive') }) ]); - this.criteria.insert(0, this.fb.group({ - constraint: constraintArray - })); - this.page = 1; + this.criteria.push(this.fb.group({constraint: constraintArray})); this.cdr.detectChanges(); + document.getElementById('criterion-' + (this.criteria.length - 1).toString()).scrollIntoView({behavior: 'smooth'}); } public addConstraint(i: number) { @@ -126,25 +149,22 @@ export class CriteriaComponent implements OnInit { constraintArray.removeAt(j); if (constraintArray.length === 0) { this.criteria.removeAt(i); - while(this.currentPage.length === 0 && this.page > 0) { - this.page--; - } } this.cdr.detectChanges(); } - get dataProviderCriteria(): Criteria[] { - return (this.dataProvider && this.dataProvider.selectioncriteria && this.dataProvider.selectioncriteria.criteria)?this.dataProvider.selectioncriteria.criteria:[]; + get criteriaArray(): Criteria[] { + return (this.selectionCriteria?.criteria) ? this.selectionCriteria?.criteria : []; } - + get dirty() { - if(!this.dataProvider || !this.criteria) { + if (!this.selectionCriteria || !this.criteria) { return false; - } else if(this.criteria.length !== this.dataProviderCriteria.length) { + } else if (this.criteria.length !== this.criteriaArray.length) { return true; } else { - return this.dataProviderCriteria.filter((criterion, i) => { - if(criterion.constraint.length !== this.getConstraint(i).length) { + return this.criteriaArray.filter((criterion, i) => { + if (criterion.constraint.length !== this.getConstraint(i).length) { return true; } else { let temp = this.getConstraint(i).value; @@ -156,23 +176,10 @@ export class CriteriaComponent implements OnInit { } } - save(callback: Function = null) { - if (this.selectionCriteria.valid) { + save(callback: (selectionCriteria) => void = null) { + if (this.selectionCriteriaForm.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; - NotificationHandler.rise('Filters have been successfully updated'); - }, error => { - this.loading = false; - this.handeError('An error has been occurred. Try again later!', error); - }); - } else { - this.handeError('An error has been occurred. Try again later!'); + callback(this.parseForm(this.selectionCriteriaForm.value)); } } @@ -182,7 +189,7 @@ export class CriteriaComponent implements OnInit { } caseSensitive(event: MatSlideToggleChange, constraint: AbstractControl) { - if(event.checked) { + if (event.checked) { constraint.get('verb_suffix').setValue(''); } else { constraint.get('verb_suffix').setValue('_caseinsensitive'); @@ -194,7 +201,7 @@ export class CriteriaComponent implements OnInit { } getSuffix(verb: string) { - if(verb.includes('_caseinsensitive')) { + if (verb.includes('_caseinsensitive')) { return '_caseinsensitive'; } else { return ''; @@ -215,9 +222,4 @@ export class CriteriaComponent implements OnInit { }) return selectionCriteria; } - - public updatePage(event) { - this.page = event.value; - HelperFunctions.scroll(); - } } 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 263e1f6..f211f4f 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core'; import {RemoveContentProvidersComponent} from './remove-content-providers.component'; import {Title} from '@angular/platform-browser'; import { @@ -13,6 +13,8 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit import {ContentProvider} from "../../openaireLibrary/utils/entities/contentProvider"; import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; import {CriteriaComponent} from "./criteria/criteria.component"; +import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; +import {ManageCommunityContentProvidersService} from "../../services/manageContentProviders.service"; @Component({ selector: 'manage-content-providers', @@ -24,12 +26,22 @@ import {CriteriaComponent} from "./criteria/criteria.component"; (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> - - -
- + +
+ +
+
No Filters for {{dataProvider.officialname}} yet
+ If no Filters are specified, all {{openaireEntities.RESULTS | lowercase}} of this {{openaireEntities.DATASOURCE | lowercase}} will be included in your + {{openaireEntities.COMMUNITY | lowercase}}. + +
+
` @@ -45,11 +57,14 @@ export class ManageContentProvidersComponent implements OnInit { public showLoadingInRemove: boolean = true; public body: string = "Send from page"; public properties: EnvProperties = properties; + public openaireEntities = OpenaireEntities; public community: CommunityInfo; - public contentProvider: ContentProvider; + public dataProvider: ContentProvider; constructor(private title: Title, - private communityService: CommunityService) { + private cdr: ChangeDetectorRef, + private communityService: CommunityService, + private manageCommunityContentProvidersService: ManageCommunityContentProvidersService) { } ngOnInit() { @@ -80,17 +95,27 @@ export class ManageContentProvidersComponent implements OnInit { } public openCriteria(contentProvider: ContentProvider) { - this.contentProvider = contentProvider; + this.dataProvider = contentProvider; this.filtersModal.title = 'Filters'; this.filtersModal.okButtonText = "Save"; this.filtersModal.back = true; this.filtersModal.okButton = true; this.filtersModal.open(); + this.cdr.detectChanges(); } public saveCriteria() { - let callback: Function = () => { - this.removeContentProvidersComponent.getCommunityContentProviders(); + let callback = (selectionCriteria): void => { + this.dataProvider.selectioncriteria = selectionCriteria; + this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { + this.criteria.reset(); + this.removeContentProvidersComponent.getCommunityContentProviders(); + this.criteria.loading = false; + NotificationHandler.rise('Filters have been successfully updated'); + }, error => { + this.criteria.loading = false; + this.criteria.handeError('An error has been occurred. Try again later!', error); + }); } this.removeContentProvidersComponent.loading = true; this.criteria.save(callback); 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 d921b24..6156177 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -1,16 +1,6 @@
-
-
-
-
Admin Dashboard - Manage {{openAIREEntities.DATASOURCES}} -
-

{{community.shortTitle}}

-
-
- -
-
+
Filters
-
+
View all {{item.selectioncriteria.criteria.length}} filters
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 ad47053..8fce21e 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -38,8 +38,7 @@ export class RemoveContentProvidersComponent implements OnInit { private selectedCommunityContentProvider: any; @ViewChild('deleteModal') deleteModal: AlertModal; /** Criteria */ - private fields = CriteriaUtils.fields; - private verbs = CriteriaUtils.verbs; + public criteriaUtils: CriteriaUtils = new CriteriaUtils(); /** Paging */ page: number = 1; resultsPerPage: number = properties.resultsPerPage; @@ -81,20 +80,6 @@ export class RemoveContentProvidersComponent implements OnInit { }); } - getFiltersAsText(criteria: Criteria[]): string { - 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')) { - matchCase = true; - } - let verb = this.verbs.find(verb => verb.value === constraint.verb.replace("_caseinsensitive", "")).label; - let value = '"' + constraint.value + '"' + (matchCase ? " (Match case)" : ""); - return field + " " + verb + " " + value; - }).join(" and ")); - return text.join("
"); - } - public confirmedDeleteContentProvider() { this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe( () => { diff --git a/src/app/pages/customization/background-upload.component.ts b/src/app/pages/customization/background-upload.component.ts index 996b407..c5886a3 100644 --- a/src/app/pages/customization/background-upload.component.ts +++ b/src/app/pages/customization/background-upload.component.ts @@ -9,60 +9,64 @@ declare var UIkit; selector: 'background-upload', template: ` -
+
- upload image + upload image
- -
-
+ +
+
- - - -
+ + +
+
position
-
-
- +
+
+
- + `, - styles:[` - .upload{ - border: 1px dotted grey; - } + styles: [` + .upload { + border: 1px dotted grey; + } `] }) export class BackgroundUploadComponent implements OnInit { - @Input() label:string = ""; + @Input() label: string = ""; @Input() background; @Input() oldBackground; // @Input() light:boolean; - @Input() communityId:string = ""; - + @Input() communityId: string = ""; + public file: File; // public photo: string | ArrayBuffer; private maxsize: number = 2000 * 1024; properties; private subscriptions: any[] = []; - - + + constructor(private utilsService: UtilitiesService) { } - - + + ngOnInit() { this.properties = properties; } + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscription) { @@ -70,30 +74,29 @@ export class BackgroundUploadComponent implements OnInit { } }); } - + removePhoto() { - - if (typeof document != 'undefined') { - (document.getElementById("photo")).value = ""; - } - // this.initPhoto(); + + if (typeof document != 'undefined') { + (document.getElementById("photo")).value = ""; + } + // this.initPhoto(); console.log(this.background.imageFile + " " + this.oldBackground.imageFile) - if(this.background.imageFile != this.oldBackground.imageFile){ - this.deletePhoto(); - } - this.background.imageFile = null; - this.file = null; - + if (this.background.imageFile != this.oldBackground.imageFile) { + this.deletePhoto(); + } + this.background.imageFile = null; + this.file = null; + } - - - + + public deletePhoto() { if (this.background.imageFile) { - this.subscriptions.push(this.utilsService.deletePhoto(properties.utilsService + '/delete/community/' + this.communityId + "/" +this.background.imageFile).subscribe()); + this.subscriptions.push(this.utilsService.deletePhoto(properties.utilsService + '/delete/community/' + this.communityId + "/" + this.background.imageFile).subscribe()); } } - + fileChangeEvent(event) { if (event.target.files && event.target.files[0]) { this.file = event.target.files[0]; @@ -105,7 +108,7 @@ export class BackgroundUploadComponent implements OnInit { }); this.removePhoto(); } else if (this.file.size > this.maxsize) { - UIkit.notification('File exceeds size\'s limit ('+this.maxsize/1024+'KB)! ', { + UIkit.notification('File exceeds size\'s limit (' + this.maxsize / 1024 + 'KB)! ', { status: 'danger', timeout: 6000, pos: 'bottom-right' @@ -122,27 +125,34 @@ export class BackgroundUploadComponent implements OnInit { } } } - + public save() { if (this.file) { - this.subscriptions.push(this.utilsService.uploadPhoto(this.properties.utilsService + "/upload/community/"+ this.communityId + "/" + encodeURIComponent(this.communityId+"-"+this.label)+"?big=1", this.file).subscribe(res => { + this.subscriptions.push(this.utilsService.uploadPhoto(this.properties.utilsService + "/upload/community/" + this.communityId + "/" + encodeURIComponent(this.communityId + "-" + this.label) + "?big=1", this.file).subscribe(res => { this.deletePhoto(); this.removePhoto(); this.background.imageFile = res.filename; - + }, error => { - UIkit.notification("An error has been occurred during upload your image. Try again later", { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + if (error.error.message) { + UIkit.notification('The maximum size of an image is 1MB, please check if your file exceeds this limit.', { + status: 'danger', + timeout: 6000, + pos: 'bottom-right' + }); + } else { + UIkit.notification("An error has been occurred during upload your image. Try again later", { + status: 'danger', + timeout: 6000, + pos: 'bottom-right' + }); + } })); } } - - getUrl() - { - return "url('" +(this.background.imageFile.indexOf('data:')==-1?(this.properties.utilsService + - '/download/'+this.background.imageFile):this.background.imageFile) +"')"; + + getUrl() { + return "url('" + (this.background.imageFile.indexOf('data:') == -1 ? (this.properties.utilsService + + '/download/' + this.background.imageFile) : this.background.imageFile) + "')"; } } diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 1f11504..f532290 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -1,16 +1,14 @@
- - -
-
- - - -
-
-
-
-
- -
-
-
-
- - + diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts index 2ae5b22..443c001 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts @@ -1,6 +1,6 @@ import {Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {UntypedFormArray, UntypedFormBuilder, UntypedFormControl} from '@angular/forms'; -import {ActivatedRoute, Router} from '@angular/router'; +import {ActivatedRoute} from '@angular/router'; import {CommunityService} from '../../../openaireLibrary/connect/community/community.service'; import {SubjectsService} from '../subjects.service'; import {EnvProperties} from '../../../openaireLibrary/utils/properties/env-properties'; @@ -8,67 +8,104 @@ import {Title} from '@angular/platform-browser'; import {properties} from '../../../../environments/environment'; import {AlertModal} from '../../../openaireLibrary/utils/modal/alert'; import {SearchInputComponent} from '../../../openaireLibrary/sharedComponents/search-input/search-input.component'; -import {Subscription} from 'rxjs'; +import {forkJoin, Subscription} from 'rxjs'; import {CommunityInfo} from '../../../openaireLibrary/connect/community/communityInfo'; import {FullScreenModalComponent} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component'; import {HelperFunctions} from 'src/app/openaireLibrary/utils/HelperFunctions.class'; import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler"; import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service"; +import {SdgSelectionComponent} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.component'; +import {FosSelectionComponent} from '../../../openaireLibrary/fos/fos-selection/fos-selection.component'; +import {InputComponent} from "../../../openaireLibrary/sharedComponents/input/input.component"; + +declare var UIkit: any; @Component({ selector: 'subjects-edit-form', templateUrl: './subjects-edit-form.component.html', }) export class SubjectsEditFormComponent implements OnInit { - myForm = new UntypedFormArray([new UntypedFormControl({subject: ''})]); - public showLoading = true; - public res = []; + properties: EnvProperties = properties; + communityId: string = null; + community: CommunityInfo = null; + loading = true; params: any; - public communityId: string = null; - public community: CommunityInfo = null; - public properties: EnvProperties = properties; - public edit = null; - public originalSubjects = []; + private subscriptions: any[] = []; + + filterForm: UntypedFormControl; + subjectsForm = new UntypedFormArray([]); + hasChanges: boolean = false; + originalAllSubjects = []; + originalSubjects = []; + originalSdg = []; + originalFos = []; + displayedAllSubjects = []; + displayedSubjects = []; + displayedSdg = []; + displayedFos = []; + groupedAllSubjects = []; + groupedSubjects = []; + groupedSdg = []; + groupedFos = []; + subjectsColumns = []; + subjectsLimit: number = 6; + maxCharacters: number = 25; + activeTab: 'all' | 'freeText' | 'sdg' | 'fos' = 'all'; + indexAll: number = 0; + indexSubjects: number = 0; + indexSdg: number = 0; + indexFos: number = 0; + + @ViewChild('addSubjectsInput') addSubjectsInput: InputComponent; @ViewChild('editModal') editModal: AlertModal; @ViewChild('deleteModal') deleteModal: AlertModal; @ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent; - page = 1; - size = 10; - selectedSubjects = []; - isEditModal: boolean = false; - public selectedKeyword: string; - @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent; - public filterForm: UntypedFormControl; - private subscriptions: any[] = []; - /*//Check again functionality to enable page - subjectsPage; - @ViewChild('enablePageModal') enablePageModal: AlertModal;*/ - constructor(private element: ElementRef, - private route: ActivatedRoute, - private _router: Router, + @ViewChild('modalTabs') modalTabs: ElementRef; + @ViewChild('sdgSelection') sdgSelection: SdgSelectionComponent; + @ViewChild('fosSelection') fosSelection: FosSelectionComponent; + + onEnter: () => void = () => { + this.addSubjectsIntoList(); + } + + constructor(private route: ActivatedRoute, public _fb: UntypedFormBuilder, private title: Title, - // private _helpContentService: HelpContentService, private _communityService: CommunityService, private _subjectsService: SubjectsService, - private _clearCacheService: ClearCacheService - ) { - } - + private _clearCacheService: ClearCacheService) { + } ngOnInit() { this.filterForm = this._fb.control(''); this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => { - this.page = 1; - this.community.subjects = this.originalSubjects.filter(subject => { + this.displayedAllSubjects = this.originalAllSubjects.filter(subject => { return !value || subject.toLowerCase().indexOf(value.toLowerCase()) != -1 }); + this.displayedSubjects = this.originalSubjects.filter(subject => { + return !value || subject.toLowerCase().indexOf(value.toLowerCase()) != -1 + }); + this.displayedSdg = this.originalSdg.filter(subject => { + return !value || subject.toLowerCase().indexOf(value.toLowerCase()) != -1 + }); + this.displayedFos = this.originalFos.filter(subject => { + return !value || subject.toLowerCase().indexOf(value.toLowerCase()) != -1 + }); + if(this.activeTab === 'all') { + this.groupSubjects(this.displayedAllSubjects, 'all'); + } else if(this.activeTab === 'freeText') { + this.groupSubjects(this.displayedSubjects, 'freeText'); + } else if(this.activeTab === 'sdg') { + this.groupSubjects(this.displayedSdg, 'sdg'); + } else if(this.activeTab === 'fos') { + this.groupSubjects(this.displayedFos, 'fos'); + } })); this.subscriptions.push(this.route.params.subscribe( params => { this.communityId = params['community']; this.title.setTitle(this.communityId.toUpperCase() + ' | Subjects'); - this.showLoading = true; + this.loading = true; this.subscriptions.push(this._communityService.getCommunityAsObservable().subscribe( community => { this.community = community; @@ -85,19 +122,19 @@ export class SubjectsEditFormComponent implements OnInit { } return 0; }); - - this.originalSubjects = []; - for (let i = 0; i < this.community.subjects.length; i++) { - this.originalSubjects.push(this.community.subjects[i]); - } - if (this.community.subjects.length === 0) { - this.community.subjects.push(''); - } - this.showLoading = false; + this.displayedSubjects = HelperFunctions.copy(this.community.subjects); + this.displayedSdg = this.community.sdg; + this.displayedFos = this.community.fos; + this.displayedAllSubjects = [...this.displayedSubjects, ...this.displayedSdg, ...this.displayedFos]; + this.groupSubjects(this.displayedAllSubjects, 'all'); + this.originalAllSubjects = HelperFunctions.copy(this.displayedAllSubjects); + this.originalSubjects = HelperFunctions.copy(this.displayedSubjects); + this.originalSdg = HelperFunctions.copy(this.displayedSdg); + this.originalFos = HelperFunctions.copy(this.displayedFos); + this.loading = false; }, error => this.handleUpdateError('System error retrieving community profile', error) )); - // this.getSubjectsPageStatus(); })); } @@ -109,19 +146,109 @@ export class SubjectsEditFormComponent implements OnInit { } }); } - - private removeModalOpen(subject: string, i: any) { - this.selectedSubjects = [subject]; - this.reset(['']); - this.deleteModal.cancelButton = true; - this.deleteModal.okButton = true; - this.deleteModal.alertTitle = 'Delete Subject'; - this.deleteModal.message = 'Are you sure you want to delete this subject?'; - this.deleteModal.okButtonText = 'Yes'; - this.deleteModal.cancelButtonText = 'No'; - this.deleteModal.open(); - } - + + public groupSubjects(subjects: string[], type: string) { + if(subjects.length === 0) { + return []; + } + subjects.sort((a, b) => a.localeCompare(b)); + if(type === 'all') { + this.indexAll = 0; + this.activeTab = 'all'; + this.groupedAllSubjects = Object.values( + subjects.reduce((acc, subject) => { + let firstLetter = subject[0].toLocaleUpperCase(); + if(!acc[firstLetter]) { + acc[firstLetter] = {group: firstLetter, data: [subject]}; + } else { + acc[firstLetter].data.push(subject); + } + return acc; + },{}) + ) + if(subjects.length > 1) { + this.groupedAllSubjects.unshift({group: 'All', data: subjects}); + } + } + if(type === 'freeText') { + this.indexSubjects = 0; + this.activeTab = 'freeText'; + this.groupedSubjects = Object.values( + subjects.reduce((acc, subject) => { + let firstLetter = subject[0].toLocaleUpperCase(); + if(!acc[firstLetter]) { + acc[firstLetter] = {group: firstLetter, data: [subject]}; + } else { + acc[firstLetter].data.push(subject); + } + return acc; + },{}) + ) + if(subjects.length > 1) { + this.groupedSubjects.unshift({group: 'All', data: subjects}); + } + } + if(type === 'sdg') { + this.indexSdg = 0; + this.activeTab = 'sdg'; + this.groupedSdg = Object.values( + subjects.reduce((acc, subject) => { + let firstLetter = subject[0].toLocaleUpperCase(); + if(!acc[firstLetter]) { + acc[firstLetter] = {group: firstLetter, data: [subject]}; + } else { + acc[firstLetter].data.push(subject); + } + return acc; + },{}) + ) + if(subjects.length > 1) { + this.groupedSdg.unshift({group: 'All', data: subjects}); + } + } + if(type === 'fos') { + this.indexFos = 0; + this.activeTab = 'fos'; + this.groupedFos = Object.values( + subjects.reduce((acc, subject) => { + let key = subject.substring(0,2).toLocaleUpperCase(); + if(!acc[key]) { + acc[key] = {group: key, data: [subject]}; + } else { + acc[key].data.push(subject); + } + return acc; + },{}) + ) + if(subjects.length > 1) { + this.groupedFos.unshift({group: 'All', data: subjects}); + } + } + } + + public changeDisplayedSubjects(i, group) { + this.subjectsColumns = []; + if(this.activeTab === 'all') { + this.indexAll = i; + } else if(this.activeTab === 'freeText') { + this.indexSubjects = i; + } else if(this.activeTab === 'sdg') { + this.indexSdg = i; + } else if(this.activeTab === 'fos') { + this.indexFos = i; + } + if(group.data.length > this.subjectsLimit && group.group != 'All') { + this.divideSubjects(group); + } + } + + public divideSubjects(group) { + let columns = []; + for(let i = 0; i < (group.data.length / this.subjectsLimit); i++) { + columns.push(group.data.slice(i * this.subjectsLimit, ((i + 1) * this.subjectsLimit))); + } + this.subjectsColumns = columns; + } public getSubjectsExistOnlyInFirst(firstArray: string[], secondArray: string[]): string[] { const difference = []; @@ -129,41 +256,70 @@ export class SubjectsEditFormComponent implements OnInit { if (secondArray.indexOf(firstArray[i]) === -1) { difference.push(firstArray[i]); } - } return difference; } + + public editAllSubjects() { + UIkit.tab(this.modalTabs.nativeElement).show(0); + this.displayedSubjects = HelperFunctions.copy(this.community.subjects); + this.sdgSelection.reset(); + this.sdgSelection.sdgs.markAsPristine(); + this.fosSelection.reset(); + this.fosSelection.fosOptions.markAsPristine(); + this.fullscreen.title = "Add/Edit Subjects"; + this.fullscreen.okButtonText = "Save"; + this.fullscreen.back = true; + this.fullscreen.okButton = true; + this.fullscreen.open(); + } + + public addSubjectsIntoList() { + if(this.addSubjectsInput.searchControl.getRawValue()) { + this.addSubjectsInput.add(null, true); + } + this.subjectsForm.getRawValue().forEach(element => { + this.displayedSubjects.unshift(element); + }); + this.subjectsForm.clear(); + this.hasChanges = true; + } + + public removeSubjectFromList(i) { + this.displayedSubjects.splice(i, 1); + this.hasChanges = true; + } + + public saveAllSubjects() { + let selectedSdg = this.sdgSelection.getSelectedSubjects().map(a => a.id); + let selectedFos = this.fosSelection.getSelectedSubjects().map(a => a.id); + let requests = [ + ...this.saveSubjects(this.community.subjects, this.displayedSubjects, 'subjects'), + ...this.saveSubjects(this.community.sdg, selectedSdg, 'sdg'), + ...this.saveSubjects(this.community.fos, selectedFos, 'fos') + ]; + this.subscriptions.push(forkJoin(requests).subscribe(res => { + this.afterUpdateActions(res, "updated"); + })); + } - public saveSubjects() { + public saveSubjects(subjects, displayedSubjects, type: string) { if (this.communityId != null && this.communityId !== '') { - this.showLoading = true; - const subjectsToDeleteAr = this.getSubjectsExistOnlyInFirst(this.selectedSubjects, this.myForm.getRawValue()); - const subjectsToAddAr = this.getSubjectsExistOnlyInFirst(this.myForm.getRawValue(), this.selectedSubjects); + this.loading = true; + const subjectsToDeleteAr = this.getSubjectsExistOnlyInFirst(subjects, displayedSubjects); + const subjectsToAddAr = this.getSubjectsExistOnlyInFirst(displayedSubjects, subjects); const subjectsToDelete = this.getNonEmptyItems(subjectsToDeleteAr); const subjectsToAdd = this.getNonEmptyItems(subjectsToAddAr); - if (subjectsToAdd.length > 0 && subjectsToDelete.length > 0) { - this.subscriptions.push(this._subjectsService.removeSubjects( - this.properties.communityAPI + this.communityId + '/subjects', subjectsToDelete).subscribe(res =>{ - this.subscriptions.push(this._subjectsService.addSubjects( - this.properties.communityAPI + this.communityId + '/subjects', subjectsToAdd).subscribe(res => { - this.afterUpdateActions(res, "added"); - })); - })); - } else if (subjectsToAdd.length > 0) { - this.subscriptions.push(this._subjectsService.addSubjects( - this.properties.communityAPI + this.communityId + '/subjects', subjectsToAdd).subscribe(res => { - this.afterUpdateActions(res, "added"); - }, - error => this.handleUpdateError('System error updating subjects', error) - )); - } else if (subjectsToDelete.length > 0) { - this.subscriptions.push(this._subjectsService.removeSubjects( - this.properties.communityAPI + this.communityId + '/subjects', subjectsToDelete).subscribe(res => { - this.afterUpdateActions(res, "deleted"); - }, - error => this.handleUpdateError('System error updating subjects', error) - )); + let requests = []; + if (subjectsToDelete.length > 0) { + requests.push(this._subjectsService.removeSubjects( + this.properties.communityAPI + this.communityId + '/' + type, subjectsToDelete)) } + if (subjectsToAdd.length > 0) { + requests.push(this._subjectsService.addSubjects( + this.properties.communityAPI + this.communityId + '/' + type, subjectsToAdd)) + } + return requests; } } @@ -172,32 +328,23 @@ export class SubjectsEditFormComponent implements OnInit { console.error(error) } NotificationHandler.rise(message, 'danger'); - this.showLoading = false; + this.loading = false; } - afterUpdateActions(res, message: string) { - this._communityService.setCommunity(this._communityService.parseCommunity(res)); - this.community.subjects = res['subjects']; - this.originalSubjects = []; - for (let i = 0; i < this.community.subjects.length; i++) { - this.originalSubjects.push(this.community.subjects[i]); - } - this.originalSubjects.sort((n1,n2)=> { - if (n1.toLowerCase() > n2.toLowerCase()) { - return 1; - } - if (n1.toLowerCase() < n2.toLowerCase()) { - return -1; - } - return 0; - }); - this.page = 1; - this.community.subjects = this.originalSubjects.filter(subject => { - return !this.filterForm.value || subject.toLowerCase().indexOf(this.filterForm.value.toLowerCase()) != -1 - }).sort(); - this._clearCacheService.purgeBrowserCache("Subject "+message, this.communityId); - NotificationHandler.rise('Subject successfully ' + message + '!') - this.showLoading = false; + afterUpdateActions(response, message: string) { + response.forEach(res => { + if (res.subjects) { + this.community.subjects = res.subjects; + } else if (res.sdg) { + this.community.sdg = res.sdg; + } else if (res.fos) { + this.community.fos = res.fos; + } + }); + this._communityService.updateSubjects(this.community.subjects, this.community.fos, this.community.sdg); + this._clearCacheService.purgeBrowserCache("Subjects "+message, this.communityId); + NotificationHandler.rise('Subjects successfully ' + message + '!') + this.loading = false; } @@ -231,111 +378,4 @@ export class SubjectsEditFormComponent implements OnInit { return false; } } - - public addSubjectInForm() { - this.myForm.push(new UntypedFormControl('')); - } - - public removeSubjectInForm(i: number) { - this.myForm.removeAt(i); - } - - public reset(subjects: string[]) { - this.myForm = new UntypedFormArray([]); - for (let subject in subjects) { - this.myForm.push(new UntypedFormControl('')); - } - this.myForm.patchValue(subjects); - } - - newSubject() { - this.isEditModal = false; - this.selectedSubjects = []; - this.reset([""]); - this.fullscreen.title = "Add Subject"; - this.fullscreen.okButtonText = "Save"; - this.fullscreen.back = true; - this.fullscreen.okButton = true; - this.fullscreen.open(); - } - - get currentPage() { - if(this.community.subjects) { - return this.community.subjects.slice((this.page - 1) * this.size, this.page * this.size); - } else { - return []; - } - } - - public updatePage(event) { - this.page = event.value; - HelperFunctions.scroll(); - } - - public editSubject(subject: string) { - this.isEditModal = true; - this.selectedSubjects = [subject]; - this.reset([subject]); - this.fullscreen.title = "Edit Subject"; - this.fullscreen.okButtonText = "Save"; - this.fullscreen.back = true; - this.fullscreen.okButton = true; - this.fullscreen.open(); - } - - - private formModalOpen(title: string, yesBtn: string) { - this.editModal.okButtonLeft = false; - this.editModal.cancelButton = true; - this.editModal.okButton = true; - this.editModal.alertTitle = title; - this.editModal.okButtonText = yesBtn; - this.editModal.open(); - } - - public onSearchClose() { - this.selectedKeyword = this.filterForm.value; - } - - public resetInput() { - this.selectedKeyword = null; - this.searchInputComponent.reset() - } - /* - //Check again functionality to enable page - private getSubjectsPageStatus() { - this._helpContentService.getCommunityPagesByRoute(this.communityId, '/subjects', this.properties.adminToolsAPIURL).subscribe((page) => { - this.subjectsPage = page; - }); - } - - public get subjectsEnabled(): boolean { - return !this.subjectsPage || this.subjectsPage.isEnabled; - } - enablePage() { - this._helpContentService.togglePages(this.communityId, [this.subjectsPage._id], true, this.properties.adminToolsAPIURL).subscribe(() => { - this.subjectsPage.isEnabled = true; - UIkit.notification('Curators Page has been enabled successfully', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - },error => { - this.subjectsPage.isEnabled = false; - UIkit.notification('An error occured', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); - }); - } - - private curatorsEnabledOpen() { - this.enablePageModal.okButtonLeft = false; - this.enablePageModal.alertTitle = 'Enable Subjects Page'; - this.enablePageModal.okButtonText = 'Yes'; - this.enablePageModal.cancelButtonText = 'No'; - this.enablePageModal.open(); - }*/ - } 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 28af737..088a3d2 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 @@ -13,14 +13,17 @@ import {AlertModalModule} from '../../../openaireLibrary/utils/modal/alertModal. import {NoLoadPaging} from '../../../openaireLibrary/searchPages/searchUtils/no-load-paging.module'; import {LoadingModule} from '../../../openaireLibrary/utils/loading/loading.module'; import {InputModule} from '../../../openaireLibrary/sharedComponents/input/input.module'; -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"; +import {SdgSelectionModule} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.module'; +import {FosSelectionModule} from '../../../openaireLibrary/fos/fos-selection/fos-selection.module'; @NgModule({ imports: [ - SubjectsEditFormRoutingModule, CommonModule, FormsModule, RouterModule, PageContentModule, IconsModule, AlertModalModule, NoLoadPaging, LoadingModule, InputModule, CommunityInfoModule, SearchInputModule, FullScreenModalModule, PagingModule + SubjectsEditFormRoutingModule, CommonModule, FormsModule, RouterModule, + PageContentModule, IconsModule, AlertModalModule, NoLoadPaging, LoadingModule, InputModule, + SearchInputModule, FullScreenModalModule, PagingModule, SdgSelectionModule, FosSelectionModule ], declarations: [ SubjectsEditFormComponent diff --git a/src/app/pages/usernotifications/manage-user-notifications.component.html b/src/app/pages/usernotifications/manage-user-notifications.component.html index 404b170..9fadc2f 100644 --- a/src/app/pages/usernotifications/manage-user-notifications.component.html +++ b/src/app/pages/usernotifications/manage-user-notifications.component.html @@ -1,11 +1,5 @@
-
-
-
Admin Dashboard - Manage Notification Settings
-

{{community.shortTitle}}

-
-
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 a474484..a73a57f 100644 --- a/src/app/pages/users/personal-info/personal-info.component.ts +++ b/src/app/pages/users/personal-info/personal-info.component.ts @@ -25,18 +25,10 @@ declare var UIkit; template: `
-
-
-
Admin Dashboard - Manage Personal Info & - Affiliations -
-

{{community.shortTitle}}

-
-
-
+