From 9ed40c36d1dca9a3b2665259d95cc7907337f7ff Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 20 Dec 2017 14:26:30 +0000 Subject: [PATCH] manage communities page added | pages separated by type (added new options in menu on the left) | each page has a link to edit its page contents git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@50183 d315682c-612b-4755-9ff5-7f18f6832af3 --- app/app.component.html | 51 ++++- app/app.module.ts | 8 +- app/app.routing.ts | 11 +- app/dashboard.component.html | 4 +- app/domain/community.ts | 13 +- app/domain/page.ts | 3 +- .../community/communities.component.html | 93 +++++++++ app/pages/community/communities.component.ts | 160 ++++++++++++++++ .../community/community-form.component.html | 7 + .../community/community-form.component.ts | 41 ++++ .../edit-page-help-content.component.ts | 12 +- app/pages/helpcontent/entities.component.html | 112 +++++++++++ app/pages/helpcontent/entities.component.ts | 180 ++++++++++++++++++ .../new-page-help-content.component.ts | 11 +- .../helpcontent/page-form.component.html | 10 +- app/pages/helpcontent/page-form.component.ts | 8 +- .../page-help-contents.component.html | 8 +- .../page-help-contents.component.ts | 52 ++++- app/pages/helpcontent/pages.component.html | 20 +- app/pages/helpcontent/pages.component.ts | 50 +++-- app/pages/modal-form.component.ts | 13 ++ app/services/help-content.service.ts | 54 ++++++ index.html | 3 +- styles.css | 20 +- 24 files changed, 882 insertions(+), 62 deletions(-) create mode 100644 app/pages/community/communities.component.html create mode 100644 app/pages/community/communities.component.ts create mode 100644 app/pages/community/community-form.component.html create mode 100644 app/pages/community/community-form.component.ts create mode 100644 app/pages/helpcontent/entities.component.html create mode 100644 app/pages/helpcontent/entities.component.ts 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

    - -
  • - - - Pages - -
  • diff --git a/app/app.module.ts b/app/app.module.ts index 159d6bd..5357349 100644 --- a/app/app.module.ts +++ b/app/app.module.ts @@ -27,7 +27,9 @@ import { NewPageHelpContentComponent } from "./pages/helpcontent/new-page-help-c import { CKEditorModule } from 'ng2-ckeditor'; import { PageContentFormComponent } from "./pages/helpcontent/page-help-content-form.component"; import { EditPageHelpContentComponent } from "./pages/helpcontent/edit-page-help-content.component"; -import { SelectEntitiesComponent } from "./pages/helpcontent/selectEntities.component"; +import { CommunitiesComponent } from './pages/community/communities.component'; +import { CommunityFormComponent } from './pages/community/community-form.component'; +import { EntitiesComponent } from "./pages/helpcontent/entities.component"; import { EntityFormComponent } from "./pages/helpcontent/entity-form.component"; @NgModule({ @@ -59,7 +61,9 @@ import { EntityFormComponent } from "./pages/helpcontent/entity-form.component"; NewPageHelpContentComponent, PageContentFormComponent, EditPageHelpContentComponent, - SelectEntitiesComponent, + CommunitiesComponent, + CommunityFormComponent, + EntitiesComponent, EntityFormComponent ], providers: [ diff --git a/app/app.routing.ts b/app/app.routing.ts index a33d204..8b2846c 100644 --- a/app/app.routing.ts +++ b/app/app.routing.ts @@ -7,7 +7,8 @@ import { Routes, RouterModule } from '@angular/router'; import { DashboardComponent } from "./dashboard.component"; import { TopicsComponent } from "./pages/faq/topics.components"; import { QuestionsComponent } from "./pages/faq/questions.component"; -import { SelectEntitiesComponent } from "./pages/helpcontent/selectEntities.component"; +import { CommunitiesComponent } from './pages/community/communities.component'; +import { EntitiesComponent } from "./pages/helpcontent/entities.component"; import { PagesComponent } from "./pages/helpcontent/pages.component"; import { PageHelpContentsComponent } from "./pages/helpcontent/page-help-contents.component"; import { NewPageHelpContentComponent } from "./pages/helpcontent/new-page-help-content.component"; @@ -32,8 +33,12 @@ const appRoutes: Routes = [ component: QuestionsComponent, }, { - path: 'selectEntities', - component: SelectEntitiesComponent, + path: 'communities', + component: CommunitiesComponent, + }, + { + path: 'entities', + component: EntitiesComponent, }, { path: 'pages', diff --git a/app/dashboard.component.html b/app/dashboard.component.html index 548a949..5ea9393 100644 --- a/app/dashboard.component.html +++ b/app/dashboard.component.html @@ -18,12 +18,12 @@

    Edit your community Info

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    -

    View details »

    +

    View details »

    Select searchable entities

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    -

    View details »

    +

    View details »

    Edit search page contents

    diff --git a/app/domain/community.ts b/app/domain/community.ts index 48d1ca0..0a20f15 100644 --- a/app/domain/community.ts +++ b/app/domain/community.ts @@ -1,13 +1,14 @@ import {Page} from './page'; +import {Entity} from './entity'; export interface Community { _id: string; name: string; - entities: string[]; - pages: Page[]; + entities: string[] | Entity[]; + pages: string[] | Page[]; } -// export interface CheckCommunity { -// community : Community; -// checked : boolean; -// } +export interface CheckCommunity { + community : Community; + checked : boolean; +} diff --git a/app/domain/page.ts b/app/domain/page.ts index 5d849a3..fb0564c 100644 --- a/app/domain/page.ts +++ b/app/domain/page.ts @@ -4,8 +4,9 @@ export interface Page { _id: string; route: string; name: string; + type: string; isEnabled :boolean; - entities: Entity[];// | string[]; + entities: Entity[] | string[]; } export interface CheckPage { diff --git a/app/pages/community/communities.component.html b/app/pages/community/communities.component.html new file mode 100644 index 0000000..e3214ac --- /dev/null +++ b/app/pages/community/communities.component.html @@ -0,0 +1,93 @@ +Communities
    +
    +
    +
    + +
    + +
    Communities
    +
    + + +
    + New Community +
    + +
    +
    +
    + + + + +
    +
    +
    +
    Bulk Actions + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + + +
    + + +
    +
    No communities found
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + Are you sure you want to delete the selected community(-ies)? + diff --git a/app/pages/community/communities.component.ts b/app/pages/community/communities.component.ts new file mode 100644 index 0000000..d8057ca --- /dev/null +++ b/app/pages/community/communities.component.ts @@ -0,0 +1,160 @@ +/** + * 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"; +import { DeleteConfirmationDialogComponent } from "../delete-confirmation-dialog.component"; +import { CommunityFormComponent } from "./community-form.component"; +import { CheckCommunity, Community } from "../../domain/community"; + +@Component({ + selector: 'communities', + templateUrl: './communities.component.html', +}) + +export class CommunitiesComponent implements OnInit { + + @ViewChild(ModalFormComponent) + @ViewChild('saveModal') + public modal:ModalFormComponent; + + @ViewChild('updateModal') + public updateModal:ModalFormComponent; + + @ViewChild('deleteConfirmationModal') + public deleteConfirmationModal : DeleteConfirmationDialogComponent; + + @ViewChild(CommunityFormComponent) + public formComponent : CommunityFormComponent; + + public communitiesCheckboxes : CheckCommunity[] = []; + + public communities : Community[] = []; + + public errorMessage: string; + + public formGroup : FormGroup; + + private searchText : RegExp = new RegExp(''); + + ngOnInit() { + this.formGroup = this.formComponent.form; + this.route.queryParams.subscribe(params => { + if(params['community']) { + this.getCommunity(params['community']); + } else { + this.getCommunities(); + } + }); + } + + constructor(private route: ActivatedRoute, private _helpContentService: HelpContentService) {} + + getCommunity(community_id: string) { + let self = this; + this._helpContentService.getCommunityFull(community_id).subscribe( + community => { + self.communities = [community]; + this.communitiesCheckboxes.push({community : community, checked : false}); + }, + error => this.handleError('System error retrieving communities', error)); + } + + getCommunities() { + let self = this; + this._helpContentService.getCommunitiesFull().subscribe( + communities => { + self.communities = communities; + + communities.forEach(_ => { + this.communitiesCheckboxes.push({community : _, checked : false}); + }); + }, + error => this.handleError('System error retrieving communities', error)); + } + + public showModal():void { + this.modal.showModal(); + } + + public toggleCheckBoxes(event) { + this.communitiesCheckboxes.forEach(_ => _.checked = event.target.checked); + } + + public applyCheck(flag : boolean) { + console.info("applyCheck "+flag); + this.communitiesCheckboxes.forEach(_ => _.checked = flag); + } + + public getSelectedCommunities() : string[] { + return this.communitiesCheckboxes.filter(community => community.checked == true).map(checkedCommunity => checkedCommunity.community).map(res => res._id); + } + + private deleteCommunitiesFromArray(ids : string[]) : void { + for(let id of ids) { + let i = this.communitiesCheckboxes.findIndex(_ => _.community._id == id); + this.communitiesCheckboxes.splice(i, 1); + } + } + + public confirmDeleteCommunity(id : string) { + this.deleteConfirmationModal.ids = [id]; + this.deleteConfirmationModal.showModal(); + } + + public confirmDeleteSelectedCommunities() { + this.deleteConfirmationModal.ids = this.getSelectedCommunities(); + this.deleteConfirmationModal.showModal(); + } + + public confirmedDeleteCommunities(ids : string[]) { + this._helpContentService.deleteCommunities(ids).subscribe( + _ => this.deleteCommunitiesFromArray(ids), + error => this.handleError('System error deleting the selected communities', error) + ); + } + + public editCommunity(i : number) { + let community : Community = this.communitiesCheckboxes[i].community; + this.formGroup.patchValue(community); + this.updateModal.showModal(); + } + + public communitySavedSuccessfully(community: Community) { + this.communitiesCheckboxes.push({community : community, checked : false}); + console.info("checkboxes length: "+this.communitiesCheckboxes.length); + this.applyCheck(false); + } + + public communityUpdatedSuccessfully(community : Community) { + this.communitiesCheckboxes.find(checkItem => checkItem.community._id==community._id).community = community; + this.applyCheck(false); + } + + public filterBySearch(text : string) { + this.searchText = new RegExp(text,'i'); + this.applyFilter(); + } + + public applyFilter() { + this.communitiesCheckboxes = []; + this.communities.filter(item => this.filterCommunities(item)).forEach( + _ => this.communitiesCheckboxes.push({community: _, checked: false}) + ); + } + + public filterCommunities(community : Community) : boolean { + let textFlag = this.searchText.toString() == '' || (/*community.route + ' ' +*/community.name).match(this.searchText) != null; + return textFlag; + } + + handleError(message: string, error) { + if(error == null) { + this.formComponent.reset(); + } + this.errorMessage = message + ' (Server responded: ' + error + ')'; + } +} diff --git a/app/pages/community/community-form.component.html b/app/pages/community/community-form.component.html new file mode 100644 index 0000000..13ea72b --- /dev/null +++ b/app/pages/community/community-form.component.html @@ -0,0 +1,7 @@ +
    +
    + + +
    + +
    diff --git a/app/pages/community/community-form.component.ts b/app/pages/community/community-form.component.ts new file mode 100644 index 0000000..7302210 --- /dev/null +++ b/app/pages/community/community-form.component.ts @@ -0,0 +1,41 @@ +import {Component, OnInit, Input} from '@angular/core'; +import {FormGroup, FormArray, FormBuilder, Validators} from "@angular/forms"; +import { HelpContentService } from "../../services/help-content.service"; + +@Component({ + selector: 'community-form', + templateUrl: './community-form.component.html', +}) + +export class CommunityFormComponent implements OnInit{ + + @Input('group') + myForm: FormGroup; + + public errorMessage: string; + + constructor(public _fb: FormBuilder, private _helpContentService: HelpContentService){} + + ngOnInit(): void {} + + public get form() { + return this._fb.group({ + _id : '', + name : ['', Validators.required] + }); + } + + public reset() { + this.myForm.patchValue({ + name : '', + _id : '' + }); + } + + handleError(message: string, error) { + if(error == null) { + this.reset(); + } + this.errorMessage = message + ' (Server responded: ' + error + ')'; + } +} diff --git a/app/pages/helpcontent/edit-page-help-content.component.ts b/app/pages/helpcontent/edit-page-help-content.component.ts index 0df3487..bc18f6c 100644 --- a/app/pages/helpcontent/edit-page-help-content.component.ts +++ b/app/pages/helpcontent/edit-page-help-content.component.ts @@ -20,6 +20,8 @@ export class EditPageHelpContentComponent implements OnInit, OnDestroy{ private communityId: string; + private pageId: string; + private sub: Subscription; private pageHelpContent: PageHelpContent; @@ -37,6 +39,7 @@ export class EditPageHelpContentComponent implements OnInit, OnDestroy{ //let id = params['id']; let pageContentId = params['pageContentId']; this.communityId = params['communityId']; + this.pageId = params['pageId']; this._helpContentService.getPageHelpContent(pageContentId as string).subscribe( pageHelpContent => this.updateForm(pageHelpContent), error => this.handleError('System error retrieving page help content', error)); @@ -57,11 +60,16 @@ export class EditPageHelpContentComponent implements OnInit, OnDestroy{ } private saveCustom() { - if(this.formComponent.myForm.valid) { let pageHelpContent : PageHelpContent = this.formComponent.myForm.value; this._helpContentService.savePageHelpContent(pageHelpContent).subscribe( - _ => this.router.navigate(['/pageContents']), + _ => { + if(this.pageId) { + this.router.navigate( ['/pageContents/'], { queryParams: { "community": this.communityId, "page": this.pageId } } ); + } else { + this.router.navigate(['/pageContents']); + } + }, err => this.handleError('System error updating page content', err) ); } else { diff --git a/app/pages/helpcontent/entities.component.html b/app/pages/helpcontent/entities.component.html new file mode 100644 index 0000000..575da5e --- /dev/null +++ b/app/pages/helpcontent/entities.component.html @@ -0,0 +1,112 @@ +
    +
    +
    +
    + +
    + +
    Entities
    +
    + + +
    + New Entity +
    + +
    +
    +
    + + + + +
    +
    +
    +
    Bulk Actions + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    Filter by community:
    + +
    +
    + +
    +
    +
    + + + +
    + + +
    +
    No entities found
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + Are you sure you want to delete the selected entity(-ies)? + diff --git a/app/pages/helpcontent/entities.component.ts b/app/pages/helpcontent/entities.component.ts new file mode 100644 index 0000000..ece2fd3 --- /dev/null +++ b/app/pages/helpcontent/entities.component.ts @@ -0,0 +1,180 @@ +import { Component, ViewChild, OnInit } from '@angular/core'; +import { HelpContentService } from "../../services/help-content.service"; +import { FormGroup } from "@angular/forms"; +import { ModalFormComponent } from "../modal-form.component"; +import { DeleteConfirmationDialogComponent } from "../delete-confirmation-dialog.component"; +import { EntityFormComponent } from "./entity-form.component"; +import { CheckEntity, Entity } from "../../domain/entity"; +import { Community } from "../../domain/community"; + +@Component({ + selector: 'entities', + templateUrl: './entities.component.html', +}) + +export class EntitiesComponent implements OnInit { + + // @ViewChild(ModalFormComponent) + @ViewChild('saveModal') + public modal:ModalFormComponent; + + @ViewChild('updateModal') + public updateModal:ModalFormComponent; + + @ViewChild('deleteConfirmationModal') + public deleteConfirmationModal : DeleteConfirmationDialogComponent; + + @ViewChild(EntityFormComponent) + public formComponent : EntityFormComponent; + + public entitiesCheckboxes : CheckEntity[] = []; + + public entities : Entity[] = []; + + public errorMessage: string; + + public formGroup : FormGroup; + + private searchText : RegExp = new RegExp(''); + + public communities: Community[] = []; + + public selectedCommunityId: string; + + ngOnInit() { + this.getCommunities(); + + this.formGroup = this.formComponent.form; + } + + constructor(private _helpContentService: HelpContentService) {} + + getCommunities() { + let self = this; + this._helpContentService.getCommunities().subscribe( + communities => { + self.communities = communities; + self.getEntities(self.communities[0]._id); + self.selectedCommunityId = self.communities[0]._id; + }, + error => this.handleError('System error retrieving communities', error)); + } + + getEntities(community_id: string) { + let self = this; + this._helpContentService.getCommunityEntities(community_id).subscribe( + entities => { + self.entities = entities; + self.entitiesCheckboxes = []; + + entities.forEach(_ => { + self.entitiesCheckboxes.push({entity : _, checked : false}); + }); + }, + error => this.handleError('System error retrieving entities', error)); + } + + public showModal():void { + this.modal.showModal(); + } + + public toggleCheckBoxes(event) { + this.entitiesCheckboxes.forEach(_ => _.checked = event.target.checked); + } + + public applyCheck(flag : boolean) { + console.info("applyCheck "+flag); + this.entitiesCheckboxes.forEach(_ => _.checked = flag); + } + + public getSelectedEntities() : string[] { + return this.entitiesCheckboxes.filter(entity => entity.checked == true).map(checkedEntity => checkedEntity.entity).map(res => res._id); + } + + private deleteEntitiesFromArray(ids : string[]) : void { + for(let id of ids) { + let i = this.entitiesCheckboxes.findIndex(_ => _.entity._id == id); + this.entitiesCheckboxes.splice(i, 1); + } + } + + public confirmDeleteEntity(id : string) { + this.deleteConfirmationModal.ids = [id]; + this.deleteConfirmationModal.showModal(); + } + + public confirmDeleteSelectedEntities() { + this.deleteConfirmationModal.ids = this.getSelectedEntities(); + this.deleteConfirmationModal.showModal(); + } + + public confirmedDeleteEntities(ids : string[]) { + this._helpContentService.deleteEntities(ids).subscribe( + _ => this.deleteEntitiesFromArray(ids), + error => this.handleError('System error deleting the selected entities', error) + ); + } + + public editEntity(i : number) { + let entity : Entity = this.entitiesCheckboxes[i].entity; + this.formGroup.patchValue(entity); + this.updateModal.showModal(); + } + + public entitySavedSuccessfully(entity: Entity) { + this.entitiesCheckboxes.push({entity : entity, checked : false}); + this.applyCheck(false); + } + + public entityUpdatedSuccessfully(entity : Entity) { + this.entitiesCheckboxes.find(checkItem => checkItem.entity._id==entity._id).entity = entity; + this.applyCheck(false); + } + + public filterBySearch(text : string) { + this.searchText = new RegExp(text,'i'); + this.applyFilter(); + } + + public applyFilter() { + this.entitiesCheckboxes = []; + this.entities.filter(item => this.filterEntities(item)).forEach( + _ => this.entitiesCheckboxes.push({entity: _, checked: false}) + ); + } + + public filterEntities(entity : Entity) : boolean { + let textFlag = this.searchText.toString() == '' || (entity.name).match(this.searchText) != null; + return textFlag; + } + + handleError(message: string, error) { + if(error == null) { + this.formComponent.reset(); + } + this.errorMessage = message + ' (Server responded: ' + error + ')'; + } + + + + public filterByCommunity(event: any) { + this.selectedCommunityId = event.target.value; + this.applyCommunityFilter(this.selectedCommunityId); + } + + public applyCommunityFilter(community_id: string) { + this.getEntities(community_id); + } + + public toggleEntity(status : boolean, id : string) { + this._helpContentService.toggleEntity(this.selectedCommunityId,id,status).subscribe( + () => { + let i = this.entitiesCheckboxes.findIndex(_ => _.entity._id == id); + this.entitiesCheckboxes[i].entity.isEnabled=status; + this.applyCheck(false); + }, + error => this.handleError('System error changing the status of the selected entity(-ies)', error) + ); + } + + } diff --git a/app/pages/helpcontent/new-page-help-content.component.ts b/app/pages/helpcontent/new-page-help-content.component.ts index 508b2ef..a3e9878 100644 --- a/app/pages/helpcontent/new-page-help-content.component.ts +++ b/app/pages/helpcontent/new-page-help-content.component.ts @@ -21,6 +21,8 @@ export class NewPageHelpContentComponent { private communityId: string; + private pageId: string; + constructor( private route: ActivatedRoute, private router: Router, @@ -29,6 +31,7 @@ export class NewPageHelpContentComponent { ngOnInit() { this.route.queryParams.subscribe(params => { this.communityId = params['communityId']; + this.pageId = params['pageId']; }); } @@ -39,7 +42,13 @@ export class NewPageHelpContentComponent { if(this.formComponent.myForm.valid) { let pageHelpContent : PageHelpContent = this.formComponent.myForm.value; this._helpContentService.savePageHelpContent(pageHelpContent).subscribe( - _ => this.router.navigate(['/pageContents']), + _ => { + if(this.pageId) { + this.router.navigate( ['/pageContents/'], { queryParams: { "community": this.communityId, "page": this.pageId } } ); + } else { + this.router.navigate(['/pageContents']); + } + }, err => this.handleError('System error saving page content', err) ); } else { diff --git a/app/pages/helpcontent/page-form.component.html b/app/pages/helpcontent/page-form.component.html index 4981533..6435757 100644 --- a/app/pages/helpcontent/page-form.component.html +++ b/app/pages/helpcontent/page-form.component.html @@ -1,5 +1,5 @@
    -
    +
    @@ -7,6 +7,14 @@
    +
    + + +
    diff --git a/app/pages/helpcontent/page-form.component.ts b/app/pages/helpcontent/page-form.component.ts index dfec562..a50cfc5 100644 --- a/app/pages/helpcontent/page-form.component.ts +++ b/app/pages/helpcontent/page-form.component.ts @@ -19,6 +19,8 @@ export class PageFormComponent implements OnInit{ myForm: FormGroup; @Input('selectedCommunityId') public selectedCommunityId: string; + @Input('type') + public type: string; public errorMessage: string; @@ -80,7 +82,8 @@ export class PageFormComponent implements OnInit{ return this._fb.group({ route : ['', Validators.required], name : ['', Validators.required], - //isEnabled: ['', Validators.required], + isEnabled: '', + type: ['', Validators.required], entities: this._fb.array([]), _id : '', isCollapsed: [true] @@ -91,7 +94,8 @@ export class PageFormComponent implements OnInit{ this.myForm.patchValue({ route : '', name : '', - //isEnabled: '', + type: '', + isEnabled: '', //entities: this._fb.array([]), _id : '', isCollapsed: [true] diff --git a/app/pages/helpcontent/page-help-contents.component.html b/app/pages/helpcontent/page-help-contents.component.html index e785451..a870137 100644 --- a/app/pages/helpcontent/page-help-contents.component.html +++ b/app/pages/helpcontent/page-help-contents.component.html @@ -12,7 +12,8 @@
    - New Page Content + New Page Content + New Page Content
    @@ -29,7 +30,7 @@
--> -
+
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; }