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

Merge pull request 'Merge Changes from Develop' (#28) from develop into angular-16-irish-monitor 

Reviewed-on: #28
This commit is contained in:
Konstantinos Triantafyllou 2024-01-05 10:32:32 +01:00
parent 9709062383 84c2451521
commit 367bdc3092
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
landingPages/dataProvider/dataProvider.component.html
View File

@ -188,7 +188,7 @@
</div> </div>
<div *ngIf="dataProviderInfo && hasMetrics" class="uk-width-1-1 uk-width-medium@s"> <div *ngIf="dataProviderInfo && hasMetrics" class="uk-width-1-1 uk-width-medium@s">
<div class="landing-metrics-card uk-text-small uk-flex uk-padding-small"> <div class="landing-metrics-card uk-text-small uk-flex uk-padding-small">
<div class="uk-width-expand uk-flex uk-flex-middle"> <div class="uk-width-expand uk-flex uk-flex-top">
<div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell"> <div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell">
<div> <div>
<ng-container> <ng-container>

2
landingPages/project/project.component.html
View File

@ -321,7 +321,7 @@
</div> </div>
<div *ngIf="projectInfo && hasMetrics" class="uk-width-1-1 uk-width-medium@s"> <div *ngIf="projectInfo && hasMetrics" class="uk-width-1-1 uk-width-medium@s">
<div class="landing-metrics-card uk-text-small uk-flex uk-padding-small"> <div class="landing-metrics-card uk-text-small uk-flex uk-padding-small">
<div class="uk-width-expand uk-flex uk-flex-middle"> <div class="uk-width-expand uk-flex uk-flex-top">
<div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell"> <div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell">
<div> <div>
<ng-container> <ng-container>

2
landingPages/result/resultLanding.component.html
View File

@ -386,7 +386,7 @@
<div *ngIf="resultLandingInfo && resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length) && !viewAll" <div *ngIf="resultLandingInfo && resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length) && !viewAll"
class="uk-margin-medium-top uk-padding uk-padding-remove-vertical"> class="uk-margin-medium-top uk-padding uk-padding-remove-vertical">
<div class="landing-metrics-card uk-text-small uk-flex uk-padding-small"> <div class="landing-metrics-card uk-text-small uk-flex uk-padding-small">
<div class="uk-width-expand uk-flex uk-flex-middle"> <div class="uk-width-expand uk-flex uk-flex-top">
<div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell"> <div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell">
<div> <div>
<ng-container *ngIf="resultLandingInfo.measure.bip.length"> <ng-container *ngIf="resultLandingInfo.measure.bip.length">

4
searchPages/find/searchAll.component.ts
View File

@ -444,7 +444,7 @@ export class SearchAllComponent {
this.fetchDataproviders.results = []; this.fetchDataproviders.results = [];
this.reload["datasources"] = false; this.reload["datasources"] = false;
// this.fetchDataproviders.getNumForSearch(this.keyword, this.properties, refineParams); // this.fetchDataproviders.getNumForSearch(this.keyword, this.properties, refineParams);
this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("datasources",this.keyword,"q","="):"", this.properties, refineParams).subscribe( this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("dataprovider",this.keyword,"q","="):"", this.properties, refineParams).subscribe(
data => { data => {
this.fetchDataproviders.searchUtils.totalResults = data; this.fetchDataproviders.searchUtils.totalResults = data;
this.fetchDataproviders.searchUtils.status = this.errorCodes.DONE; this.fetchDataproviders.searchUtils.status = this.errorCodes.DONE;
@ -463,7 +463,7 @@ export class SearchAllComponent {
if (this.activeEntity != "services" && this.reload["services"] && this.showServices) { if (this.activeEntity != "services" && this.reload["services"] && this.showServices) {
this.fetchServices.results = []; this.fetchServices.results = [];
this.reload["services"] = false; this.reload["services"] = false;
this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("datasources",this.keyword,"q","="):"", this.properties, refineParams, "services").subscribe( this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("service",this.keyword,"q","="):"", this.properties, refineParams, "services").subscribe(
data => { data => {
this.fetchServices.searchUtils.totalResults = data; this.fetchServices.searchUtils.totalResults = data;
this.fetchServices.searchUtils.status = this.errorCodes.DONE; this.fetchServices.searchUtils.status = this.errorCodes.DONE;