Merge Angular 16 Irish Monitor to develop #33
|
@ -55,7 +55,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ng-template #stakeholderBox let-stakeholder="stakeholder">
|
<ng-template #stakeholderBox let-stakeholder="stakeholder">
|
||||||
<div *ngIf="stakeholder">
|
<div *ngIf="stakeholder">
|
||||||
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
|
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
|
||||||
|
|
|
@ -15,6 +15,7 @@ import {properties} from "src/environments/environment";
|
||||||
import {ActivatedRoute} from "@angular/router";
|
import {ActivatedRoute} from "@angular/router";
|
||||||
import {CacheIndicatorsService} from "../utils/cache-indicators/cache-indicators.service";
|
import {CacheIndicatorsService} from "../utils/cache-indicators/cache-indicators.service";
|
||||||
import {NotificationHandler} from "../../utils/notification-handler";
|
import {NotificationHandler} from "../../utils/notification-handler";
|
||||||
|
import {BaseComponent} from "../../sharedComponents/base/base.component";
|
||||||
|
|
||||||
type Tab = 'all' | 'templates'| 'profiles';
|
type Tab = 'all' | 'templates'| 'profiles';
|
||||||
|
|
||||||
|
@ -25,9 +26,7 @@ declare var UIkit;
|
||||||
templateUrl: "./manageStakeholders.component.html",
|
templateUrl: "./manageStakeholders.component.html",
|
||||||
styleUrls: ["./manageStakeholders.component.less"]
|
styleUrls: ["./manageStakeholders.component.less"]
|
||||||
})
|
})
|
||||||
export class ManageStakeholdersComponent implements OnInit, OnDestroy {
|
export class ManageStakeholdersComponent extends BaseComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
public properties: EnvProperties;
|
|
||||||
public loading: boolean = true;
|
public loading: boolean = true;
|
||||||
public deleteLoading: boolean = false;
|
public deleteLoading: boolean = false;
|
||||||
public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
|
public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
|
||||||
|
@ -57,7 +56,6 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
|
||||||
/**
|
/**
|
||||||
* Grid or List View
|
* Grid or List View
|
||||||
*/
|
*/
|
||||||
private subscriptions: any[] = [];
|
|
||||||
@ViewChild('editStakeholderModal', { static: true }) editStakeholderModal: AlertModal;
|
@ViewChild('editStakeholderModal', { static: true }) editStakeholderModal: AlertModal;
|
||||||
@ViewChild('deleteStakeholderModal', { static: true }) deleteStakeholderModal: AlertModal;
|
@ViewChild('deleteStakeholderModal', { static: true }) deleteStakeholderModal: AlertModal;
|
||||||
@ViewChild('editStakeholderComponent', { static: true }) editStakeholderComponent: EditStakeholderComponent;
|
@ViewChild('editStakeholderComponent', { static: true }) editStakeholderComponent: EditStakeholderComponent;
|
||||||
|
@ -65,15 +63,16 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
|
||||||
constructor(private stakeholderService: StakeholderService,
|
constructor(private stakeholderService: StakeholderService,
|
||||||
private cacheIndicatorsService: CacheIndicatorsService,
|
private cacheIndicatorsService: CacheIndicatorsService,
|
||||||
private userManagementService: UserManagementService,
|
private userManagementService: UserManagementService,
|
||||||
private route: ActivatedRoute,
|
protected _route: ActivatedRoute,
|
||||||
private title: Title,
|
protected _title: Title,
|
||||||
private fb: UntypedFormBuilder) {
|
private fb: UntypedFormBuilder) {
|
||||||
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.buildFilters();
|
this.buildFilters();
|
||||||
this.properties = properties;
|
this.title = 'Manage Profiles';
|
||||||
this.title.setTitle('Manage profiles');
|
this.setMetadata();
|
||||||
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
||||||
this.user = user;
|
this.user = user;
|
||||||
}));
|
}));
|
||||||
|
@ -94,21 +93,10 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
|
||||||
this.subscriptions.forEach(value => {
|
|
||||||
if (value instanceof Subscriber) {
|
|
||||||
value.unsubscribe();
|
|
||||||
} else if (value instanceof Function) {
|
|
||||||
value();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
hide(element: any) {
|
hide(element: any) {
|
||||||
UIkit.dropdown(element).hide();
|
UIkit.dropdown(element).hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private buildFilters() {
|
private buildFilters() {
|
||||||
this.filters = this.fb.group({
|
this.filters = this.fb.group({
|
||||||
status: this.fb.control('all'),
|
status: this.fb.control('all'),
|
||||||
|
|
|
@ -1,19 +1,24 @@
|
||||||
import {Directive, OnDestroy} from "@angular/core";
|
import {Directive, OnDestroy} from "@angular/core";
|
||||||
import {Subscriber} from "rxjs";
|
import {BehaviorSubject, Subscriber} from "rxjs";
|
||||||
import {EnvProperties} from "../../utils/properties/env-properties";
|
import {EnvProperties} from "../../utils/properties/env-properties";
|
||||||
import {properties} from "src/environments/environment";
|
import {properties} from "src/environments/environment";
|
||||||
import {PiwikService} from "../../utils/piwik/piwik.service";
|
import {PiwikService} from "../../utils/piwik/piwik.service";
|
||||||
import {Meta, Title} from "@angular/platform-browser";
|
import {Meta, Title} from "@angular/platform-browser";
|
||||||
import {SEOService} from "../SEO/SEO.service";
|
import {SEOService} from "../SEO/SEO.service";
|
||||||
import {Router} from "@angular/router";
|
import {ActivatedRoute, Data, NavigationEnd, Params, Router} from "@angular/router";
|
||||||
|
|
||||||
@Directive()
|
@Directive()
|
||||||
export abstract class BaseComponent implements OnDestroy {
|
export abstract class BaseComponent implements OnDestroy {
|
||||||
public properties: EnvProperties = properties;
|
public properties: EnvProperties = properties;
|
||||||
|
/** Router params */
|
||||||
|
protected paramsResolved: boolean = false;
|
||||||
|
protected params: BehaviorSubject<Params>;
|
||||||
|
protected data: BehaviorSubject<Data>;
|
||||||
protected subscriptions: any[] = [];
|
protected subscriptions: any[] = [];
|
||||||
/** Metadata */
|
/** Metadata */
|
||||||
public title: string;
|
public title: string;
|
||||||
public description: string;
|
public description: string;
|
||||||
|
protected _route: ActivatedRoute;
|
||||||
protected _piwikService: PiwikService;
|
protected _piwikService: PiwikService;
|
||||||
protected _meta: Meta;
|
protected _meta: Meta;
|
||||||
protected seoService: SEOService;
|
protected seoService: SEOService;
|
||||||
|
@ -37,14 +42,46 @@ export abstract class BaseComponent implements OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize router params and data (should be called in the constructor)
|
||||||
|
* */
|
||||||
|
initRouterParams(route: ActivatedRoute = null) {
|
||||||
|
if (route) {
|
||||||
|
this.params = new BehaviorSubject<Params>(null);
|
||||||
|
this.data = new BehaviorSubject<Data>(null);
|
||||||
|
this.subscriptions.push(this._router.events.subscribe(event => {
|
||||||
|
if (event instanceof NavigationEnd) {
|
||||||
|
let r = route;
|
||||||
|
while (r.firstChild) {
|
||||||
|
r = r.firstChild;
|
||||||
|
}
|
||||||
|
this.paramsResolved = true;
|
||||||
|
this.params.next(r.snapshot.params);
|
||||||
|
this.data.next(r.snapshot.data);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public setMetadata() {
|
public setMetadata() {
|
||||||
|
if (this._title && this.title) {
|
||||||
|
this.title = (this._route?.snapshot.data?.title ? this._route.snapshot.data?.title : '') + this.title;
|
||||||
|
this._title.setTitle(this.title);
|
||||||
|
}
|
||||||
|
if (this._router) {
|
||||||
const url = properties.domain + properties.baseLink + this._router.url;
|
const url = properties.domain + properties.baseLink + this._router.url;
|
||||||
|
if (this.seoService) {
|
||||||
this.seoService.createLinkForCanonicalURL(url, false);
|
this.seoService.createLinkForCanonicalURL(url, false);
|
||||||
|
}
|
||||||
|
if (this._meta) {
|
||||||
this._meta.updateTag({content: url}, "property='og:url'");
|
this._meta.updateTag({content: url}, "property='og:url'");
|
||||||
this._meta.updateTag({content: this.description}, "name='description'");
|
this._meta.updateTag({content: this.description}, "name='description'");
|
||||||
this._meta.updateTag({content: this.description}, "property='og:description'");
|
this._meta.updateTag({content: this.description}, "property='og:description'");
|
||||||
this._meta.updateTag({content: this.title}, "property='og:title'");
|
this._meta.updateTag({content: this.title}, "property='og:title'");
|
||||||
this._title.setTitle(this.title);
|
}
|
||||||
|
}
|
||||||
|
if (this._piwikService) {
|
||||||
this.subscriptions.push(this._piwikService.trackView(properties, this.title).subscribe());
|
this.subscriptions.push(this._piwikService.trackView(properties, this.title).subscribe());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue