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

[angular-16-irish-monitor | WIP]: Add optional extend-theme variables import in all component less files. Add relativeTo in slider tabs

This commit is contained in:
Konstantinos Triantafyllou 2023-11-15 10:35:44 +02:00
parent a8c91dc04c
commit 920f3a454a
12 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor-admin/manageStakeholders/manageStakeholders.component.less
View File

@ -1,4 +1,5 @@
@import (reference) "~src/assets/openaire-theme/less/color.less";
@import (optional) "~src/assets/extend-theme/less/color.less";
.setType(@color) {
border-bottom: 4px solid fade(@color, 30%);
@ -20,4 +21,12 @@
&.organization {
.setType(@organization-color);
}
&.country {
.setType(@country-color);
}
&.datasource {
.setType(@datasource-color);
}
}

1
monitor-admin/topic/indicators.component.less
View File

@ -1,4 +1,5 @@
@import (reference) "~src/assets/openaire-theme/less/_import-variables";
@import (optional) "~src/assets/extend-theme/less/_import-variables";
.number-preview {
border: @global-border-width solid @global-border;

1
monitor-admin/topic/indicators.component.ts
View File

@ -1225,6 +1225,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
let duplicates = 0;
charts = this.migrateFromOldImportJsonFile(charts);
for (let chart of charts) {
chart.visibility = this.showVisibility?chart.visibility:this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities);
if (!sectionsToSave[chart['sectionIndex']]) {
let sectionToSave = new Section(chart['sectionType'] ? chart['sectionType'] : chart['type'], chart['sectionTitle']);
sectionToSave.indicators = [];

4
monitor-admin/topic/topic.component.ts
View File

@ -659,10 +659,6 @@ export class TopicComponent extends StakeholderBaseComponent implements OnInit,
});
}
private navigateToError() {
this._router.navigate([this.properties.errorLink], {queryParams: {'page': this._router.url}});
}
get isCurator(): boolean {
return Session.isPortalAdministrator(this.user) || Session.isCurator(this.stakeholder.type, this.user);
}

4
monitor-admin/utils/stakeholder-base.component.ts
View File

@ -26,6 +26,10 @@ export abstract class StakeholderBaseComponent extends BaseComponent {
get showLocale() {
return this.stakeholderUtils.showField(this.stakeholderUtils.locales);
}
protected navigateToError() {
this._router.navigate([this.properties.errorLink], {queryParams: {'page': this._router.url}});
}
}
@Directive()

5
monitor/monitor-indicator-stakeholder-base.component.ts
View File

@ -204,6 +204,7 @@ export abstract class MonitorIndicatorStakeholderBaseComponent extends Indicator
//clear numbers when filters change
this.numberResults.clear();
let urls: Map<string, [number, number][]> = new Map<string, [number, number][]>();
console.log(this.activeSubCategory.numbers);
this.activeSubCategory.numbers.forEach((section, i) => {
section.indicators.forEach((number, j) => {
if (this.hasPermission(number.visibility)) {
@ -255,10 +256,6 @@ export abstract class MonitorIndicatorStakeholderBaseComponent extends Indicator
}
}
protected navigateToError() {
this._router.navigate([this.properties.errorLink], {queryParams: {'page': this._router.url}});
}
public getUrlByStakeHolder(indicatorPath: IndicatorPath) {
return this.sanitizer.bypassSecurityTrustResourceUrl(
this.indicatorUtils.getChartUrl(indicatorPath.source, this.getFullUrl(indicatorPath)));

3
notifications/notifications-sidebar/notification-sidebar.component.less
View File

@ -1,4 +1,5 @@
@import "~src/assets/openaire-theme/less/_import-variables";
@import (reference) "~src/assets/openaire-theme/less/_import-variables";
@import (optional) "~src/assets/extend-theme/less/_import-variables";
#notifications-switcher {
top: 480px !important;

1
sdg/sdg.component.less
View File

@ -1,4 +1,5 @@
@import (reference) "~src/assets/openaire-theme/less/_import-variables";
@import (optional) "~src/assets/extend-theme/less/_import-variables";
@sdgs: #E6233D, #DF9F00, #19A220, #D70023, #FF0B00, #00BFE8, #FFC300, #B10240, #FF5D00,
#F50D86, #FF8A00, #CA8A03, #2B772B, #0098DF, #00B91C, #0069A2, #1C336A;

3
searchPages/searchUtils/portal-search-result.component.less
View File

@ -1,5 +1,6 @@
@import (reference) "~src/assets/openaire-theme/less/color.less";
@import (reference) "~src/assets/openaire-theme/less/_import-variables.less";
@import (optional) "~src/assets/extend-theme/less/_import-variables.less";
.setType(@color, @position: left) {
border-@{position}: 4px solid fade(@color, 30%);

5
sharedComponents/base/base.component.ts
View File

@ -45,12 +45,15 @@ export abstract class BaseComponent implements OnDestroy {
/**
* Initialize router params and data (should be called in the constructor of a component with router-outlet)
* */
initRouterParams(route: ActivatedRoute = null) {
initRouterParams(route: ActivatedRoute = null, navigationChange: ((event: NavigationEnd) => void) = 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) {
if(navigationChange) {
navigationChange(event);
}
let r = route;
while (r.firstChild) {
r = r.firstChild;

3
sharedComponents/tabs/slider-tab.component.ts
View File

@ -1,4 +1,5 @@
import {Component, Input} from "@angular/core";
import {ActivatedRoute} from "@angular/router";
@Component({
selector: 'slider-tab',
@ -22,4 +23,6 @@ export class SliderTabComponent {
@Input()
public customClass: string = '';
@Input() tabTemplate: any;
@Input()
public relativeTo: ActivatedRoute = null;
}

4
sharedComponents/tabs/slider-tabs.component.ts
View File

@ -43,7 +43,7 @@ declare var UIkit;
</ng-container>
<ng-container *ngIf="type === 'dynamic'">
<li *ngFor="let tab of leftTabs; let i=index;" [class.uk-active]="tab.active" [style.max-width]="(position === 'horizontal')?'50%':null">
<a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass"
<a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass" [relativeTo]="tab.relativeTo"
(click)="showActive(i)"
class="uk-text-capitalize uk-text-truncate uk-display-block">
<span *ngIf="tab.title">{{tab.title}}</span>
@ -52,7 +52,7 @@ declare var UIkit;
</li>
<li *ngFor="let tab of rightTabs; let i=index;" [style.max-width]="(position === 'horizontal')?'50%':null" [class.uk-active]="tab.active"
[ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''">
<a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass"
<a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass" [relativeTo]="tab.relativeTo"
(click)="showActive(i)"
class="uk-text-capitalize uk-text-truncate uk-display-block">
<span *ngIf="tab.title">{{tab.title}}</span>