[Library | Trunk]
Dashboard - Admin tool pages: - add tabs components - add rout module (without guards) - put tabs and page-content in pages, classes, entities pages Stakeholder: initial try to add filters for country and organization fields (doesn't work properly) git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60202 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki
parent
509018d72c
commit
10778b3c85
|
|
@ -0,0 +1,13 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {DivIdsComponent} from "./divIds.component";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: DivIdsComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class ClassesRoutingModule { }
|
||||
|
|
@ -1,39 +1,9 @@
|
|||
<div id="page_content">
|
||||
<div class="uk-padding-small md-bg-white" uk-grid>
|
||||
|
||||
<div class="uk-width-expand@m uk-width-1-1 uk-flex uk-flex-middle uk-flex-right">
|
||||
<div class="uk-inline uk-width-medium">
|
||||
<span class="uk-position-center-right"><i class="material-icons">search</i></span>
|
||||
<div dashboard-input [formInput]="filterForm" label="Find class"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="page_content_inner">
|
||||
<div class="menubar ">
|
||||
<h4 class="uk-text-bold">Predefined classes for contents</h4>
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="content-wrapper" id="contentWrapper">
|
||||
<div>
|
||||
<div class="contentPanel">
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger uk-margin-large-top"
|
||||
role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'"
|
||||
class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img
|
||||
class="uk-align-center loading-gif"></div>
|
||||
|
||||
<div *ngIf="!errorMessage && !showLoading" class="page-controls">
|
||||
<div class=" filters ">
|
||||
<div page-content>
|
||||
<admin-tabs tab = "class" header></admin-tabs>
|
||||
<div inner class="admin-pages">
|
||||
<div *ngIf="!errorMessage && !showLoading" class="filters" uk-sticky="offset:150">
|
||||
<div class="show-options uk-float-right">
|
||||
<button class="uk-button" type="button">Bulk Actions</button>
|
||||
<button class="uk-button uk-button-primary " type="button">Bulk Actions</button>
|
||||
<div uk-dropdown="mode: click">
|
||||
<ul class="uk-nav uk-margin-left"
|
||||
[attr.uk-tooltip]="getSelectedDivIds().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
|
||||
|
|
@ -43,20 +13,54 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-inline uk-width-medium uk-float-right uk-margin-right" >
|
||||
<span class="uk-position-center-right"><i class="material-icons">search</i></span>
|
||||
<div dashboard-input [formInput]="filterForm.controls.keyword"
|
||||
placeholder="Search"></div>
|
||||
</div>
|
||||
<ul class="uk-subnav uk-subnav-pill subCategoriesTabs ignore admin " >
|
||||
<li [class.uk-active]="filterForm.get('type').value === 'all'" class="uk-margin-small-bottom"><a
|
||||
(click)="filterForm.get('type').setValue('all')"><span
|
||||
class="title">All portals</span></a></li>
|
||||
<li *ngFor="let type of portalUtils.portalTypes; let i=index"
|
||||
[class.uk-active]="filterForm.get('type').value === type.value" class="uk-margin-small-bottom"><a
|
||||
(click)="filterForm.get('type').setValue(type.value)"><span
|
||||
class="title">{{type.label}}</span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="content-wrapper" id="contentWrapper">
|
||||
<a *ngIf="!showLoading && !errorMessage" (click)="newDivId()"
|
||||
class="uk-flex uk-flex-right uk-flex-middle uk-margin-small-bottom uk-width-1-1">
|
||||
<div class="uk-button-default large uk-icon-button uk-margin-small-right" uk-icon="plus">
|
||||
</div>
|
||||
Add class
|
||||
</a>
|
||||
<div>
|
||||
<div class="contentPanel">
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger uk-margin-large-top"
|
||||
role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'"
|
||||
class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img
|
||||
class="uk-align-center loading-gif"></div>
|
||||
|
||||
<div class="md-card uk-margin-medium-bottom" *ngIf="!errorMessage && !showLoading">
|
||||
<div class="md-card-content">
|
||||
<div class="uk-overflow-container">
|
||||
|
||||
<table class="uk-table uk-table-striped">
|
||||
<thead>
|
||||
<table class="uk-table uk-table-striped uk-table-large">
|
||||
<thead class="form-header">
|
||||
<tr>
|
||||
<th><input id="allDivIdCheckbox" type="checkbox" (change)="toggleCheckBoxes($event)"></th>
|
||||
<th
|
||||
class="uk-width-small"><input id="allDivIdCheckbox" type="checkbox" (change)="toggleCheckBoxes($event)"></th>
|
||||
<th>Name</th>
|
||||
<th *ngIf="!selectedCommunityPid">Portal Type</th>
|
||||
<th>Page</th>
|
||||
<th *ngIf="selectedCommunityPid">Portal Type</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -104,8 +108,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<modal-alert #AlertModalSaveDivId (alertOutput)="divIdSaveConfirmed($event)"
|
||||
[okDisabled]="myForm && (myForm.invalid || !myForm.dirty)">
|
||||
|
|
@ -124,7 +126,7 @@
|
|||
[removable]="true">
|
||||
{{page.name}}
|
||||
<span (click)="remove(page)"
|
||||
class="mat-icon notranslate mat-chip-remove mat-chip-trailing-icon material-icons mat-icon-no-color ng-star-inserted">cancel</span>
|
||||
class=" notranslate mat-chip-remove mat-chip-trailing-icon " uk-icon="trash"></span>
|
||||
</mat-chip>
|
||||
<input placeholder="Add in pages..." #PageInput
|
||||
[formControl]="pageSearchCtrl" [matAutocomplete]="auto" [matChipInputFor]="chipList">
|
||||
|
|
@ -137,45 +139,16 @@
|
|||
</mat-form-field>
|
||||
|
||||
<div [ngClass]="{'has-error':!myForm.controls.portalType.valid && myForm.controls.portalType.dirty}" class="form-group" uk-grid>
|
||||
<label class="uk-width-1-1 uk-margin-small-bottom">
|
||||
<div class="uk-width-1-1 uk-margin-small-bottom uk-text-bold uk-form-label">
|
||||
Class exists in:
|
||||
</label>
|
||||
<label class="uk-width-1-1 radio uk-margin-large-left">
|
||||
<span class="uk-margin-small-right" style="font-weight: normal;">OpenAIRE portal</span>
|
||||
<input type="radio" value="explore" formControlName="portalType">
|
||||
</label>
|
||||
<label class="uk-width-1-1 radio uk-margin-large-left">
|
||||
<span class="uk-margin-small-right" style="font-weight: normal;">OpenAIRE Connect portal</span>
|
||||
<input type="radio" value="connect" formControlName="portalType">
|
||||
</label>
|
||||
<label class="uk-width-1-1 radio uk-margin-large-left">
|
||||
<span class="uk-margin-small-right" style="font-weight: normal;">Communities' Gateway</span>
|
||||
<input type="radio" value="community" formControlName="portalType">
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- <div class="form-group uk-margin-small-left">-->
|
||||
<!-- <div class="uk-text-muted"> Select if this class exists in:</div>-->
|
||||
<!-- <span dashboard-input class="" [formInput]="myForm.get('openaire')"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- label="Explore Portal">-->
|
||||
<!-- </span>-->
|
||||
<!-- <span dashboard-input class="uk-margin-small-left" [formInput]="myForm.get('connect')"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- label="Connect Portal">-->
|
||||
<!-- </span>-->
|
||||
<!-- <span dashboard-input class="uk-margin-small-left" [formInput]="myForm.get('communities')"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- label="Communities Dashboards">-->
|
||||
<!-- </span>-->
|
||||
<!--<!– <mat-checkbox [formControl]="myForm.get('openaire')" >Explore Portal</mat-checkbox>–>-->
|
||||
<!--<!– <input type="checkbox" id="openaire" formControlName="openaire"/> Explore Portal–>-->
|
||||
<!--<!– <input type="checkbox" [formControl]="myForm.get('connect')" formControlName="connect"/> Connect Portal–>-->
|
||||
<!--<!– <input type="checkbox" [formControl]="myForm.controls.communities"–>-->
|
||||
<!--<!– formControlName="communities"/>Communities Dashboards–>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<div class="uk-child-width-1-2 uk-grid">
|
||||
<span *ngFor="let option of portalUtils.portalTypes" class="radio ">
|
||||
<span class="uk-margin-small-right" style="font-weight: normal;">{{option.label}}</span>
|
||||
<input type="radio" [value]="option.value" formControlName="portalType">
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="hidden" formControlName="_id">
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
|||
import {Observable, Subscriber} from "rxjs";
|
||||
import {map, startWith} from "rxjs/operators";
|
||||
import {MatAutocompleteSelectedEvent, MatChipInputEvent} from "@angular/material";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
import {PortalUtils} from "../portal/portalHelper";
|
||||
import {CheckPortal, Portal} from "../../utils/entities/adminTool/portal";
|
||||
|
||||
@Component({
|
||||
selector: 'divIds',
|
||||
|
|
@ -39,20 +42,25 @@ export class DivIdsComponent implements OnInit {
|
|||
public errorMessage: string = '';
|
||||
public updateErrorMessage: string = '';
|
||||
public modalErrorMessage: string = '';
|
||||
public filterForm: FormControl;
|
||||
public filterForm: FormGroup;
|
||||
private subscriptions: any[] = [];
|
||||
public allPages: Page[] = [];
|
||||
filteredPages: Observable<Page[]>;
|
||||
@ViewChild('PageInput') pageInput: ElementRef<HTMLInputElement>;
|
||||
selectedPages: Page[] = [];
|
||||
selectedCommunityPid = null;
|
||||
|
||||
public portalUtils:PortalUtils = new PortalUtils();
|
||||
ngOnInit() {
|
||||
this.filterForm = this._fb.control('');
|
||||
this.pageSearchCtrl = this._fb.control('');
|
||||
this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => {
|
||||
this.filterForm = this._fb.group({
|
||||
keyword: [''],
|
||||
type: ['all', Validators.required]});
|
||||
this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
|
||||
this.filterBySearch(value);
|
||||
}));
|
||||
this.subscriptions.push(this.filterForm.get('type').valueChanges.subscribe(value => {
|
||||
this.applyTypeFilter();
|
||||
}));
|
||||
this.pageSearchCtrl = this._fb.control('');
|
||||
this.pagesCtrl = this._fb.array([]);
|
||||
this.myForm = this._fb.group({
|
||||
_id: '',
|
||||
|
|
@ -60,19 +68,14 @@ export class DivIdsComponent implements OnInit {
|
|||
pages: this.pagesCtrl,
|
||||
portalType: ['', Validators.required]
|
||||
});
|
||||
|
||||
this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
HelperFunctions.scroll();
|
||||
|
||||
this.properties = data.envSpecific;
|
||||
|
||||
this.properties = properties;
|
||||
this.getDivIds();
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
HelperFunctions.scroll();
|
||||
this.selectedCommunityPid = params['communityId'];
|
||||
this.getPages();
|
||||
});
|
||||
});
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router, private _helpContentService: HelpContentService, private _fb: FormBuilder) {
|
||||
|
|
@ -101,7 +104,7 @@ export class DivIdsComponent implements OnInit {
|
|||
this.updateErrorMessage = "";
|
||||
this.errorMessage = "";
|
||||
|
||||
this._helpContentService.getAllDivIdsFull( this.properties.adminToolsAPIURL).subscribe(
|
||||
this.subscriptions.push(this._helpContentService.getAllDivIdsFull( this.properties.adminToolsAPIURL).subscribe(
|
||||
divIds => {
|
||||
this.divIds = divIds;
|
||||
this.checkboxes = [];
|
||||
|
|
@ -113,7 +116,7 @@ export class DivIdsComponent implements OnInit {
|
|||
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => this.handleError('System error retrieving classes', error));
|
||||
error => this.handleError('System error retrieving classes', error)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -179,13 +182,13 @@ export class DivIdsComponent implements OnInit {
|
|||
} else {
|
||||
this.showLoading = true;
|
||||
this.updateErrorMessage = "";
|
||||
this._helpContentService.deleteDivIds(this.selectedDivIds, this.properties.adminToolsAPIURL).subscribe(
|
||||
this.subscriptions.push(this._helpContentService.deleteDivIds(this.selectedDivIds, this.properties.adminToolsAPIURL).subscribe(
|
||||
_ => {
|
||||
this.deleteDivIdsFromArray(this.selectedDivIds);
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => this.handleUpdateError('System error deleting the selected classes', error)
|
||||
);
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -260,19 +263,19 @@ export class DivIdsComponent implements OnInit {
|
|||
|
||||
this.modalErrorMessage = "";
|
||||
|
||||
this._helpContentService.saveDivId(<DivId>this.myForm.value, this.properties.adminToolsAPIURL).subscribe(
|
||||
this.subscriptions.push(this._helpContentService.saveDivId(<DivId>this.myForm.value, this.properties.adminToolsAPIURL).subscribe(
|
||||
divId => {
|
||||
this.divIdSavedSuccessfully(divId);
|
||||
},
|
||||
error => this.handleUpdateError("System error creating class", error)
|
||||
);
|
||||
));
|
||||
} else {
|
||||
this._helpContentService.updateDivId(<DivId>this.myForm.value, this.properties.adminToolsAPIURL).subscribe(
|
||||
this.subscriptions.push(this._helpContentService.updateDivId(<DivId>this.myForm.value, this.properties.adminToolsAPIURL).subscribe(
|
||||
divId => {
|
||||
this.divIdUpdatedSuccessfully(divId);
|
||||
},
|
||||
error => this.handleUpdateError("System error updating class", error)
|
||||
);
|
||||
));
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -299,7 +302,17 @@ export class DivIdsComponent implements OnInit {
|
|||
_ => this.checkboxes.push(<CheckDivId>{divId: _, checked: false})
|
||||
);
|
||||
}
|
||||
public applyTypeFilter() {
|
||||
this.checkboxes = [];
|
||||
this.divIds.filter(item => this.filterByType(item)).forEach(
|
||||
_ => this.checkboxes.push(<CheckDivId>{divId: _, checked: false})
|
||||
);
|
||||
}
|
||||
|
||||
public filterByType(divId: DivId): boolean {
|
||||
let type = this.filterForm.get("type").value;
|
||||
return type == "all" || (type == divId.portalType);
|
||||
}
|
||||
public filterDivIds(divId: DivId): boolean {
|
||||
let textFlag = this.searchText.toString() == '' || (divId.name + ' ' + divId.portalType).match(this.searchText) != null;
|
||||
return textFlag;
|
||||
|
|
@ -326,13 +339,13 @@ export class DivIdsComponent implements OnInit {
|
|||
getPages() {
|
||||
this.showLoading = true;
|
||||
this.errorMessage = "";
|
||||
this._helpContentService.getAllPages(this.properties.adminToolsAPIURL).subscribe(
|
||||
this.subscriptions.push(this._helpContentService.getAllPages(this.properties.adminToolsAPIURL).subscribe(
|
||||
pages => {
|
||||
this.allPages = pages;
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => this.handleError('System error retrieving pages', error)
|
||||
);
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,12 +13,15 @@ import {MatCheckboxModule, MatFormFieldModule} from "@angular/material";
|
|||
|
||||
|
||||
import {MatChipsModule} from '@angular/material/chips';
|
||||
import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
|
||||
import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
|
||||
import {ClassesRoutingModule} from "./classes-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule, FormsModule,
|
||||
AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
|
||||
MatCheckboxModule
|
||||
MatCheckboxModule, AdminTabsModule, PageContentModule, ClassesRoutingModule
|
||||
],
|
||||
declarations: [DivIdsComponent],
|
||||
exports: [DivIdsComponent]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {DivHelpContentsComponent} from "./div-help-contents.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: DivHelpContentsComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class DivHelpContentsRoutingModule { }
|
||||
|
|
@ -142,7 +142,7 @@
|
|||
</div>
|
||||
|
||||
<a *ngIf="selectedPageId && page" [queryParams]="{type: page.type, communityId: selectedCommunityPid}"
|
||||
routerLink="/pages">Go back to {{page.type}} pages</a>
|
||||
routerLink="../../pages">Go back to {{page.type}} pages</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import {Session} from '../../login/utils/helper.class';
|
|||
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
|
||||
import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'div-help-contents',
|
||||
|
|
@ -74,11 +75,9 @@ export class DivHelpContentsComponent implements OnInit {
|
|||
this.filterByPage(value);
|
||||
}));
|
||||
|
||||
this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
this.properties = properties;
|
||||
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
HelperFunctions.scroll();
|
||||
|
||||
this.selectedCommunityPid = params['communityId'];
|
||||
|
|
@ -90,8 +89,8 @@ export class DivHelpContentsComponent implements OnInit {
|
|||
this.selectedPageId = "";
|
||||
this.getPages(this.selectedCommunityPid);
|
||||
}
|
||||
});
|
||||
});
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
constructor(private element: ElementRef, private route: ActivatedRoute, private _helpService: HelpContentService, private router: Router, private _fb: FormBuilder) {
|
||||
|
|
@ -123,7 +122,7 @@ export class DivHelpContentsComponent implements OnInit {
|
|||
this._helpService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
|
||||
page => {
|
||||
if (this.properties.adminToolsPortalType != page.portalType) {
|
||||
this.router.navigate(['/classContents'], {queryParams: {"communityId": this.selectedCommunityPid}});
|
||||
this.router.navigate(['../../classContents'], {queryParams: {"communityId": this.selectedCommunityPid}});
|
||||
} else {
|
||||
this.page = page;
|
||||
this.getDivHelpContents(this.selectedCommunityPid);
|
||||
|
|
@ -292,7 +291,7 @@ export class DivHelpContentsComponent implements OnInit {
|
|||
public editDivHelpContent(id: string) {
|
||||
//this.router.navigate(['/pageContents/edit/', _id]);
|
||||
if (this.selectedPageId) {
|
||||
this.router.navigate(['/classContents/edit/'], {
|
||||
this.router.navigate(['../../classContents/edit/'], {
|
||||
queryParams: {
|
||||
"classContentId": id,
|
||||
"communityId": this.selectedCommunityPid,
|
||||
|
|
@ -300,7 +299,7 @@ export class DivHelpContentsComponent implements OnInit {
|
|||
}
|
||||
});
|
||||
} else {
|
||||
this.router.navigate(['/classContents/edit/'], {
|
||||
this.router.navigate(['../../classContents/edit/'], {
|
||||
queryParams: {
|
||||
"classContentId": id,
|
||||
"communityId": this.selectedCommunityPid
|
||||
|
|
@ -422,15 +421,16 @@ export class DivHelpContentsComponent implements OnInit {
|
|||
}
|
||||
|
||||
public newClassContent() {
|
||||
console.log("AAA")
|
||||
if (this.selectedPageId) {
|
||||
this.router.navigate(['/classContents/new'], {
|
||||
this.router.navigate(['../../classContents/new'], {
|
||||
queryParams: {
|
||||
communityId: this.selectedCommunityPid,
|
||||
pageId: this.selectedPageId
|
||||
}
|
||||
}, relativeTo: this.route
|
||||
});
|
||||
} else {
|
||||
this.router.navigate(['/classContents/new'], {queryParams: {communityId: this.selectedCommunityPid}});
|
||||
this.router.navigate(['../../classContents/new'], {queryParams: {communityId: this.selectedCommunityPid}, relativeTo: this.route});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@ import {DivHelpContentsComponent} from './div-help-contents.component';
|
|||
import {MatSlideToggleModule} from '@angular/material';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {InputModule} from "../../sharedComponents/input/input.module";
|
||||
import {DivHelpContentsRoutingModule} from "./div-help-contents-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule, FormsModule, SafeHtmlPipeModule,
|
||||
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule
|
||||
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule, DivHelpContentsRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
DivHelpContentsComponent
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {EditDivHelpContentComponent} from "./edit-div-help-content.component";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: EditDivHelpContentComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class EditDivHelpContentRoutingModule { }
|
||||
|
|
@ -54,7 +54,7 @@ export class EditDivHelpContentComponent implements OnInit, OnDestroy{
|
|||
this.pageId = params['pageId'];
|
||||
|
||||
if(!divContentId) {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid} });
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid} });
|
||||
}
|
||||
|
||||
this.getDivHelpContent(divContentId);
|
||||
|
|
@ -81,7 +81,7 @@ export class EditDivHelpContentComponent implements OnInit, OnDestroy{
|
|||
this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
|
||||
page => {
|
||||
if(this.properties.adminToolsPortalType != page.portalType) {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid} });
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid} });
|
||||
} else {
|
||||
this.page = page;
|
||||
this.showLoading = false;
|
||||
|
|
@ -153,9 +153,9 @@ export class EditDivHelpContentComponent implements OnInit, OnDestroy{
|
|||
this._helpContentService.insertOrUpdateDivHelpContent(divHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
|
||||
_ => {
|
||||
if(this.pageId) {
|
||||
this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } );
|
||||
this.router.navigate( ['../../'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } );
|
||||
} else {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid } } );
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid } } );
|
||||
}
|
||||
this.showLoading = false;
|
||||
},
|
||||
|
|
@ -172,9 +172,9 @@ export class EditDivHelpContentComponent implements OnInit, OnDestroy{
|
|||
this.updateErrorMessage = "";
|
||||
|
||||
if(this.pageId) {
|
||||
this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } );
|
||||
this.router.navigate( ['../../'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } );
|
||||
} else {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid } } );
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid } } );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,12 @@ import {CommonModule} from '@angular/common';
|
|||
import {EditDivHelpContentComponent} from './edit-div-help-content.component';
|
||||
import {DivHelpContentFormModule} from './div-help-content-form.module';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {EditDivHelpContentRoutingModule} from "./edit-div-help-content-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule,
|
||||
DivHelpContentFormModule, AdminToolServiceModule
|
||||
DivHelpContentFormModule, AdminToolServiceModule, EditDivHelpContentRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
EditDivHelpContentComponent
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {NewDivHelpContentComponent} from "./new-div-help-content.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: NewDivHelpContentComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class NewDivHelpContentRoutingModule { }
|
||||
|
|
@ -63,7 +63,7 @@ export class NewDivHelpContentComponent {
|
|||
this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
|
||||
page => {
|
||||
if(this.properties.adminToolsPortalType != page.portalType) {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid} });
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid}, relativeTo: this.route });
|
||||
} else {
|
||||
this.page = page;
|
||||
this.showLoading = false;
|
||||
|
|
@ -87,9 +87,9 @@ export class NewDivHelpContentComponent {
|
|||
this._helpContentService.insertOrUpdateDivHelpContent(divHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
|
||||
_ => {
|
||||
if(this.pageId) {
|
||||
this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } );
|
||||
this.router.navigate( ['../../'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } , relativeTo: this.route} );
|
||||
} else {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid } } );
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid } , relativeTo: this.route} );
|
||||
}
|
||||
this.showLoading = false;
|
||||
},
|
||||
|
|
@ -103,9 +103,9 @@ export class NewDivHelpContentComponent {
|
|||
|
||||
public cancelCustom() {
|
||||
if(this.pageId) {
|
||||
this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } );
|
||||
this.router.navigate( ['../../'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId }, relativeTo: this.route } );
|
||||
} else {
|
||||
this.router.navigate(['/classContents'], { queryParams: { "communityId": this.communityPid } } );
|
||||
this.router.navigate(['../../'], { queryParams: { "communityId": this.communityPid }, relativeTo: this.route } );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,12 @@ import {CommonModule} from '@angular/common';
|
|||
import {NewDivHelpContentComponent} from './new-div-help-content.component';
|
||||
import {DivHelpContentFormModule} from './div-help-content-form.module';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {NewDivHelpContentRoutingModule} from "./new-div-help-content-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule,
|
||||
DivHelpContentFormModule, AdminToolServiceModule
|
||||
DivHelpContentFormModule, AdminToolServiceModule, NewDivHelpContentRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
NewDivHelpContentComponent
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {EntitiesComponent} from "./entities.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '',component: EntitiesComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class EntitiesRoutingModule { }
|
||||
|
|
@ -1,20 +1,7 @@
|
|||
<div id="page_content" click-outside-or-esc targetId="page_content">
|
||||
<!-- [escClose]="false"-->
|
||||
<!-- (clickOutside)="toggleOpen($event)">-->
|
||||
<div class="uk-padding-small md-bg-white" uk-grid>
|
||||
|
||||
<div class="uk-width-expand@m uk-width-1-1 uk-flex uk-flex-middle uk-flex-right">
|
||||
<div class="uk-inline uk-width-medium">
|
||||
<span class="uk-position-center-right"><i class="material-icons">search</i></span>
|
||||
<div dashboard-input label="Locate indicator" [formInput]="filterForm" label="Locate entity"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div id="page_content_inner">
|
||||
<div class="menubar ">
|
||||
<div *ngIf="!errorMessage && !showLoading" class="page-controls">
|
||||
<div class=" filters ">
|
||||
<div page-content>
|
||||
<admin-tabs tab = "entity" [portal]="selectedCommunityPid" header></admin-tabs>
|
||||
<div inner class="admin-pages">
|
||||
<div *ngIf="!errorMessage && !showLoading" class="filters" uk-sticky="offset:150">
|
||||
<div class="show-options uk-float-right">
|
||||
<button class="uk-button uk-button-primary " type="button">Bulk Actions</button>
|
||||
<div uk-dropdown="mode: click">
|
||||
|
|
@ -32,19 +19,27 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-float-right uk-margin-right uk-width-medium">
|
||||
<div dashboard-input [formInput]="filterForm.controls.keyword" placeholder="search entity"></div>
|
||||
</div>
|
||||
</div>
|
||||
<h4 class="uk-text-bold">Entities</h4>
|
||||
<ul *ngIf="!isPortalAdministrator" class="uk-subnav uk-subnav-pill subCategoriesTabs ignore admin " >
|
||||
<li [class.uk-active]="filterForm.get('status').value === 'all'"><a
|
||||
(click)="filterForm.get('status').setValue('all')"><span
|
||||
class="title">All entities</span></a></li>
|
||||
<li [class.uk-active]="filterForm.get('status').value === 'enabled'"><a (click)="filterForm.get('status').setValue('enabled')"><span class="title">Enabled</span></a></li>
|
||||
<li [class.uk-active]="filterForm.get('status').value === 'disabled'"><a (click)="filterForm.get('status').setValue('disabled')"><span class="title">Disabled</span></a></li>
|
||||
</ul>
|
||||
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content-wrapper" id="contentWrapper">
|
||||
<div>
|
||||
<div class="contentPanel uk-margin-top">
|
||||
<a *ngIf="!showLoading && isPortalAdministrator && !errorMessage" (click)="newEntity()"
|
||||
class="uk-flex uk-flex-right uk-flex-middle uk-margin-small-bottom">
|
||||
<div class="uk-button-default large uk-icon-button uk-margin-small-right" uk-icon="plus">
|
||||
</div>
|
||||
Add entity
|
||||
</a>
|
||||
<div class="contentPanel ">
|
||||
<div *ngIf="!isPortalAdministrator" class="uk-alert uk-alert-primary uk-margin-top-large">
|
||||
<div>
|
||||
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
|
||||
|
|
@ -55,6 +50,10 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger uk-margin-large-top"
|
||||
role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'"
|
||||
|
|
@ -65,12 +64,15 @@
|
|||
<div class="md-card uk-margin-medium-bottom" *ngIf="!errorMessage && !showLoading">
|
||||
<div class="md-card-content">
|
||||
<div class="uk-overflow-container">
|
||||
<table class="uk-table uk-table-striped uk-table-hover">
|
||||
<thead>
|
||||
<table class="uk-table uk-table-striped uk-table-hover uk-table-large">
|
||||
<thead class="form-header">
|
||||
<tr>
|
||||
<th><input id="allEntityCheckbox" type="checkbox" (change)="toggleCheckBoxes($event)"></th>
|
||||
<th
|
||||
class="uk-width-small"><input id="allEntityCheckbox" type="checkbox"
|
||||
(change)="toggleCheckBoxes($event)"></th>
|
||||
<th>Name</th>
|
||||
<th *ngIf="!isPortalAdministrator">Change status</th>
|
||||
<th *ngIf="!isPortalAdministrator">Status</th>
|
||||
<th *ngIf="!isPortalAdministrator">Enable/Disable</th>
|
||||
<th *ngIf="isPortalAdministrator">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -82,6 +84,9 @@
|
|||
<td>
|
||||
<div class="name" href="#">{{check.entity.name}}</div>
|
||||
</td>
|
||||
<td *ngIf="!isPortalAdministrator">
|
||||
<div class="name" href="#">{{check.entity.isEnabled?"Enabled":"Disabled"}}</div>
|
||||
</td>
|
||||
<td *ngIf="!isPortalAdministrator">
|
||||
<mat-slide-toggle [checked]="check.entity.isEnabled"
|
||||
(change)="($event.source.checked = check.entity.isEnabled);toggleEntities(!check.entity.isEnabled,[check.entity._id])"></mat-slide-toggle>
|
||||
|
|
@ -113,8 +118,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<modal-alert #AlertModalSaveEntity (alertOutput)="entitySaveConfirmed($event)"
|
||||
[okDisabled]="myForm && (myForm.invalid || !myForm.dirty)">
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
|
|||
import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
||||
import {UserManagementService} from '../../services/user-management.service';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'entities',
|
||||
|
|
@ -45,7 +46,7 @@ export class EntitiesComponent implements OnInit {
|
|||
public updateErrorMessage = '';
|
||||
public modalErrorMessage = '';
|
||||
public isPortalAdministrator = null;
|
||||
public filterForm: FormControl;
|
||||
public filterForm: FormGroup;
|
||||
private subscriptions: any[] = [];
|
||||
|
||||
constructor(private element: ElementRef, private route: ActivatedRoute,
|
||||
|
|
@ -55,29 +56,33 @@ export class EntitiesComponent implements OnInit {
|
|||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.filterForm = this._fb.control('');
|
||||
this.filterForm = this._fb.group({
|
||||
keyword: [''],
|
||||
status: ['all', Validators.required]});
|
||||
|
||||
this.myForm = this._fb.group({
|
||||
pid: ['', Validators.required],
|
||||
name: ['', Validators.required],
|
||||
isEnabled: '',
|
||||
_id: ''
|
||||
});
|
||||
this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => {
|
||||
this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
|
||||
this.filterBySearch(value);
|
||||
}));
|
||||
this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
this.subscriptions.push(this.filterForm.get('status').valueChanges.subscribe(value => {
|
||||
this.applyStatusFilter();
|
||||
}));
|
||||
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.properties = properties;
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
HelperFunctions.scroll();
|
||||
this.userManagementService.getUserInfo().subscribe(user => {
|
||||
this.selectedCommunityPid = params['communityId'];
|
||||
this.applyCommunityFilter(this.selectedCommunityPid);
|
||||
this.isPortalAdministrator = Session.isPortalAdministrator(user) && !this.selectedCommunityPid;
|
||||
});
|
||||
});
|
||||
});
|
||||
}));
|
||||
|
||||
|
||||
}
|
||||
ngOnDestroy(): void {
|
||||
|
|
@ -123,7 +128,7 @@ export class EntitiesComponent implements OnInit {
|
|||
});
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => this.handleError('System error retrieving community entities', error));
|
||||
error => this.handleError('System error retrieving entities', error));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -281,6 +286,18 @@ export class EntitiesComponent implements OnInit {
|
|||
return textFlag;
|
||||
}
|
||||
|
||||
public applyStatusFilter() {
|
||||
this.checkboxes = [];
|
||||
this.entities.filter(item => this.filterEntitiesByStatus(item)).forEach(
|
||||
_ => this.checkboxes.push(<CheckEntity>{entity: _, checked: false})
|
||||
);
|
||||
}
|
||||
|
||||
public filterEntitiesByStatus(entity: Entity): boolean {
|
||||
let status = this.filterForm.get("status").value;
|
||||
return status == "all" || (status == "disabled" && !entity.isEnabled) || (status == "enabled" && entity.isEnabled);
|
||||
}
|
||||
|
||||
handleError(message: string, error) {
|
||||
this.errorMessage = message;
|
||||
console.log('Server responded: ' + error);
|
||||
|
|
|
|||
|
|
@ -7,11 +7,14 @@ import {AlertModalModule} from '../../utils/modal/alertModal.module';
|
|||
import {MatSlideToggleModule} from '@angular/material';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {InputModule} from "../../sharedComponents/input/input.module";
|
||||
import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
|
||||
import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
|
||||
import {EntitiesRoutingModule} from "./entities-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule, FormsModule, AdminToolServiceModule,
|
||||
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule
|
||||
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule, PageContentModule, AdminTabsModule, EntitiesRoutingModule
|
||||
],
|
||||
declarations: [EntitiesComponent],
|
||||
exports: [EntitiesComponent]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {EditPageHelpContentComponent} from "./edit-page-help-content.component";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: EditPageHelpContentComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class EditPageHelpContentRoutingModule { }
|
||||
|
|
@ -6,11 +6,12 @@ import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminL
|
|||
import {EditPageHelpContentComponent} from './edit-page-help-content.component';
|
||||
import {PageHelpContentFormModule} from './page-help-content-form.module';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule,
|
||||
PageHelpContentFormModule, AdminToolServiceModule
|
||||
PageHelpContentFormModule, AdminToolServiceModule, EditPageHelpContentRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
EditPageHelpContentComponent
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {NewPageHelpContentComponent} from "./new-page-help-content.component";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: NewPageHelpContentComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class NewPageHelpContentRoutingModule { }
|
||||
|
|
@ -6,11 +6,12 @@ import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminL
|
|||
import {NewPageHelpContentComponent} from './new-page-help-content.component';
|
||||
import {PageHelpContentFormModule} from './page-help-content-form.module';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule,
|
||||
PageHelpContentFormModule, AdminToolServiceModule
|
||||
PageHelpContentFormModule, AdminToolServiceModule, NewPageHelpContentRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
NewPageHelpContentComponent
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {PageHelpContentsComponent} from "./page-help-contents.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: PageHelpContentsComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class PageHelpContentsRoutingModule { }
|
||||
|
|
@ -10,11 +10,12 @@ import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
|
|||
import {MatSlideToggleModule} from '@angular/material';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {InputModule} from "../../sharedComponents/input/input.module";
|
||||
import {PageHelpContentsRoutingModule} from "./page-help-contents-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule, FormsModule, SafeHtmlPipeModule,
|
||||
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule
|
||||
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule, PageHelpContentsRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
PageHelpContentsComponent
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {PagesComponent} from "./pages.component";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: PagesComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class PagesRoutingModule { }
|
||||
|
|
@ -1,18 +1,7 @@
|
|||
<div id="page_content" click-outside-or-esc targetId="page_content">
|
||||
<div class="uk-padding-small md-bg-white" uk-grid>
|
||||
|
||||
<div class="uk-width-expand@m uk-width-1-1 uk-flex uk-flex-middle uk-flex-right">
|
||||
<div class="uk-inline uk-width-medium">
|
||||
<span class="uk-position-center-right"><i class="material-icons">search</i></span>
|
||||
<div dashboard-input [formInput]="filterForm" label="Find page"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="page_content_inner">
|
||||
<div *ngIf="!errorMessage && !showLoading" class="page-controls">
|
||||
<div class=" filters ">
|
||||
<div page-content>
|
||||
<admin-tabs tab = "page" [portal]="selectedCommunityPid" header></admin-tabs>
|
||||
<div inner class="admin-pages">
|
||||
<div *ngIf="!errorMessage && !showLoading" class="filters" uk-sticky="offset:150">
|
||||
<div class="show-options uk-float-right">
|
||||
<button class="uk-button uk-button-primary " type="button">Bulk Actions</button>
|
||||
<div uk-dropdown="mode: click">
|
||||
|
|
@ -29,19 +18,30 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-inline uk-width-medium uk-float-right uk-margin-right">
|
||||
<div dashboard-input [formInput]="filterForm.controls.keyword" placeholder="search page" ></div>
|
||||
</div>
|
||||
</div>
|
||||
<h4 class="uk-text-bold uk-text-upper">{{pagesType}} Pages</h4>
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
<ul class="uk-subnav uk-subnav-pill subCategoriesTabs ignore admin " >
|
||||
<li [class.uk-active]="filterForm.get('type').value === 'all'"><a
|
||||
(click)="filterForm.get('type').setValue('all')"><span
|
||||
class="title">All pages</span></a></li>
|
||||
<li *ngFor="let type of typeOptions; let i=index"
|
||||
[class.uk-active]="filterForm.get('type').value === type.value"><a
|
||||
(click)="filterForm.get('type').setValue(type.value)"><span
|
||||
class="title">{{type.label}}</span></a></li>
|
||||
</ul>
|
||||
<!-- <input class="uk-width-1-1 "-->
|
||||
<!-- placeholder="SEARCH FOR A COUNTRY" type="text" autocomplete="off" role="combobox" aria-autocomplete="list" aria-expanded="false" aria-haspopup="true">-->
|
||||
</div>
|
||||
|
||||
<div class="content-wrapper" id="contentWrapper">
|
||||
<div>
|
||||
<div class="contentPanel uk-margin-top">
|
||||
|
||||
|
||||
<div class="content-wrapper uk-margin-top" id="contentWrapper">
|
||||
<a *ngIf="!showLoading && isPortalAdministrator && !errorMessage" (click)="newPage()"
|
||||
class="uk-flex uk-flex-right uk-flex-middle uk-margin-small-bottom uk-width-1-1">
|
||||
<div class="uk-button-default large uk-icon-button uk-margin-small-right" uk-icon="plus">
|
||||
</div>
|
||||
Add page
|
||||
</a>
|
||||
<div class="contentPanel ">
|
||||
<div *ngIf="!isPortalAdministrator" class="uk-alert uk-alert-primary uk-margin-top-large">
|
||||
<div>
|
||||
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
|
||||
|
|
@ -52,6 +52,10 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger uk-margin-large-top"
|
||||
role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'"
|
||||
|
|
@ -60,78 +64,57 @@
|
|||
<div class="md-card uk-margin-medium-bottom" *ngIf="!errorMessage && !showLoading">
|
||||
<div class="md-card-content">
|
||||
<div class="uk-overflow-container">
|
||||
<table class="uk-table uk-table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><input id="allPageCheckbox" type="checkbox" (change)="toggleCheckBoxes($event)"></th>
|
||||
<th>Name</th>
|
||||
<th *ngIf="!isPortalAdministrator">Change status</th>
|
||||
<th *ngIf="!pagesType">Type</th>
|
||||
<th *ngIf="!isPortalAdministrator">Related Entities</th>
|
||||
<th>Route</th>
|
||||
<th *ngIf="!selectedCommunityPid">Portal Type</th>
|
||||
<th *ngIf="isPortalAdministrator">Actions</th>
|
||||
<th *ngIf="!isPortalAdministrator" class="uk-text-center">Page help texts</th>
|
||||
<th *ngIf="!isPortalAdministrator && (pageWithDivIds && pageWithDivIds.length > 0)"
|
||||
class="uk-text-center">Class help texts
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let check of checkboxes; let i=index">
|
||||
<td><input id="{{check.page._id}}" class="checkBox" type="checkbox"
|
||||
<ul class="uk-list pages">
|
||||
<li *ngFor="let check of checkboxes; let i=index" class="uk-card uk-card-default uk-margin-bottom">
|
||||
<div class="uk-grid uk-padding">
|
||||
<div class=""><input id="{{check.page._id}}" class="checkBox" type="checkbox"
|
||||
name="pagescb[]" value="{{check.page._id}}" [(ngModel)]="check.checked">
|
||||
</td>
|
||||
<td>
|
||||
<div class="name" href="#">{{check.page.name}}</div>
|
||||
</td>
|
||||
<td *ngIf="!isPortalAdministrator">
|
||||
<mat-slide-toggle [checked]="check.page.isEnabled"
|
||||
(change)="($event.source.checked = check.page.isEnabled);togglePages(!check.page.isEnabled,[check.page._id])"></mat-slide-toggle>
|
||||
</td>
|
||||
<td *ngIf="!pagesType">
|
||||
<div class="type" href="#">{{check.page.type}}</div>
|
||||
</td>
|
||||
<td *ngIf="!isPortalAdministrator">
|
||||
<div class="entities" href="#">
|
||||
<span *ngFor="let entity of check.page.entities let i=index">{{entity.name}}<span
|
||||
*ngIf="i<(check.page.entities.length-1)">, </span></span>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="route" href="#">{{check.page.route}}</div>
|
||||
</td>
|
||||
<td *ngIf="!selectedCommunityPid">
|
||||
<div class="portalType" href="#">{{check.page.portalType}}</div>
|
||||
</td>
|
||||
|
||||
<td *ngIf="isPortalAdministrator">
|
||||
<div class="uk-width-expand">
|
||||
<div class="title uk-margin-medium-bottom">Name</div>
|
||||
<div class="name uk-margin-medium-bottom" href="#">{{check.page.name}}</div>
|
||||
<div *ngIf="check.page.entities && check.page.entities.length > 0"><span
|
||||
class="title">Entities: </span>
|
||||
{{check.page.entities.join(", ")}}</div>
|
||||
<div class=" uk-margin-small-bottom"><span class="title">Route: </span> {{check.page.route}}</div>
|
||||
<div *ngIf="!pagesType" class=" uk-margin-small-bottom"><span class="title">Type: </span> {{check.page.type}}</div>
|
||||
<div *ngIf="!selectedCommunityPid" class=" uk-margin-small-bottom">
|
||||
<span class="title" >Portal type: </span>{{check.page.portalType}}
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="isPortalAdministrator" class="uk-width-1-4">
|
||||
<div class="title uk-margin-medium-bottom">Actions</div>
|
||||
<div class="actions" href="#">
|
||||
<i class="clickable " (click)="editPage(i)" uk-icon="pencil"></i>
|
||||
<i class="clickable uk-text-danger"
|
||||
(click)="confirmDeletePage(check.page._id)" uk-icon="trash"></i>
|
||||
</div>
|
||||
</td>
|
||||
<td *ngIf="!isPortalAdministrator" class="uk-text-center">
|
||||
</div>
|
||||
<div *ngIf="!isPortalAdministrator" class="uk-width-1-4">
|
||||
<div class="title uk-margin-medium-bottom">Helptexts</div>
|
||||
<div class=" uk-margin-small-bottom">
|
||||
<a *ngIf="check.page.top || check.page.bottom || check.page.left || check.page.right"
|
||||
class="helpContents"
|
||||
[queryParams]="{communityId: selectedCommunityPid, pageId: check.page._id}"
|
||||
routerLink="../../helptexts">
|
||||
add help texts
|
||||
manage help texts
|
||||
</a>
|
||||
<span
|
||||
*ngIf="!check.page.top && !check.page.bottom && !check.page.left && !check.page.right">-</span>
|
||||
</td>
|
||||
<td *ngIf="!isPortalAdministrator && (pageWithDivIds && pageWithDivIds.length > 0)"
|
||||
class="uk-text-center">
|
||||
</div>
|
||||
<div>
|
||||
<a *ngIf="pageWithDivIds.includes(check.page._id)" class="classHelpContents"
|
||||
[queryParams]="{communityId: selectedCommunityPid, pageId: check.page._id}"
|
||||
routerLink="../../classContents">add class contents</a>
|
||||
<span *ngIf="!pageWithDivIds.includes(check.page._id)">-</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
routerLink="../../classContents">manage class contents</a>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="!isPortalAdministrator" class="uk-width-1-4">
|
||||
<div class="title uk-margin-medium-bottom">Enable/disable</div>
|
||||
<mat-slide-toggle [checked]="check.page.isEnabled"
|
||||
(change)="($event.source.checked = check.page.isEnabled);togglePages(!check.page.isEnabled,[check.page._id])"></mat-slide-toggle>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
<div *ngIf="checkboxes.length==0" class="col-md-12">
|
||||
<div class="uk-alert-warning" uk-alert>No pages found</div>
|
||||
|
|
@ -148,8 +131,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<modal-alert #AlertModalSavePage (alertOutput)="pageSaveConfirmed($event)" [okDisabled]="myForm && (myForm.invalid || !myForm.dirty)">
|
||||
<div *ngIf="modalErrorMessage" class="uk-alert-danger" uk-alert aria-hidden="true">{{ modalErrorMessage }}</div>
|
||||
|
|
@ -177,7 +158,7 @@
|
|||
[removable]="true">
|
||||
{{entity.name}}
|
||||
<span (click)="remove(entity)"
|
||||
class="mat-icon notranslate mat-chip-remove mat-chip-trailing-icon material-icons mat-icon-no-color ng-star-inserted">cancel</span>
|
||||
class=" notranslate mat-chip-remove mat-chip-trailing-icon " uk-icon="trash"></span>
|
||||
</mat-chip>
|
||||
<input placeholder="Add in pages..." #PageInput
|
||||
[formControl]="entitiesSearchCtrl" [matAutocomplete]="auto" [matChipInputFor]="chipList">
|
||||
|
|
@ -188,61 +169,12 @@
|
|||
</mat-option>
|
||||
</mat-autocomplete>
|
||||
</mat-form-field>
|
||||
<!--<div formArrayName="entities" class="form-group">
|
||||
<label for="entityNameTag">Entity Name</label>
|
||||
<div id="entityNameTag">
|
||||
<pre class="card card-block card-header"><span *ngFor="let entity of myForm.value.entities; let i=index">{{entity.name}}<span *ngIf="i<(myForm.value.entities.length-1)">, </span></span></pre>
|
||||
|
||||
<button type="button" (click)="toggle()">Add / Remove entities</button>
|
||||
|
||||
<ng-container *ngIf="!myForm.value.isCollapsed">
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger" role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-width-1-1" role="alert"><img class="uk-align-center loading-gif"></div>
|
||||
|
||||
<div *ngFor="let entity of getKeys(allEntities)">
|
||||
<span>
|
||||
<span *ngIf="allEntities.get(entity)" class="activated" >
|
||||
<input (click)="toggleEntity(false,[entity._id], entity)" class="deactivate" src="assets/imgs/delete-icon.png" title="Disable" width="20" type="image" height="20">
|
||||
</span>
|
||||
<span *ngIf="!allEntities.get(entity)" class="deactivated" >
|
||||
<input (click)="toggleEntity(true,[entity._id], entity)" class="deactivate" src="assets/imgs/add-icon.png" title="Enable" width="20" type="image" height="20">
|
||||
</span>
|
||||
{{entity.name}}
|
||||
</span>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<!-- <div class="form-group" uk-grid>-->
|
||||
<!-- <label class="uk-width-1-1 uk-margin-small-bottom">-->
|
||||
<!-- Select positions of help contents for this page.-->
|
||||
<!-- </label>-->
|
||||
<!-- <label class="uk-text-danger uk-margin-small-bottom">-->
|
||||
<!-- By disabling a position, all contents in this position will be deleted.-->
|
||||
<!-- </label>-->
|
||||
<!-- <label class="uk-width-1-4 checkbox">-->
|
||||
<!-- <span class="uk-margin-small-right" style="font-weight: normal;">Top</span>-->
|
||||
<!-- <input tabindex="0" type="checkbox" formControlName="top">-->
|
||||
<!-- </label>-->
|
||||
<!-- <label class="uk-width-1-4 checkbox">-->
|
||||
<!-- <span class="uk-margin-small-right" style="font-weight: normal;">Bottom</span>-->
|
||||
<!-- <input tabindex="0" type="checkbox" formControlName="bottom">-->
|
||||
<!-- </label>-->
|
||||
<!-- <label class="uk-width-1-4 checkbox">-->
|
||||
<!-- <span class="uk-margin-small-right" style="font-weight: normal;">Left</span>-->
|
||||
<!-- <input tabindex="0" type="checkbox" formControlName="left">-->
|
||||
<!-- </label>-->
|
||||
<!-- <label class="uk-width-1-4 checkbox">-->
|
||||
<!-- <span class="uk-margin-small-right" style="font-weight: normal;">Right</span>-->
|
||||
<!-- <input tabindex="0" type="checkbox" formControlName="right">-->
|
||||
<!-- </label>-->
|
||||
<!-- </div>-->
|
||||
<div class="form-group" >
|
||||
<label class="uk-text-danger uk-margin-small-bottom">
|
||||
By disabling a position, all contents in this position will be deleted.
|
||||
</label>
|
||||
<div class="uk-text-muted"> Select if this page exists in:</div>
|
||||
<div class="title"> Select if this page exists in:</div>
|
||||
<div class=" uk-grid">
|
||||
<span dashboard-input class="" [formInput]="myForm.get('top')"
|
||||
type="checkbox"
|
||||
|
|
@ -262,25 +194,8 @@
|
|||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="form-group">-->
|
||||
|
||||
<!-- <div class="uk-text-muted"> Select if this page exists in:</div>-->
|
||||
<!-- <span dashboard-input class="" [formInput]="myForm.get('openaire')"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- label="Explore Portal">-->
|
||||
<!-- </span>-->
|
||||
<!-- <span dashboard-input class="uk-margin-small-left" [formInput]="myForm.get('connect')"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- label="Connect Portal">-->
|
||||
<!-- </span>-->
|
||||
<!-- <span dashboard-input class="uk-margin-small-left" [formInput]="myForm.get('communities')"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- label="Communities Dashboards">-->
|
||||
<!-- </span>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<div [ngClass]="{'has-error':!myForm.controls.portalType.valid && myForm.controls.portalType.dirty}" class="form-group" >
|
||||
<div class="uk-width-1-1 uk-margin-small-bottom">
|
||||
<div class="uk-width-1-1 uk-margin-small-bottom uk-text-bold uk-form-label">
|
||||
Page exists in:
|
||||
</div>
|
||||
<div class="uk-child-width-1-2 uk-grid">
|
||||
|
|
@ -296,9 +211,4 @@
|
|||
|
||||
</modal-alert>
|
||||
|
||||
<!--<modal-alert #AlertModalUpdatePage (alertOutput)="pageUpdateConfirmed($event)">-->
|
||||
<!-- <div *ngIf="modalErrorMessage" class="uk-alert-danger" uk-alert aria-hidden="true">{{ modalErrorMessage }}</div>-->
|
||||
<!-- <page-form [group]="myForm"></page-form>-->
|
||||
<!--</modal-alert>-->
|
||||
|
||||
<modal-alert #AlertModalDeletePages (alertOutput)="confirmedDeletePages($event)"></modal-alert>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import {HelpContentService} from '../../services/help-content.service';
|
|||
import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
|
||||
import {CheckPage, Page} from '../../utils/entities/adminTool/page';
|
||||
import {Portal} from '../../utils/entities/adminTool/portal';
|
||||
import {Entity} from '../../utils/entities/adminTool/entity';
|
||||
import {CheckEntity, Entity} from '../../utils/entities/adminTool/entity';
|
||||
import {EnvProperties} from '../../utils/properties/env-properties';
|
||||
import {Session} from '../../login/utils/helper.class';
|
||||
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
|
||||
|
|
@ -51,14 +51,14 @@ export class PagesComponent implements OnInit {
|
|||
public updateErrorMessage: string = '';
|
||||
public modalErrorMessage: string = '';
|
||||
public isPortalAdministrator = null;
|
||||
public filterForm: FormControl;
|
||||
public typeOptions = [{label: 'Search', value: 'search'}, {label: 'Link', value: 'link'}, {
|
||||
public filterForm: FormGroup;
|
||||
public typeOptions = [{label: 'Search', value: 'search'}, {
|
||||
label: 'Share',
|
||||
value: 'share'
|
||||
}, {label: 'Landing', value: 'landing'}, {label: 'HTML', value: 'html'}, {
|
||||
label: 'Link',
|
||||
value: 'link'
|
||||
}, {label: 'Other', value: 'other'}]
|
||||
}, {label: 'Other', value: 'other'}];
|
||||
public entitiesCtrl: FormArray;
|
||||
@ViewChild('PageInput') pageInput: ElementRef<HTMLInputElement>;
|
||||
public entitiesSearchCtrl: FormControl;
|
||||
|
|
@ -74,10 +74,15 @@ export class PagesComponent implements OnInit {
|
|||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.filterForm = this._fb.control('');
|
||||
this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => {
|
||||
this.filterForm = this._fb.group({
|
||||
keyword: [''],
|
||||
type: ['all', Validators.required]});
|
||||
this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
|
||||
this.filterBySearch(value);
|
||||
}));
|
||||
this.subscriptions.push(this.filterForm.get('type').valueChanges.subscribe(value => {
|
||||
this.applyTypeFilter();
|
||||
}));
|
||||
this.entitiesSearchCtrl = this._fb.control('');
|
||||
this.myForm = this._fb.group({
|
||||
route: ['', Validators.required],
|
||||
|
|
@ -99,12 +104,12 @@ export class PagesComponent implements OnInit {
|
|||
|
||||
this.pagesType = '';
|
||||
if (params['type']) {
|
||||
this.pagesType = params['type'];
|
||||
// this.pagesType = params['type'];
|
||||
this.filterForm.get('type').setValue(params['type']);
|
||||
}
|
||||
|
||||
this.selectedCommunityPid = params['communityId'];
|
||||
this.keyword = '';
|
||||
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
||||
this.selectedCommunityPid = params['communityId'];
|
||||
this.applyCommunityFilter(this.selectedCommunityPid);
|
||||
this.isPortalAdministrator = Session.isPortalAdministrator(user) && !this.selectedCommunityPid;
|
||||
}));
|
||||
|
|
@ -116,7 +121,7 @@ export class PagesComponent implements OnInit {
|
|||
this.allEntities = entities;
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => this.handleError('System error retrieving community entities', error)));
|
||||
error => this.handleError('System error retrieving pages', error)));
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -437,7 +442,17 @@ export class PagesComponent implements OnInit {
|
|||
_ => this.checkboxes.push(<CheckPage>{page: _, checked: false})
|
||||
);
|
||||
}
|
||||
public applyTypeFilter() {
|
||||
this.checkboxes = [];
|
||||
this.pages.filter(item => this.filterByType(item)).forEach(
|
||||
_ => this.checkboxes.push(<CheckPage>{page: _, checked: false})
|
||||
);
|
||||
}
|
||||
|
||||
public filterByType(page: Page): boolean {
|
||||
let type = this.filterForm.get("type").value;
|
||||
return type == "all" || (type == page.type);
|
||||
}
|
||||
public filterPages(page: Page): boolean {
|
||||
let textFlag = this.searchText.toString() == '' || (page.route + ' ' + page.name + ' ' + page.portalType).match(this.searchText) != null;
|
||||
return textFlag;
|
||||
|
|
|
|||
|
|
@ -7,11 +7,14 @@ import {PagesComponent} from './pages.component';
|
|||
import {MatAutocompleteModule, MatChipsModule, MatFormFieldModule, MatSlideToggleModule} from '@angular/material';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {InputModule} from "../../sharedComponents/input/input.module";
|
||||
import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
|
||||
import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
|
||||
import {PagesRoutingModule} from "./pages-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, RouterModule, FormsModule, AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule,
|
||||
MatAutocompleteModule, MatFormFieldModule, MatChipsModule
|
||||
MatAutocompleteModule, MatFormFieldModule, MatChipsModule, AdminTabsModule, PageContentModule, PagesRoutingModule
|
||||
],
|
||||
declarations: [PagesComponent],
|
||||
exports: [PagesComponent]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {PortalsComponent} from "./portals.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: PortalsComponent}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class PortalsRoutingModule { }
|
||||
|
|
@ -1,39 +1,9 @@
|
|||
<div id="page_content" click-outside-or-esc targetId="page_content">
|
||||
<!-- [escClose]="false"-->
|
||||
<!-- (clickOutside)="toggleOpen($event)">-->
|
||||
<div class="uk-padding-small md-bg-white" uk-grid>
|
||||
|
||||
<div class="uk-width-expand@m uk-width-1-1 uk-flex uk-flex-middle uk-flex-right">
|
||||
<div class="uk-inline uk-width-medium">
|
||||
<span class="uk-position-center-right"><i class="material-icons">search</i></span>
|
||||
<div dashboard-input label="Locate indicator" [formInput]="formControl" label="Locate portal"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div id="page_content_inner">
|
||||
|
||||
<div class="menubar ">
|
||||
<h4 class="uk-text-bold">Portals</h4>
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content-wrapper" id="contentWrapper">
|
||||
|
||||
<div class="contentPanel">
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger uk-margin-large-top"
|
||||
role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'"
|
||||
class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img
|
||||
class="uk-align-center loading-gif"></div>
|
||||
|
||||
<div *ngIf="!errorMessage && !showLoading" class="page-controls">
|
||||
<div class=" filters ">
|
||||
<div page-content>
|
||||
<admin-tabs tab = "portal" header></admin-tabs>
|
||||
<div inner class="admin-pages">
|
||||
<div *ngIf="!errorMessage && !showLoading" class="filters" uk-sticky="offset:150">
|
||||
<div class="show-options uk-float-right">
|
||||
<button class="uk-button" type="button">Bulk Actions</button>
|
||||
<button class="uk-button uk-button-primary " type="button">Bulk Actions</button>
|
||||
<div uk-dropdown="mode: click">
|
||||
<ul class="uk-nav uk-margin-left"
|
||||
[attr.uk-tooltip]="getSelectedCommunities().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
|
||||
|
|
@ -43,15 +13,47 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-inline uk-width-medium uk-float-right uk-margin-right" >
|
||||
<span class="uk-position-center-right"><i class="material-icons">search</i></span>
|
||||
<div dashboard-input [formInput]="filterForm.controls.keyword"
|
||||
placeholder="Search"></div>
|
||||
</div>
|
||||
<ul class="uk-subnav uk-subnav-pill subCategoriesTabs ignore admin " >
|
||||
<li [class.uk-active]="filterForm.get('type').value === 'all'" class="uk-margin-small-bottom"><a
|
||||
(click)="filterForm.get('type').setValue('all')"><span
|
||||
class="title">All portals</span></a></li>
|
||||
<li *ngFor="let type of portalUtils.portalTypes; let i=index"
|
||||
[class.uk-active]="filterForm.get('type').value === type.value" class="uk-margin-small-bottom"><a
|
||||
(click)="filterForm.get('type').setValue(type.value)"><span
|
||||
class="title">{{type.label}}</span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="md-card uk-margin-medium-bottom" *ngIf="!errorMessage && !showLoading">
|
||||
<div class="md-card-content">
|
||||
<div class="uk-margin-top">
|
||||
<a *ngIf="!showLoading && !errorMessage" (click)="newCommunity()"
|
||||
class="uk-flex uk-flex-right uk-flex-middle uk-margin-small-bottom">
|
||||
<div class="uk-button-default large uk-icon-button uk-margin-small-right" uk-icon="plus">
|
||||
</div>
|
||||
Add portal
|
||||
</a>
|
||||
<div *ngIf="updateErrorMessage" class="uk-alert-danger" uk-alert>
|
||||
<a class="uk-alert-close" uk-close></a>
|
||||
{{updateErrorMessage}}
|
||||
</div>
|
||||
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger uk-margin-large-top"
|
||||
role="alert">{{errorMessage}}</div>
|
||||
<div [style.display]="showLoading ? 'inline' : 'none'"
|
||||
class="uk-animation-fade uk-margin-large-top uk-width-1-1" role="alert"><img
|
||||
class="uk-align-center loading-gif"></div>
|
||||
|
||||
|
||||
|
||||
<div class=" uk-margin-medium-bottom" *ngIf="!errorMessage && !showLoading">
|
||||
|
||||
<div class="">
|
||||
<div class="uk-overflow-container">
|
||||
<table class="uk-table uk-table-striped uk-table-hover">
|
||||
|
||||
<thead>
|
||||
<thead class="form-header">
|
||||
<tr>
|
||||
<th><input id="allCommunityCheckbox" type="checkbox" (change)="toggleCheckBoxes($event)"></th>
|
||||
<th>Name</th>
|
||||
|
|
@ -82,26 +84,21 @@
|
|||
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="uk-width-1-1 uk-flex uk-flex-center ">
|
||||
<div class="uk-width-small uk-button-default uk-button" (click)="newCommunity()">
|
||||
<i class="" uk-icon="plus"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div *ngIf="checkboxes.length==0" class="col-md-12">
|
||||
<div class="uk-alert-warning" uk-alert>No portals found</div>
|
||||
</div>
|
||||
<!--<div class="uk-width-1-1 uk-flex uk-flex-center ">
|
||||
<div class="uk-width-small uk-button-default uk-button" (click)="newCommunity()">
|
||||
<i class="" uk-icon="plus"></i>
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<modal-alert #AlertModalSaveCommunity (alertOutput)="communitySaveConfirmed($event)"
|
||||
[okDisabled]="portalFG && (portalFG.invalid || !portalFG.dirty)">
|
||||
|
||||
|
|
@ -129,7 +126,4 @@
|
|||
</form>
|
||||
|
||||
</modal-alert>
|
||||
|
||||
|
||||
<modal-alert #AlertModalDeleteCommunities (alertOutput)="confirmedDeleteCommunities($event)"></modal-alert>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Component, ViewChild, OnInit, ElementRef} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {HelpContentService} from '../../services/help-content.service';
|
||||
import {FormBuilder, FormControl, FormGroup} from '@angular/forms';
|
||||
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
|
||||
import {EnvProperties} from '../../utils/properties/env-properties';
|
||||
|
||||
import {Session} from '../../login/utils/helper.class';
|
||||
|
|
@ -11,6 +11,7 @@ import {Subscriber} from "rxjs";
|
|||
import {CheckPortal, Portal} from "../../utils/entities/adminTool/portal";
|
||||
import {PortalUtils} from "./portalHelper";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
import {CheckPage, Page} from "../../utils/entities/adminTool/page";
|
||||
|
||||
@Component({
|
||||
selector: 'portals',
|
||||
|
|
@ -27,7 +28,7 @@ export class PortalsComponent implements OnInit {
|
|||
public communities: Portal[] = [];
|
||||
|
||||
public portalFG: FormGroup;
|
||||
public formControl: FormControl;
|
||||
public filterForm: FormGroup;
|
||||
private subscriptions: any[] = [];
|
||||
|
||||
private searchText: RegExp = new RegExp('');
|
||||
|
|
@ -48,10 +49,15 @@ export class PortalsComponent implements OnInit {
|
|||
piwik:'',
|
||||
type: ''
|
||||
});
|
||||
this.formControl = this._fb.control('');
|
||||
this.subscriptions.push(this.formControl.valueChanges.subscribe(value => {
|
||||
this.filterForm = this._fb.group({
|
||||
keyword: [''],
|
||||
type: ['all', Validators.required]});
|
||||
this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
|
||||
this.filterBySearch(value);
|
||||
}));
|
||||
this.subscriptions.push(this.filterForm.get('type').valueChanges.subscribe(value => {
|
||||
this.applyTypeFilter();
|
||||
}));
|
||||
|
||||
HelperFunctions.scroll();
|
||||
this.properties = properties;
|
||||
|
|
@ -95,7 +101,7 @@ export class PortalsComponent implements OnInit {
|
|||
}
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => this.handleError('System error retrieving communities', error)));
|
||||
error => this.handleError('System error retrieving portals', error)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -273,7 +279,17 @@ export class PortalsComponent implements OnInit {
|
|||
_ => this.checkboxes.push(<CheckPortal>{community: _, checked: false})
|
||||
);
|
||||
}
|
||||
public applyTypeFilter() {
|
||||
this.checkboxes = [];
|
||||
this.communities.filter(item => this.filterByType(item)).forEach(
|
||||
_ => this.checkboxes.push(<CheckPortal>{community: _, checked: false})
|
||||
);
|
||||
}
|
||||
|
||||
public filterByType(community: Portal): boolean {
|
||||
let type = this.filterForm.get("type").value;
|
||||
return type == "all" || (type == community.type);
|
||||
}
|
||||
public filterCommunities(community: Portal): boolean {
|
||||
const textFlag = this.searchText.toString() === '' || (community.name || community.type).match(this.searchText) != null;
|
||||
return textFlag;
|
||||
|
|
|
|||
|
|
@ -6,14 +6,17 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
|
|||
import {AlertModalModule} from '../../utils/modal/alertModal.module';
|
||||
import {AdminToolServiceModule} from "../../services/adminToolService.module";
|
||||
import {InputModule} from "../../sharedComponents/input/input.module";
|
||||
import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
|
||||
import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
|
||||
import {PortalsRoutingModule} from "./portals-routing.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, AlertModalModule,
|
||||
ReactiveFormsModule,
|
||||
RouterModule, AdminToolServiceModule, InputModule
|
||||
RouterModule, AdminToolServiceModule, InputModule, AdminTabsModule, PageContentModule, PortalsRoutingModule
|
||||
],
|
||||
declarations: [PortalsComponent],
|
||||
exports: [PortalsComponent]
|
||||
})
|
||||
export class PortalModule { }
|
||||
export class PortalsModule { }
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
import {Component, Input, OnInit} from '@angular/core';
|
||||
import {Session, User} from "../../../login/utils/helper.class";
|
||||
import {UserManagementService} from "../../../services/user-management.service";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {ActivatedRoute} from "@angular/router";
|
||||
import {HelperFunctions} from "../../../utils/HelperFunctions.class";
|
||||
|
||||
@Component({
|
||||
selector: 'admin-tabs',
|
||||
template: `
|
||||
<ul class="uk-tab customTabs admin uk-flex uk-flex-center uk-flex-left@m">
|
||||
<li *ngIf="isPortalAdmin && (!portal )" class="uk-disabled" > <span class = "uk-margin-small-right" uk-icon="cog"></span></li>
|
||||
<li *ngIf="isPortalAdmin && !portal" [class.uk-active]="tab === 'portal'"><a routerLink="../../portals"><span class="title">Portals</span></a></li>
|
||||
<li [class.uk-active]="tab === 'page'"><a routerLink="../../pages" [queryParams]="(portal? {communityId:portal}:{})" ><span class="title">Pages</span></a></li>
|
||||
<li [class.uk-active]="tab === 'entity'"><a routerLink="../../entities" [queryParams]="(portal? {communityId:portal}:{})"><span class="title">Entities</span></a></li>
|
||||
<li *ngIf="isPortalAdmin && !portal" [class.uk-active]="tab === 'class'"><a routerLink="../../classes"><span class="title">Class Ids</span></a></li>
|
||||
</ul>
|
||||
`
|
||||
})
|
||||
export class AdminTabsComponent implements OnInit {
|
||||
|
||||
@Input()
|
||||
public type: string;
|
||||
@Input()
|
||||
portal = null;
|
||||
@Input()
|
||||
public user: User;
|
||||
@Input()
|
||||
public tab: "portal"| "page" | "entity" | "class" = 'page';
|
||||
|
||||
private subscriptions: any[] = [];
|
||||
constructor(private route: ActivatedRoute, private userManagementService: UserManagementService) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
||||
this.user = user;
|
||||
|
||||
}));
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
HelperFunctions.scroll();
|
||||
this.portal = params['communityId'];
|
||||
|
||||
}));
|
||||
}
|
||||
ngOnDestroy(): void {
|
||||
this.subscriptions.forEach(value => {
|
||||
if (value instanceof Subscriber) {
|
||||
value.unsubscribe();
|
||||
} else if (value instanceof Function) {
|
||||
value();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public get isPortalAdmin() {
|
||||
return Session.isPortalAdministrator(this.user) || Session.isCurator(this.type, this.user);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {AdminTabsComponent} from "./admin-tabs.component";
|
||||
import {RouterModule} from "@angular/router";
|
||||
|
||||
@NgModule({
|
||||
declarations: [AdminTabsComponent],
|
||||
imports: [
|
||||
CommonModule, RouterModule
|
||||
],
|
||||
exports:[AdminTabsComponent]
|
||||
})
|
||||
export class AdminTabsModule {
|
||||
}
|
||||
|
|
@ -42,6 +42,7 @@ export class PageContentComponent implements OnDestroy, AfterViewInit{
|
|||
}
|
||||
|
||||
setupHeightMutationObserver() {
|
||||
if (typeof document !== 'undefined') {
|
||||
const observable = new Observable<number>(observer => {
|
||||
const callback = (mutationsList, observer2) => {
|
||||
observer.next(this.getHeight());
|
||||
|
|
@ -65,6 +66,7 @@ export class PageContentComponent implements OnDestroy, AfterViewInit{
|
|||
this.cdr.detectChanges();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ngAfterViewInit() {
|
||||
this.setupHeightMutationObserver();
|
||||
|
|
|
|||
|
|
@ -209,7 +209,12 @@ export class IndicatorFilterUtils{
|
|||
}else if (field == "project"){
|
||||
return this.getProjectFilter(filterType);
|
||||
}
|
||||
//TODO add other options
|
||||
//TODO uncomment to add other options --> following doesn't work
|
||||
/* else if (field == "country"){
|
||||
return this.getCountryFilter(filterType);
|
||||
}else if (field == "organization"){
|
||||
return this.getOrganizationFilter(filterType);
|
||||
}*/
|
||||
|
||||
}
|
||||
static getResultFilter(dbType: string = null, filterType:FilterType) {
|
||||
|
|
@ -234,11 +239,20 @@ export class IndicatorFilterUtils{
|
|||
}
|
||||
static getOrganizationFilter( filterType:FilterType) {
|
||||
if (filterType == "fundingL0") {
|
||||
return '';
|
||||
return '{"groupFilters":[{"field":"organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
|
||||
} else if (filterType == "start_year") {
|
||||
return '';
|
||||
return '{"groupFilters":[{"field":"organization.project.start year","type":">=","values":["' + ChartHelper.prefix + 'start_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
|
||||
} else if (filterType == "end_year") {
|
||||
return '';
|
||||
return '{"groupFilters":[{"field":"organization.project.start year","type":"<=","values":["' + ChartHelper.prefix + 'end_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
|
||||
}
|
||||
}
|
||||
static getCountryFilter( filterType:FilterType) {
|
||||
if (filterType == "fundingL0") {
|
||||
return '{"groupFilters":[{"field":"country.organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
|
||||
} else if (filterType == "start_year") {
|
||||
return '{"groupFilters":[{"field":"country.organization.project.start year","type":">=","values":["' + ChartHelper.prefix + 'start_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
|
||||
} else if (filterType == "end_year") {
|
||||
return '{"groupFilters":[{"field":"country.organization.project.start year","type":"<=","values":["' + ChartHelper.prefix + 'end_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue