diff --git a/app/app.component.html b/app/app.component.html index 846f041..9907982 100644 --- a/app/app.component.html +++ b/app/app.component.html @@ -35,13 +35,53 @@ --> +
+

Manage Communities

+ +

Manage Entities

+
+
+

Manage Pages

+ @@ -49,13 +89,6 @@

Help Content

--> -
+
Filter by community:
-
+
Filter by page:
- + - + + +
@@ -107,13 +115,13 @@ - + - + diff --git a/app/pages/helpcontent/pages.component.ts b/app/pages/helpcontent/pages.component.ts index 9867d86..7c32a2b 100644 --- a/app/pages/helpcontent/pages.component.ts +++ b/app/pages/helpcontent/pages.component.ts @@ -2,6 +2,7 @@ * Created by stefania on 7/13/17. */ import { Component, ViewChild, OnInit } from '@angular/core'; +import { ActivatedRoute } from "@angular/router"; import { HelpContentService } from "../../services/help-content.service"; import { FormGroup } from "@angular/forms"; import { ModalFormComponent } from "../modal-form.component"; @@ -9,6 +10,7 @@ import { DeleteConfirmationDialogComponent } from "../delete-confirmation-dialog import { PageFormComponent } from "./page-form.component"; import { CheckPage, Page } from "../../domain/page"; import { Community } from "../../domain/community"; +import { Entity } from "../../domain/entity"; @Component({ selector: 'pages', @@ -44,26 +46,48 @@ export class PagesComponent implements OnInit { public selectedCommunityId: string; - ngOnInit() { - this.getCommunities(); + public pagesType: string; + ngOnInit() { this.formGroup = this.formComponent.form; +// this.getCommunities(); + + this.route.queryParams.subscribe(params => { + this.pagesType = ""; + if(params['type']) { + this.pagesType = params['type']; + } + this.getCommunities(); + }); } - constructor(private _helpContentService: HelpContentService) {} + constructor(private route: ActivatedRoute, private _helpContentService: HelpContentService) {} getPages(community_id: string) { let self = this; - this._helpContentService.getCommunityPages(community_id).subscribe( - pages => { - self.pages = pages; - self.pagesCheckboxes = []; - pages.forEach(_ => { - self.pagesCheckboxes.push({page : _, checked : false}); - }); - }, - error => this.handleError('System error retrieving pages', error)); + if(this.pagesType) { + this._helpContentService.getCommunityPagesByType(community_id, "?page_type="+this.pagesType).subscribe( + pages => { + self.pagesReturned(pages); + }, + error => this.handleError('System error retrieving pages', error)); + } else { + this._helpContentService.getCommunityPages(community_id).subscribe( + pages => { + self.pagesReturned(pages); + }, + error => this.handleError('System error retrieving pages', error)); + } + } + + pagesReturned(pages: Page[]) { + this.pages = pages; + this.pagesCheckboxes = []; + + pages.forEach(_ => { + this.pagesCheckboxes.push({page : _, checked : false}); + }); } getCommunities() { @@ -121,7 +145,7 @@ export class PagesComponent implements OnInit { public editPage(i : number) { let page : Page = this.pagesCheckboxes[i].page; this.formGroup.patchValue(page); - const entityFGs = page.entities.map(entity => this.formComponent._fb.group(entity)); + const entityFGs = (page.entities as Entity[]).map(entity => this.formComponent._fb.group(entity)); const entityFormArray = this.formComponent._fb.array(entityFGs); this.formGroup.setControl('entities', entityFormArray); console.info(this.formGroup.value); diff --git a/app/pages/modal-form.component.ts b/app/pages/modal-form.component.ts index f735a57..51025d0 100644 --- a/app/pages/modal-form.component.ts +++ b/app/pages/modal-form.component.ts @@ -10,6 +10,7 @@ import { Question } from "../domain/question"; import { HelpContentService } from "../services/help-content.service"; import { Page } from "../domain/page"; import { Entity } from "../domain/entity"; +import { Community } from "../domain/community"; @Component({ selector: 'modal-form', @@ -76,6 +77,18 @@ export class ModalFormComponent { data => this.emmitObject.emit(data), error => this.emmitError.emit(error) ); + } else if (this.type == 'community') { + if(this.saveText == 'Update') { + this._helpService.updateCommunity( obj).subscribe( + data => this.emmitObject.emit(data), + error => this.emmitError.emit(error) + ); + } else if(this.saveText == 'Save') { + this._helpService.saveCommunity( obj).subscribe( + data => this.emmitObject.emit(data), + error => this.emmitError.emit(error) + ); + } } else if (this.type == 'page') { if(this.saveText == 'Update') { this._helpService.updatePage( obj).subscribe( diff --git a/app/services/help-content.service.ts b/app/services/help-content.service.ts index 3f5552b..5ab0f3e 100644 --- a/app/services/help-content.service.ts +++ b/app/services/help-content.service.ts @@ -32,18 +32,72 @@ export class HelpContentService { .catch(this.handleError); } + getPage(pageId:string) { + return this.http.get(this._helpContentUrl + 'page/'+pageId) + .map(res => res.json()) + .catch(this.handleError); + } + getCommunities() { return this.http.get(this._helpContentUrl + 'community') .map(res => > res.json()) .catch(this.handleError); } + getCommunitiesFull() { + return this.http.get(this._helpContentUrl + 'communityFull') + .map(res => > res.json()) + .catch(this.handleError); + } + + getCommunityFull(community_id: string) { + return this.http.get(this._helpContentUrl + 'communityFull/'+community_id) + .map(res => res.json()) + .catch(this.handleError); + } + + saveCommunity(community: Community) { + let headers = new Headers({'Content-Type': 'application/json'}); + let options = new RequestOptions({headers: headers}); + + HelpContentService.removeNulls(community); + + return this.http.post(this._helpContentUrl + 'community/save', JSON.stringify(community), options) + .map(res => res.json()) + .catch(this.handleError); + } + + updateCommunity(community: Community) { + let headers = new Headers({'Content-Type': 'application/json'}); + let options = new RequestOptions({headers: headers}); + + HelpContentService.removeNulls(community); + + return this.http.post(this._helpContentUrl + 'community/update', JSON.stringify(community), options) + .map(res => res.json()) + .catch(this.handleError); + } + + deleteCommunities(ids : string[]) { + let headers = new Headers({'Content-Type': 'application/json'}); + let options = new RequestOptions({headers: headers}); + + return this.http.post(this._helpContentUrl + 'community/delete',JSON.stringify(ids), options) + .catch(this.handleError); + } + getCommunityPages(community_id: string) { return this.http.get(this._helpContentUrl + 'community/'+community_id+'/pages') .map(res => > res.json()) .catch(this.handleError); } + getCommunityPagesByType(community_id: string, params: string) { + return this.http.get(this._helpContentUrl + 'community/'+community_id+'/pages'+params) + .map(res => > res.json()) + .catch(this.handleError); + } + getEntities() { return this.http.get(this._helpContentUrl + 'entity') .map(res => > res.json()) diff --git a/index.html b/index.html index 21c62dd..6ed0985 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - OpenMinTeD Admin Tools + OpenAIRE-Connect Admin Tools @@ -42,4 +42,3 @@ - diff --git a/styles.css b/styles.css index 57bf7b2..23949b4 100644 --- a/styles.css +++ b/styles.css @@ -749,7 +749,8 @@ a { #faqQuestions #content .page-title, #pages #content .page-title, #pageContents #content .page-title, -#entities #content .entity-title { +#entities #content .entity-title, +#communities #content .community-title { border-right: 1px solid #e6e6e6; bottom: 0; color: #7e7e7e; @@ -783,7 +784,8 @@ a { #harvestHistory #content .content-wrapper .contentPanel .alert, #pages #content .content-wrapper .contentPanel .alert, #pageContents #content .content-wrapper .contentPanel .alert, -#entities #content .content-wrapper .contentPanel .alert { +#entities #content .content-wrapper .contentPanel .alert, +#communities #content .content-wrapper .contentPanel .alert { margin-left: -10px; margin-right: -10px; } @@ -992,6 +994,14 @@ a { width: 360px; } +#communities #content form.search { + float: left; + margin-left: 150px; + position: relative; + top: -2px; + width: 360px; +} + #dataProviders #content form.search { float: left; margin-left: 220px; @@ -1008,7 +1018,8 @@ a { #faqQuestions #content form.search input[type="text"], #pages #content form.search input[type="text"], #pageContents #content form.search input[type="text"], -#entities #content form.search input[type="text"]{ +#entities #content form.search input[type="text"], +#communities #content form.search input[type="text"] { border: 0 none; border-radius: 3px; padding: 6px 15px 6px 37px; @@ -1029,7 +1040,8 @@ a { #faqQuestions #content form.search input[type="submit"], #pages #content form.search input[type="submit"], #pageContents #content form.search input[type="submit"], -#entities #content form.search input[type="submit"] { +#entities #content form.search input[type="submit"], +#communities #content form.search input[type="submit"] { position: absolute; visibility: hidden; }