MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library | Trunk]: Fix admin tools pages portal type configuration. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60561 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2021-03-02 15:52:09 +00:00
parent 8acc64fc10
commit cd519aa1e5
10 changed files with 425 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
connect/communityGuard/connectCommunityGuard.guard.ts
View File

@ -4,7 +4,7 @@ import {
Router, Router,
CanActivate, CanActivate,
ActivatedRouteSnapshot, ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot, UrlTree, CanActivateChild,
} from '@angular/router'; } from '@angular/router';
import {Observable, Subscription} from 'rxjs'; import {Observable, Subscription} from 'rxjs';
@ -12,22 +12,27 @@ import {CommunityService} from '../community/community.service';
import {properties} from "../../../../environments/environment"; import {properties} from "../../../../environments/environment";
@Injectable() @Injectable()
export class ConnectCommunityGuard implements CanActivate { export class ConnectCommunityGuard implements CanActivate, CanActivateChild {
sub: Subscription = null; sub: Subscription = null;
constructor(private router: Router, constructor(private router: Router,
private communityService: CommunityService) { private communityService: CommunityService) {
} }
check(community: string): Observable<boolean> | boolean { check(community: string, url: string): Observable<boolean> | boolean {
return this.communityService.isCommunityType(community).pipe(take(1), tap(isCommunity => { return this.communityService.isCommunityType(community).pipe(take(1), tap(isCommunity => {
if (!isCommunity) { if (!isCommunity) {
this.router.navigate(['errorcommunity']); this.router.navigate(['/error'], {queryParams: {'page': url}});
} }
})); }));
} }
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
return this.check(route.queryParams['communityId']); return this.check(route.queryParams['communityId'], state.url);
}
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
let community = childRoute.params['community'];
return community && this.check(community, state.url);
} }
} }

38
connect/communityGuard/connectRIGuard.guard.ts
View File

@ -1,55 +1,39 @@
import {tap} from 'rxjs/operators'; import {tap} from 'rxjs/operators';
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import { import {
Router,
CanActivate,
ActivatedRouteSnapshot, ActivatedRouteSnapshot,
CanActivate,
CanActivateChild,
Router,
RouterStateSnapshot, RouterStateSnapshot,
CanLoad, UrlTree
Route, UrlSegment, CanActivateChild, UrlTree
} from '@angular/router'; } from '@angular/router';
import {Observable, Subscription} from 'rxjs'; import {Observable, Subscription} from 'rxjs';
import {CommunityService} from '../community/community.service'; import {CommunityService} from '../community/community.service';
import { EnvironmentSpecificService} from '../../utils/properties/environment-specific.service';
import {ConnectHelper} from '../connectHelper';
import {properties} from "../../../../environments/environment";
@Injectable() @Injectable()
export class ConnectRIGuard implements CanActivate, CanLoad, CanActivateChild { export class ConnectRIGuard implements CanActivate, CanActivateChild {
sub: Subscription = null; sub: Subscription = null;
constructor(private router: Router, constructor(private router: Router,
private communityService: CommunityService, private communityService: CommunityService) {
private propertiesService: EnvironmentSpecificService) {
} }
check(community: string): Observable<boolean> | boolean { check(community: string, url: string): Observable<boolean> | boolean {
return this.communityService.isRIType(community).pipe(tap(authorized => { return this.communityService.isRIType(community).pipe(tap(authorized => {
if (!authorized) { if (!authorized) {
this.router.navigate(['errorcommunity']); this.router.navigate(['/error'], {queryParams: {'page': url}});
} }
})); }));
} }
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
let community = route.params['community']; let community = route.params['community'];
return community && this.check(community); return community && this.check(community, state.url);
} }
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree { canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
let community = childRoute.params['community']; let community = childRoute.params['community'];
return community && this.check(community); return community && this.check(community, state.url);
}
canLoad(route: Route, segments: UrlSegment[]): Observable<boolean> | Promise<boolean> | boolean {
const path = '/' + route.path + document.location.search;
return this.check(ConnectHelper.getCommunityFromPath(path));
}
canDeactivate() {
if(this.sub) {
this.sub.unsubscribe();
}
return true;
} }
} }

12
dashboard/entity/entities.component.html
View File

@ -50,7 +50,7 @@
</div> </div>
<!--<div *ngIf="checkboxes.length > 0" class=" uk-margin-remove-top uk-margin-small-left" <!--<div *ngIf="checkboxes.length > 0" class=" uk-margin-remove-top uk-margin-small-left"
[attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'" [attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
title="Select at least one help text"> title="Select at least one entity">
<input id="checkAll" type="checkbox" (click)="selectAll()" <input id="checkAll" type="checkbox" (click)="selectAll()"
[ngModel]="getSelectedEntities().length ==checkboxes.length"/> [ngModel]="getSelectedEntities().length ==checkboxes.length"/>
<a *ngIf="!isPortalAdministrator" class="uk-margin-left" [class.uk-disabled]="getSelectedEntities().length <a *ngIf="!isPortalAdministrator" class="uk-margin-left" [class.uk-disabled]="getSelectedEntities().length
@ -63,10 +63,10 @@
</div>--> </div>-->
</div> </div>
<div *ngIf="checkboxes.length > 0" <div *ngIf="!showLoading && checkboxes.length > 0"
class="uk-margin-remove-top uk-margin-small-left uk-margin-small-bottom" class="uk-margin-remove-top uk-margin-small-left uk-margin-small-bottom uk-display-inline"
[attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'" [attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : null"
title="Select at least one help text"><input id="checkAll" type="checkbox" (click)="selectAll()" title="Select at least one entity"><input id="checkAll" type="checkbox" (click)="selectAll()"
[ngModel]="getSelectedEntities().length ==checkboxes.length"/> [ngModel]="getSelectedEntities().length ==checkboxes.length"/>
<span *ngIf="getSelectedEntities().length > 0" class="uk-margin-left uk-text-muted"> <span *ngIf="getSelectedEntities().length > 0" class="uk-margin-left uk-text-muted">
{{getSelectedEntities().length}} entities selected </span> {{getSelectedEntities().length}} entities selected </span>
@ -74,7 +74,7 @@
<div uk-dropdown="mode: click"> <div uk-dropdown="mode: click">
<ul class="uk-nav uk-dropdown-nav" <ul class="uk-nav uk-dropdown-nav"
[attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'" [attr.uk-tooltip]="getSelectedEntities().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
title="Select at least one help text"> title="Select at least one entity">
<li *ngIf="!isPortalAdministrator"><a [class]="getSelectedEntities().length == 0 ? 'uk-disabled' : ''" <li *ngIf="!isPortalAdministrator"><a [class]="getSelectedEntities().length == 0 ? 'uk-disabled' : ''"
(click)="toggleEntities(true,getSelectedEntities())"><i></i> Enable (click)="toggleEntities(true,getSelectedEntities())"><i></i> Enable
</a></li> </a></li>

2
dashboard/entity/entities.component.ts
View File

@ -74,9 +74,7 @@ export class EntitiesComponent implements OnInit {
})); }));
this.userManagementService.getUserInfo().subscribe(user => { this.userManagementService.getUserInfo().subscribe(user => {
this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param]; this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
if(this.portal === 'connect' || this.portal === 'openaire' || this.portal === 'monitor') {
ConnectHelper.setPortalTypeFromPid(this.portal); ConnectHelper.setPortalTypeFromPid(this.portal);
}
this.applyPortalFilter(this.portal); this.applyPortalFilter(this.portal);
this.isPortalAdministrator = Session.isPortalAdministrator(user) && !this.portal; this.isPortalAdministrator = Session.isPortalAdministrator(user) && !this.portal;
}); });

21
dashboard/helpTexts/page-help-content-form.component.html
View File

@ -1,22 +1,23 @@
<div page-content> <div page-content>
<div header> <div header>
<!-- <div class="uk-text-bold">
<span *ngIf="pageId && page">{{page.name}}</span>
</div>-->
<div class="uk-margin-top"> <div class="uk-margin-top">
<a <a routerLink="../" [queryParams]=" { 'pageId': pageId }"
routerLink="../" [queryParams]=" { 'pageId': pageId }" class="uk-text-secondary"> class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
<span class="uk-icon-button small uk-icon uk-button-secondary"> <span class="uk-icon-button uk-icon small uk-button-secondary">
<icon name="arrow_left"></icon></span> <icon name="arrow_left"></icon>
Go back to helptexts list</a> </span>
<span class="space">
Go back to helptexts list
</span>
</a>
</div> </div>
</div> </div>
<div inner> <div inner>
<div class="uk-card-header"> <div class="uk-card-header">
<div class="uk-flex uk-flex-middle uk-child-width-1-1 uk-child-width-1-2@m uk-grid" uk-grid> <div class="uk-flex uk-flex-middle uk-child-width-1-1 uk-child-width-1-2@m uk-grid" uk-grid>
<div> <div>
<div class="uk-text-small uk-text-muted"> {{pageHelpContent?'Update ':'Add new '}} help text</div> <div class="uk-text-small uk-text-muted"> {{pageHelpContent ? 'Update ' : 'Add new '}} help text</div>
<div > <div>
<span *ngIf="page" class="uk-text-bold">{{page.name}}</span> <span *ngIf="page" class="uk-text-bold">{{page.name}}</span>
<span *ngIf="myForm.dirty"> (unsaved changes)</span> <span *ngIf="myForm.dirty"> (unsaved changes)</span>
</div> </div>

131
dashboard/helpTexts/page-help-content-form.component.ts
View File

@ -11,40 +11,43 @@ import {properties} from '../../../../environments/environment';
import {from, Observable, Subscriber, Subscription} from 'rxjs'; import {from, Observable, Subscriber, Subscription} from 'rxjs';
import {HelperFunctions} from '../../utils/HelperFunctions.class'; import {HelperFunctions} from '../../utils/HelperFunctions.class';
import {PageHelpContent} from '../../utils/entities/adminTool/page-help-content'; import {PageHelpContent} from '../../utils/entities/adminTool/page-help-content';
import {ConnectHelper} from "../../connect/connectHelper";
@Component({ @Component({
selector: 'page-content-form', selector: 'page-content-form',
templateUrl: './page-help-content-form.component.html', templateUrl: './page-help-content-form.component.html',
}) })
export class PageContentFormComponent implements OnInit {
export class PageContentFormComponent implements OnInit{
myForm: FormGroup; myForm: FormGroup;
communityPid: string; portal: string;
pageId: string; pageId: string;
pageContentId: string; pageContentId: string;
page: Page; page: Page;
placementsOptions = []; placementsOptions = [];
orderOptions = []; orderOptions = [];
private availablePages : Page[] = []; private availablePages: Page[] = [];
//private errorMessage: string; //private errorMessage: string;
private ckeditorContent : string; private ckeditorContent: string;
public properties:EnvProperties = null; public properties: EnvProperties = null;
public showLoading: boolean = true; public showLoading: boolean = true;
public errorMessage: string = ''; public errorMessage: string = '';
@Input() updateErrorMessage: string = ''; @Input() updateErrorMessage: string = '';
private subs: Subscription[] = []; private subs: Subscription[] = [];
private pageHelpContent: PageHelpContent; private pageHelpContent: PageHelpContent;
constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, private _helpContentService: HelpContentService){}
constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, private _helpContentService: HelpContentService) {
}
ngOnInit() { ngOnInit() {
this.properties = properties; this.properties = properties;
this.subs.push(this.route.params.subscribe(params => { this.subs.push(this.route.params.subscribe(params => {
this.communityPid = params['community']; this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
ConnectHelper.setPortalTypeFromPid(this.portal);
this.subs.push(this.route.queryParams.subscribe(params => { this.subs.push(this.route.queryParams.subscribe(params => {
HelperFunctions.scroll(); HelperFunctions.scroll();
this.pageId = params['pageId']; this.pageId = params['pageId'];
@ -74,6 +77,7 @@ export class PageContentFormComponent implements OnInit{
})); }));
})); }));
} }
ngOnDestroy() { ngOnDestroy() {
this.subs.forEach(value => { this.subs.forEach(value => {
if (value instanceof Subscriber) { if (value instanceof Subscriber) {
@ -81,40 +85,42 @@ export class PageContentFormComponent implements OnInit{
} }
}); });
} }
getInfo(pageId: string){
getInfo(pageId: string) {
this.showLoading = true; this.showLoading = true;
let obs = Observable.zip(this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid), this._helpContentService.getCommunityPageHelpContents(this.communityPid, this.properties.adminToolsAPIURL, pageId)); let obs = Observable.zip(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal), this._helpContentService.getCommunityPageHelpContents(this.portal, this.properties.adminToolsAPIURL, pageId));
this.subs.push(obs.subscribe( this.subs.push(obs.subscribe(
results => { results => {
this.page = results[0]; this.page = results[0];
if(this.properties.adminToolsPortalType != this.page.portalType) { if (this.properties.adminToolsPortalType != this.page.portalType) {
this._router.navigate(['../'], {relativeTo: this.route}); this._router.navigate(['../'], {relativeTo: this.route});
} }
let countPageContents = results[1]?results[1].length:0; let countPageContents = results[1] ? results[1].length : 0;
console.log(results[1]); console.log(results[1]);
for (let content of (results[1] as Array<PageHelpContent>)) { for (let content of (results[1] as Array<PageHelpContent>)) {
// if(content.page['_id'] == pageId){ // if(content.page['_id'] == pageId){
// countPageContents++; // countPageContents++;
if(this.pageContentId && this.pageContentId == content._id) { if (this.pageContentId && this.pageContentId == content._id) {
this.pageHelpContent = content; this.pageHelpContent = content;
// this.pageHelpContent.page = pageId; // this.pageHelpContent.page = pageId;
// this.pageHelpContent.portal = this.communityPid; // this.pageHelpContent.portal = this.communityPid;
} }
// } // }
} }
this.setOptions(this.page, countPageContents + (this.pageHelpContent?0:1)); this.setOptions(this.page, countPageContents + (this.pageHelpContent ? 0 : 1));
if(!this.pageContentId) { if (!this.pageContentId) {
this.myForm = this.form; this.myForm = this.form;
this.initFormWithSelectOptions(); this.initFormWithSelectOptions();
}else{ } else {
this.updateForm(this.pageHelpContent); this.updateForm(this.pageHelpContent);
} }
this.showLoading = false; this.showLoading = false;
}, },
error => this.handleError('System error retrieving page with id: '+pageId, error) error => this.handleError('System error retrieving page with id: ' + pageId, error)
)); ));
} }
/*private getPage(pageId: string) { /*private getPage(pageId: string) {
this.subs.push(this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe( this.subs.push(this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
page => { page => {
@ -162,75 +168,77 @@ export class PageContentFormComponent implements OnInit{
error => this.handleError('System error retrieving page help content', error))); error => this.handleError('System error retrieving page help content', error)));
} }
}*/ }*/
private updateForm(pageHelpContent : PageHelpContent) { private updateForm(pageHelpContent: PageHelpContent) {
this.pageHelpContent = pageHelpContent; this.pageHelpContent = pageHelpContent;
this.myForm = this.form; this.myForm = this.form;
if(this.pageHelpContent) { if (this.pageHelpContent) {
this.myForm.patchValue((pageHelpContent)); this.myForm.patchValue((pageHelpContent));
}else{ } else {
this.initFormWithSelectOptions(); this.initFormWithSelectOptions();
} }
if(this.orderOptions.length ==1){ if (this.orderOptions.length == 1) {
this.myForm.get('order').disable() this.myForm.get('order').disable()
} }
if(this.placementsOptions.length ==1){ if (this.placementsOptions.length == 1) {
this.myForm.get('placement').disable() this.myForm.get('placement').disable()
} }
this.myForm.markAsPristine(); this.myForm.markAsPristine();
} }
initFormWithSelectOptions(){
initFormWithSelectOptions() {
if (this.placementsOptions.length == 1) { if (this.placementsOptions.length == 1) {
this.myForm.get("placement").setValue(this.placementsOptions[0].value); this.myForm.get("placement").setValue(this.placementsOptions[0].value);
} }
this.myForm.get("order").setValue(this.orderOptions[this.orderOptions.length - 1].value); this.myForm.get("order").setValue(this.orderOptions[this.orderOptions.length - 1].value);
if(this.orderOptions.length ==1){ if (this.orderOptions.length == 1) {
this.myForm.get('order').disable() this.myForm.get('order').disable()
} }
if(this.placementsOptions.length ==1){ if (this.placementsOptions.length == 1) {
this.myForm.get('placement').disable() this.myForm.get('placement').disable()
} }
} }
public setOptions(page: Page, countContents:number) {
public setOptions(page: Page, countContents: number) {
this.placementsOptions = []; this.placementsOptions = [];
if(page.top){ if (page.top) {
this.placementsOptions.push({label: "top", value: "top"}); this.placementsOptions.push({label: "top", value: "top"});
} }
if(page.bottom){ if (page.bottom) {
this.placementsOptions.push({label: "bottom", value: "bottom"}); this.placementsOptions.push({label: "bottom", value: "bottom"});
} }
if(page.left){ if (page.left) {
this.placementsOptions.push({label: "left", value: "left"}); this.placementsOptions.push({label: "left", value: "left"});
} }
this.orderOptions = []; this.orderOptions = [];
for(let i=1; i<countContents+1; i++){ for (let i = 1; i < countContents + 1; i++) {
this.orderOptions.push({label: ""+i, value: i}); this.orderOptions.push({label: "" + i, value: i});
} }
} }
public get form() { public get form() {
return this._fb.group({ return this._fb.group({
page : [this.pageId, Validators.required], page: [this.pageId, Validators.required],
portal : this.communityPid, portal: this.portal,
placement : ['', Validators.required], placement: ['', Validators.required],
content : ['', Validators.required], content: ['', Validators.required],
order : [1, Validators.required], order: [1, Validators.required],
isActive : true, isActive: true,
//isPriorTo : false, //isPriorTo : false,
_id : '', _id: '',
}); });
} }
public reset() { public reset() {
this.myForm.patchValue({ this.myForm.patchValue({
page : '', page: '',
portal : this.communityPid, portal: this.portal,
placement : '', placement: '',
content : [''], content: [''],
order : 1, order: 1,
isActive : true, isActive: true,
//isPriorTo : false, //isPriorTo : false,
_id : '' _id: ''
}); });
this.myForm.markAsPristine(); this.myForm.markAsPristine();
} }
@ -243,20 +251,25 @@ export class PageContentFormComponent implements OnInit{
} }
public saveCustom() { public saveCustom() {
if(!Session.isLoggedIn()){ if (!Session.isLoggedIn()) {
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); this._router.navigate(['/user-info'], {
queryParams: {
"errorCode": LoginErrorCodes.NOT_VALID,
"redirectUrl": this._router.url
}
});
} else { } else {
//this.errorMessage = null; //this.errorMessage = null;
if(this.myForm.valid) { if (this.myForm.valid) {
this.showLoading = true; this.showLoading = true;
this.updateErrorMessage = ""; this.updateErrorMessage = "";
this.myForm.get('order').enable(); this.myForm.get('order').enable();
this.myForm.get('placement').enable(); this.myForm.get('placement').enable();
let pageHelpContent : PageHelpContent = this.myForm.value; let pageHelpContent: PageHelpContent = this.myForm.value;
this.subs.push(this._helpContentService.savePageHelpContent(pageHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe( this.subs.push(this._helpContentService.savePageHelpContent(pageHelpContent, this.properties.adminToolsAPIURL, this.portal).subscribe(
_ => { _ => {
this._router.navigate( ['../'], { queryParams: { "pageId": this.pageId }, relativeTo: this.route } ); this._router.navigate(['../'], {queryParams: {"pageId": this.pageId}, relativeTo: this.route});
this.showLoading = false; this.showLoading = false;
}, },
err => this.handleUpdateError('System error saving page content', err) err => this.handleUpdateError('System error saving page content', err)
@ -269,7 +282,7 @@ export class PageContentFormComponent implements OnInit{
} }
public cancelCustom() { public cancelCustom() {
this._router.navigate( ['../'], { queryParams: { "pageId": this.pageId }, relativeTo: this.route } ); this._router.navigate(['../'], {queryParams: {"pageId": this.pageId}, relativeTo: this.route});
} }
public resetCustom() { public resetCustom() {
@ -285,18 +298,20 @@ export class PageContentFormComponent implements OnInit{
this.showLoading = false; this.showLoading = false;
} }
changeStatus(){
changeStatus() {
this.myForm.get('isActive').setValue(!this.myForm.get('isActive').value); this.myForm.get('isActive').setValue(!this.myForm.get('isActive').value);
if(this.pageHelpContent && this.myForm.get('isActive').value != this.pageHelpContent.isActive || !this.pageHelpContent && !this.myForm.get('isActive').value ){ if (this.pageHelpContent && this.myForm.get('isActive').value != this.pageHelpContent.isActive || !this.pageHelpContent && !this.myForm.get('isActive').value) {
this.myForm.get('isActive').markAsDirty(); this.myForm.get('isActive').markAsDirty();
}else{ } else {
this.myForm.get('isActive').markAsPristine() this.myForm.get('isActive').markAsPristine()
} }
} }
contentChanged(){
if(this.pageHelpContent && this.myForm.get('content').value != this.pageHelpContent.content || !this.pageHelpContent && this.myForm.get('content').value != '' ){ contentChanged() {
if (this.pageHelpContent && this.myForm.get('content').value != this.pageHelpContent.content || !this.pageHelpContent && this.myForm.get('content').value != '') {
this.myForm.get('content').markAsDirty(); this.myForm.get('content').markAsDirty();
}else{ } else {
this.myForm.get('content').markAsPristine() this.myForm.get('content').markAsPristine()
} }
} }

11
dashboard/helpTexts/page-help-contents.component.html
View File

@ -8,11 +8,14 @@
<span *ngIf="selectedPageId && page">{{page.name}}</span> <span *ngIf="selectedPageId && page">{{page.name}}</span>
</div> </div>
<div class="uk-margin-top"> <div class="uk-margin-top">
<a <a routerLink="../pages/" class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
routerLink="../pages/" class="uk-text-secondary">
<span class="uk-icon-button small uk-icon uk-button-secondary"> <span class="uk-icon-button small uk-icon uk-button-secondary">
<icon name="arrow_left"></icon></span> <icon name="arrow_left"></icon>
Go back to pages list</a> </span>
<span class="space">
Go back to pages list
</span>
</a>
</div> </div>
<div class="uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid> <div class="uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
<div #searchInputComponent search-input [control]="filterForm" [showSearch]="false" placeholder="Search helptext" <div #searchInputComponent search-input [control]="filterForm" [showSearch]="false" placeholder="Search helptext"

30
dashboard/helpTexts/page-help-contents.component.ts
View File

@ -24,7 +24,6 @@ import {ConnectHelper} from '../../connect/connectHelper';
selector: 'page-help-contents', selector: 'page-help-contents',
templateUrl: './page-help-contents.component.html', templateUrl: './page-help-contents.component.html',
}) })
export class PageHelpContentsComponent implements OnInit { export class PageHelpContentsComponent implements OnInit {
@ViewChild('AlertModalDeletePageHelpContents') alertModalDeletePageHelpContents; @ViewChild('AlertModalDeletePageHelpContents') alertModalDeletePageHelpContents;
@ -47,7 +46,7 @@ export class PageHelpContentsComponent implements OnInit {
public communities: Portal[] = []; public communities: Portal[] = [];
public selectedCommunityPid: string; public portal: string;
public selectedPageId: string; public selectedPageId: string;
@ -78,17 +77,12 @@ export class PageHelpContentsComponent implements OnInit {
this.properties = properties; this.properties = properties;
this.subscriptions.push(this.route.params.subscribe(params => { this.subscriptions.push(this.route.params.subscribe(params => {
this.selectedCommunityPid = params['community']; this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
if(!this.selectedCommunityPid) { ConnectHelper.setPortalTypeFromPid(this.portal);
this.selectedCommunityPid = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
if (this.selectedCommunityPid === 'connect' || this.selectedCommunityPid === 'openaire' || this.selectedCommunityPid === 'monitor') {
ConnectHelper.setPortalTypeFromPid(this.selectedCommunityPid);
}
}
this.subscriptions.push(this.route.queryParams.subscribe(params => { this.subscriptions.push(this.route.queryParams.subscribe(params => {
HelperFunctions.scroll(); HelperFunctions.scroll();
this.selectedPageId = params['pageId']; this.selectedPageId = params['pageId'];
if (this.selectedCommunityPid && this.selectedPageId) { if (this.portal && this.selectedPageId) {
this.getPage(this.selectedPageId); this.getPage(this.selectedPageId);
} }
if(!this.selectedPageId) { if(!this.selectedPageId) {
@ -124,13 +118,13 @@ export class PageHelpContentsComponent implements OnInit {
this.showLoading = true; this.showLoading = true;
this.updateErrorMessage = ""; this.updateErrorMessage = "";
this.errorMessage = ""; this.errorMessage = "";
this.subscriptions.push(this._helpService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe( this.subscriptions.push(this._helpService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal).subscribe(
page => { page => {
if (this.properties.adminToolsPortalType != page.portalType) { if (this.properties.adminToolsPortalType != page.portalType) {
this.router.navigate(['./pageContents'], {queryParams: {"communityId": this.selectedCommunityPid}}); this.router.navigate(['./pageContents'], {queryParams: {"communityId": this.portal}});
} else { } else {
this.page = page; this.page = page;
this.getPageHelpContents(this.selectedCommunityPid); this.getPageHelpContents(this.portal);
} }
}, },
error => this.handleError('System error retrieving page', error))); error => this.handleError('System error retrieving page', error)));
@ -154,7 +148,7 @@ export class PageHelpContentsComponent implements OnInit {
this.subscriptions.push(this._helpService.getCommunityPagesWithPositions(community_pid,this.properties.adminToolsAPIURL).subscribe( this.subscriptions.push(this._helpService.getCommunityPagesWithPositions(community_pid,this.properties.adminToolsAPIURL).subscribe(
pages => { pages => {
this.pages = pages; this.pages = pages;
this.getPageHelpContents(this.selectedCommunityPid); this.getPageHelpContents(this.portal);
this.selectOptions = [{label:'All pages', value: ''}]; this.selectOptions = [{label:'All pages', value: ''}];
for (let page of this.pages) { for (let page of this.pages) {
this.selectOptions.push({label:page.name, value: page._id}) this.selectOptions.push({label:page.name, value: page._id})
@ -271,7 +265,7 @@ export class PageHelpContentsComponent implements OnInit {
this.showLoading = true; this.showLoading = true;
this.updateErrorMessage = ""; this.updateErrorMessage = "";
this.subscriptions.push(this._helpService.deletePageHelpContents(this.selectedPageContents, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe( this.subscriptions.push(this._helpService.deletePageHelpContents(this.selectedPageContents, this.properties.adminToolsAPIURL, this.portal).subscribe(
_ => { _ => {
this.deletePageHelpContentsFromArray(this.selectedPageContents); this.deletePageHelpContentsFromArray(this.selectedPageContents);
this.showLoading = false; this.showLoading = false;
@ -297,7 +291,7 @@ export class PageHelpContentsComponent implements OnInit {
this.router.navigate(['edit/'], { this.router.navigate(['edit/'], {
queryParams: { queryParams: {
"pageContentId": id, "pageContentId": id,
"communityId": this.selectedCommunityPid, "communityId": this.portal,
"pageId": this.selectedPageId "pageId": this.selectedPageId
}, relativeTo: this.route }, relativeTo: this.route
}); });
@ -305,7 +299,7 @@ export class PageHelpContentsComponent implements OnInit {
this.router.navigate(['edit/'], { this.router.navigate(['edit/'], {
queryParams: { queryParams: {
"pageContentId": id, "pageContentId": id,
"communityId": this.selectedCommunityPid "communityId": this.portal
}, relativeTo: this.route }, relativeTo: this.route
}); });
} }
@ -322,7 +316,7 @@ export class PageHelpContentsComponent implements OnInit {
} else { } else {
this.updateErrorMessage = ""; this.updateErrorMessage = "";
this.subscriptions.push(this._helpService.togglePageHelpContents(ids, status, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe( this.subscriptions.push(this._helpService.togglePageHelpContents(ids, status, this.properties.adminToolsAPIURL, this.portal).subscribe(
() => { () => {
for (let id of ids) { for (let id of ids) {
let i = this.checkboxes.findIndex(_ => _.pageHelpContent._id == id); let i = this.checkboxes.findIndex(_ => _.pageHelpContent._id == id);

13
dashboard/page/pages.component.html
View File

@ -28,19 +28,18 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="!showLoading && checkboxes.length > 0"
<div *ngIf="checkboxes.length > 0" class="uk-padding uk-padding-remove-bottom uk-padding-remove-top uk-margin-remove-top uk-margin-small-bottom uk-display-inline"
class="uk-padding uk-padding-remove-bottom uk-padding-remove-top uk-margin-remove-top uk-margin-small-bottom" [attr.uk-tooltip]="getSelectedPages().length == 0 ? 'pos:left; cls: uk-active' : null"
[attr.uk-tooltip]="getSelectedPages().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'" title="Select at least one page"><input id="checkAll" type="checkbox" (click)="selectAll()"
title="Select at least one help text"><input id="checkAll" type="checkbox" (click)="selectAll()"
[ngModel]="getSelectedPages().length ==checkboxes.length"/> [ngModel]="getSelectedPages().length ==checkboxes.length"/>
<span *ngIf="getSelectedPages().length > 0" class="uk-margin-left uk-text-muted"> <span *ngIf="getSelectedPages().length > 0" class="uk-margin-left uk-text-muted">
{{getSelectedPages().length}} pages selected </span> {{getSelectedPages().length}} pages selected </span>
<a class="uk-margin-left ">Actions </a> <a class="uk-margin-left">Actions</a>
<div uk-dropdown="mode: click"> <div uk-dropdown="mode: click">
<ul class="uk-nav uk-dropdown-nav" <ul class="uk-nav uk-dropdown-nav"
[attr.uk-tooltip]="getSelectedPages().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'" [attr.uk-tooltip]="getSelectedPages().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
title="Select at least one help text"> title="Select at least one page">
<li *ngIf="!isPortalAdministrator"><a [class]="getSelectedPages().length == 0 ? 'uk-disabled' : ''" <li *ngIf="!isPortalAdministrator"><a [class]="getSelectedPages().length == 0 ? 'uk-disabled' : ''"
(click)="togglePages(true,getSelectedPages())"><i></i> Enable (click)="togglePages(true,getSelectedPages())"><i></i> Enable
</a></li> </a></li>

2
dashboard/page/pages.component.ts
View File

@ -91,9 +91,7 @@ export class PagesComponent implements OnInit {
this.filterForm.get('type').setValue(params['type']); this.filterForm.get('type').setValue(params['type']);
} }
this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param]; this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
if (this.portal === 'connect' || this.portal === 'openaire' || this.portal === 'monitor') {
ConnectHelper.setPortalTypeFromPid(this.portal); ConnectHelper.setPortalTypeFromPid(this.portal);
}
this.keyword = ''; this.keyword = '';
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.applyPortalFilter(this.portal); this.applyPortalFilter(this.portal);