From 5bfc4d8f22d273accbb81983c4114affaa42e264 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 31 Mar 2023 13:28:35 +0300 Subject: [PATCH] fix z-index problem with tooltip in metrics box, add message for no match in filter-search, removed access mode 'not available' question-mark icon from search page and landing --- .../dataProvider/dataProvider.component.html | 1416 ++++++++--------- .../landing-utils/parsingFunctions.class.ts | 19 +- landingPages/project/project.component.html | 1406 ++++++++-------- .../result/resultLanding.component.html | 810 +++++----- .../searchUtils/searchFilter.component.html | 12 +- .../searchUtils/searchFilter.component.ts | 18 +- 6 files changed, 1849 insertions(+), 1832 deletions(-) diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index dc1b08e1..0bf1e437 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -7,13 +7,13 @@
- -
- -
- - - Powered by - OpenAIRE Research Graph - - - . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} - -
- -
- See an issue? - Report it here -
-
- + +
+ +
+ + + Powered by + OpenAIRE Research Graph + + + . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} + +
+ +
+ See an issue? + Report it here +
+
+ -
- -
+
+ +
-
- -
- -
- -
-
- -
-
-
-
- - - - Share - -
-
-
-
- -
- -
-
-
- - - -
- -
- - - - - - - - - - - -
- Web page: - - {{dataProviderInfo.title.url}} - -
- - -
- -
-
-
-
-
-
-
-
-
-
-
-
+
+ +
+ +
+ +
+
+ +
+
+
+
+ + + + Share + +
+
+
+
+ +
+ +
+
+
+ + + +
+ +
+ + + + + + + + + + + +
+ Web page: + + {{dataProviderInfo.title.url}} + +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+
Downloads
-
+
Views
-
+
-
-
+
+
-
-
{{formatNumber(totalDownloads)}}
-
{{formatNumber(totalViews)}}
-
-
-
-
- Metrics badge -
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- +
+
{{formatNumber(totalDownloads)}}
+
{{formatNumber(totalViews)}}
+
+
+
+
+ Metrics badge +
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
@@ -323,183 +323,183 @@
- -
- - -
- Web page: - - {{dataProviderInfo.title.url}} - -
-
- -
+ +
+ + +
+ Web page: + + {{dataProviderInfo.title.url}} + +
+
+ +
-
-
- -
- Summary - -
-
- - -
- {{openaireEntities.PROJECTS}} - -
-
- - -
- {{openaireEntities.DATASOURCES}} - -
-
- - -
- {{openaireEntities.PUBLICATIONS}} - -
-
- - -
- {{openaireEntities.DATASETS}} - -
-
- - -
- {{openaireEntities.SOFTWARE}} - -
-
- - -
- {{openaireEntities.OTHER}} - -
-
- - -
- Related {{openaireEntities.DATASOURCES}} - -
-
- - -
- Statistics - -
-
- -
-
-
- -
-
- +
+
+ +
+ Summary + +
+
+ + +
+ {{openaireEntities.PROJECTS}} + +
+
+ + +
+ {{openaireEntities.DATASOURCES}} + +
+
+ + +
+ {{openaireEntities.PUBLICATIONS}} + +
+
+ + +
+ {{openaireEntities.DATASETS}} + +
+
+ + +
+ {{openaireEntities.SOFTWARE}} + +
+
+ + +
+ {{openaireEntities.OTHER}} + +
+
+ + +
+ Related {{openaireEntities.DATASOURCES}} + +
+
+ + +
+ Statistics + +
+
+ +
+
+
+ +
+
+
+ (click)="openFsModal(addThisFsModal, 'Share this '+openaireEntities.DATASOURCE+' in your social networks')"> Share
-
+
-
-
- - - -
-
+
+
+ + + +
+
- + - + - + - + - + - + - + - + - - - + + + - +
-
+ [large]="true"> +
@@ -524,8 +524,8 @@ [attr.uk-tooltip]="organization.acronym && organization.name ? 'pos:right; delay:10' : 'cls: uk-invisible'" [title]="organization.name"> + [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" + [routerLink]="properties.searchLinkToOrganization.split('?')[0]"> {{(organization.acronym) ? organization.acronym : ''}} {{(!organization.acronym && organization.name) ? organization.name : ''}} @@ -544,335 +544,335 @@ -
-
-
-
- No summary information available -
-
-
- -
-
-
Description
-
-
-
-
- - View more - -
-
-
+
+
+
+
+ No summary information available +
+
+
+ +
+
+
Description
+
+
+
+
+ + View more + +
+
+
- + - -
- -
Collected full-texts
- {{dataProviderInfo.aggregationStatus.fulltexts | number}} - - -
Results with funding information
- {{dataProviderInfo.fundedContent | number}} - -
- - -
-
Countries
- {{dataProviderInfo.countries.join(", ")}} -
- -
-
Jurisdiction
- {{dataProviderInfo.jurisdiction}} -
- -
-
Content policy
- {{dataProviderInfo.contentpolicy}} -
- + +
+ +
Collected full-texts
+ {{dataProviderInfo.aggregationStatus.fulltexts | number}} + + +
Results with funding information
+ {{dataProviderInfo.fundedContent | number}} + +
+ + +
+
Countries
+ {{dataProviderInfo.countries.join(", ")}} +
+ +
+
Jurisdiction
+ {{dataProviderInfo.jurisdiction}} +
+ +
+
Content policy
+ {{dataProviderInfo.contentpolicy}} +
+ - -
-
-
Subjects
- - {{dataProviderInfo.subjects.slice(0, lessBtnSubjects ? dataProviderInfo.subjects.length : thresholdSubjects).join(", ")}} - ... - - - {{dataProviderInfo.subjects.join(", ")}} - -
-
- - View all {{dataProviderInfo.subjects.length | number}} subjects - -
-
- View less subjects -
-
-
-
-
-
-
-
OAI-PMH
- - {{dataProviderInfo.oaiPmhURL}} - -
-
-
Detailed information @
- - - {{provenance}} - - - {{provenance}} - - [{{i}}] - - - , - -
-
-
-
{{openaireEntities.ORGANIZATIONS}}
- + +
+
+
Subjects
+ + {{dataProviderInfo.subjects.slice(0, lessBtnSubjects ? dataProviderInfo.subjects.length : thresholdSubjects).join(", ")}} + ... + + + {{dataProviderInfo.subjects.join(", ")}} + +
+
+ + View all {{dataProviderInfo.subjects.length | number}} subjects + +
+
+ View less subjects +
+
+
+
+
+
+
+
OAI-PMH
+ + {{dataProviderInfo.oaiPmhURL}} + +
+
+
Detailed information @
+ + + {{provenance}} + + + {{provenance}} + + [{{i}}] + + + , + +
+
+
+
{{openaireEntities.ORGANIZATIONS}}
+ -
- - View all {{dataProviderInfo.organizations.length | number}} organizations - -
-
- View less organizations -
-
-
-
-
-
+
+ + View all {{dataProviderInfo.organizations.length | number}} organizations + +
+
+ View less organizations +
+
+
+
+
+
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
-
Statistics
- -
- - -
-
+
+
Statistics
+ +
+ + +
+
-
- -
    - -
  • -
    -
    -
    -
    +
    + +
      + +
    • +
      +
      +
      +
      OpenAIRE UsageCounts -
      - Usage by - +
      + Usage by + UsageCounts -
      -
      - - - - - - - - - - - - - -
      - - - Downloads - - {{formatNumber(totalDownloads)}} -
      - - - Views - - {{formatNumber(totalViews)}} -
      -
      -
      -
    -
    • - -
  • -
    -
    -
    -
    {{formatNumber(totalDownloads)}}
    -
    Downloads
    -
    -
    -
    {{formatNumber(totalViews)}}
    -
    Views
    -
    -
    - -
    - -
    -
    - - -
    -     -
    -
    - Powered by +
    +
    + + + + + + + + + + + + + +
    + + + Downloads + + {{formatNumber(totalDownloads)}} +
    + + + Views + + {{formatNumber(totalViews)}} +
    +
    +
+
+ + +
  • +
    +
    +
    +
    {{formatNumber(totalDownloads)}}
    +
    Downloads
    +
    +
    +
    {{formatNumber(totalViews)}}
    +
    Views
    +
    +
    + +
    + +
    +
    + + +
    +     +
    +
    + Powered by OpenAIRE UsageCounts -
    -
    • - -
    + + + + diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index 97ef4895..20e85f19 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -38,7 +38,7 @@ export class ParsingFunctions { public open = 'open_access'; public closed = 'closed_access'; - public unknown = 'question_mark'; + // public unknown = 'question_mark'; private instanceWithDoiExists: boolean = false; @@ -194,7 +194,7 @@ export class ParsingFunctions { } available.downloadUrl = properties.doiURL + identifiers.get("doi")[0]; - available.accessRightIcon = this.unknown; + // available.accessRightIcon = this.unknown; /* if(title != undefined && title['url'] == "") { title['url'] = url; @@ -355,14 +355,17 @@ export class ParsingFunctions { if (available.accessRight) { if (available.accessRight.toLowerCase().indexOf('open') !== -1) { available.accessRightIcon = this.open; - } else if (available.accessRight.toLowerCase().indexOf('not available') !== -1) { - available.accessRightIcon = this.unknown; - } else { + } + // else if (available.accessRight.toLowerCase().indexOf('not available') !== -1) { + // available.accessRightIcon = this.unknown; + // } + else { available.accessRightIcon = this.closed; } - } else { - available.accessRightIcon = this.unknown; - } + } + // else { + // available.accessRightIcon = this.unknown; + // } if (instance.hasOwnProperty("license")) { available.license = Array.isArray(instance['license']) ? instance['license'][0] : instance['license']; diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index e170b407..4355125e 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -96,359 +96,359 @@
    + uk-sticky="bottom: true;" [attr.offset]="graph_offset">
    -
    +
    -
    - -
    - -
    -
    +
    + +
    + +
    +
    - -
    -
    -
    -
    - - - - Link to - - - - Share - - - - Deposit - - - - Embed - - - - Download - -
    -
    -
    -
    - -
    - -
    -
    -
    - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    - -
    - - - - - - - -
    -
    -
    - - Funder: - {{projectInfo.funding.funderName}} - - - Project code: - {{projectInfo.funding.code}} - - - Call for proposal: - {{projectInfo.funding.callIdentifier}} - -
    -
    - - Funded under: - {{projectInfo.funding.fundingStream}} - - - Overall Budget: - {{projectInfo.funding.budget | number}} - {{projectInfo.funding.currency}} - - - Funder Contribution: - {{projectInfo.funding.contribution | number}} - {{projectInfo.funding.currency}} - -
    -
    - - -
    - - {{projectInfo.urlInfo}} - -
    -
    -
    Open Access mandate
    -
    - - {{openaireEntities.PUBLICATIONS}}: - No - - - {{openaireEntities.DATASETS}}: - No - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    + +
    +
    +
    +
    + + + + Link to + + + + Share + + + + Deposit + + + + Embed + + + + Download + +
    +
    +
    +
    + +
    + +
    +
    +
    + + + +
    +
    + + + + + +
    +
    + + + + + +
    +
    + + + + + +
    +
    + + + + + +
    + +
    + + + + + + + +
    +
    +
    + + Funder: + {{projectInfo.funding.funderName}} + + + Project code: + {{projectInfo.funding.code}} + + + Call for proposal: + {{projectInfo.funding.callIdentifier}} + +
    +
    + + Funded under: + {{projectInfo.funding.fundingStream}} + + + Overall Budget: + {{projectInfo.funding.budget | number}} + {{projectInfo.funding.currency}} + + + Funder Contribution: + {{projectInfo.funding.contribution | number}} + {{projectInfo.funding.currency}} + +
    +
    + + +
    + + {{projectInfo.urlInfo}} + +
    +
    +
    Open Access mandate
    +
    + + {{openaireEntities.PUBLICATIONS}}: + No + + + {{openaireEntities.DATASETS}}: + No + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    Downloads
    -
    +
    Views
    -
    +
    -
    -
    +
    +
    -
    -
    {{formatNumber(totalDownloads)}}
    -
    {{formatNumber(totalViews)}}
    -
    -
    -
    -
    - Metrics badge -
    -
    -
    -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    -
    - -
    - +
    +
    {{formatNumber(totalDownloads)}}
    +
    {{formatNumber(totalViews)}}
    +
    +
    +
    +
    + Metrics badge +
    +
    +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + +
    +
    + +
    + - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - -
    -
    + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + + +
    +
    @@ -459,179 +459,179 @@
    - -
    - - -
    -
    - -
    - Summary - -
    -
    -     - -
    - {{openaireEntities.PUBLICATIONS}} - -
    -
    -     - -
    - {{openaireEntities.DATASETS}} - -
    -
    -     - -
    - {{openaireEntities.SOFTWARE}} - -
    -
    -     - -
    - {{openaireEntities.OTHER}} - -
    -
    -     - -
    - DMPs - -
    -
    -     - -
    - Statistics - -
    -
    -     -
    -
    -
    - -
    -
    - + +
    + + +
    +
    + +
    + Summary + +
    +
    +     + +
    + {{openaireEntities.PUBLICATIONS}} + +
    +
    +     + +
    + {{openaireEntities.DATASETS}} + +
    +
    +     + +
    + {{openaireEntities.SOFTWARE}} + +
    +
    +     + +
    + {{openaireEntities.OTHER}} + +
    +
    +     + +
    + DMPs + +
    +
    +     + +
    + Statistics + +
    +
    +     +
    +
    +
    + +
    +
    +
    + (click)="openFsModal(addThisFsModal, 'Share this '+openaireEntities.PROJECT+' in your social networks')"> Share
    - - - - - Deposit - - -
    -     - + + + + + Deposit + + +
    +     +
    + (click)="openFsModal(embedResultsFsModal, 'Embed results')"> Embed
    - +
    + (click)="openFsModal(downloadReportFsModal, 'Download report')"> Download
    - - - - - Link to - - -
    -     -
    + + + + + Link to + + +
    +     +
    -
    -
    - - - -
    -
    +
    +
    + + + +
    +
    - + - + - + - + - + - + - + -     +
    - + @@ -678,8 +678,8 @@ -
    + [large]="true"> +
    @@ -702,259 +702,259 @@ -
    -
    -
    -
    -
    -
    - No summary information available -
    -
    -
    - -
    -
    -
    Description
    -
    -
    -
    -
    - - View more - -
    -
    -
    -
    -
    -
    - -
    Partners
    -
    - -
    - - View all - - - View all - -
    -
    - View less -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    + No summary information available +
    +
    +
    + +
    +
    +
    Description
    +
    +
    +
    +
    + + View more + +
    +
    +
    +
    +
    +
    + +
    Partners
    +
    + +
    + + View all + + + View all + +
    +
    + View less +
    +
    +
    +
    +
    +
    +
    +
    -
    - - -
    +
    + + +
    -
    - - -
    +
    + + +
    -
    - - -
    +
    + + +
    -
    - - -
    +
    + + +
    - + -
    -
    Statistics
    - -
    -
    -
    -
    Produced - {{openaireEntities.RESULTS}} per year -
    - -
    -
    -
    -
    -
    Access mode of - {{openaireEntities.RESULTS}} -
    - -
    -
    -
    -
    -
    - {{openaireEntities.RESULTS}} per datasource -
    - -
    -
    -
    -
    +
    +
    Statistics
    + +
    +
    +
    +
    Produced + {{openaireEntities.RESULTS}} per year +
    + +
    +
    +
    +
    +
    Access mode of + {{openaireEntities.RESULTS}} +
    + +
    +
    +
    +
    +
    + {{openaireEntities.RESULTS}} per datasource +
    + +
    +
    +
    +
    -
    - -
      - -
    • -
      -
      -
      -
      +
      + +
        + +
      • +
        +
        +
        +
        OpenAIRE UsageCounts -
        - Usage by - +
        + Usage by + UsageCounts -
        -
        - - - - - - - - - - - - - -
        - - - Downloads - - {{formatNumber(totalDownloads)}} -
        - - - Views - - {{formatNumber(totalViews)}} -
        -
        -
        -
      -
      • - -
    • -
      -
      -
      -
      {{formatNumber(totalDownloads)}}
      -
      Downloads
      -
      -
      -
      {{formatNumber(totalViews)}}
      -
      Views
      -
      -
      - -
      - -
      -
      - - -
      -       -
      -
      - Powered by +
      +
      + + + + + + + + + + + + + +
      + + + Downloads + + {{formatNumber(totalDownloads)}} +
      + + + Views + + {{formatNumber(totalViews)}} +
      +
      +
    +
    + + +
  • +
    +
    +
    +
    {{formatNumber(totalDownloads)}}
    +
    Downloads
    +
    +
    +
    {{formatNumber(totalViews)}}
    +
    Views
    +
    +
    + +
    + +
    +
    + + +
    +     +
    +
    + Powered by OpenAIRE UsageCounts -
    -
    • - -
    +
    + + + @@ -962,18 +962,18 @@ - + - + -
    +
    + [options]="resultTypesForEmbedding" [(value)]="embed_research_results_type">
    {{getDynamicContent(embed_research_results_type)}}
    @@ -993,10 +993,10 @@ -
    +
    + [options]="resultTypesForDownloading" [(value)]="download_research_results_type" (click)="buildResultTypesForDownloading()">
    + class="uk-text-meta uk-margin-medium-top uk-text-center"> No reports available
    diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 4595057b..16bd4492 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -7,14 +7,14 @@ - - - - - - View all {{resultLandingInfo.deletedByInferenceIds.length}} versions - - - - - - - - Link to - - - - Share - - - - Cite - - - - - - - - -
    -
    -
    -
    - -
    - - - -
    - - - - -
    - -
    - - - - - -
    - -
    - - - - - -
    - -
    - - - - - -
    - -
    - - -
    -
    - -
    -
    - - - - - - - -
    - -
    - -
    - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - -
    -
    - -
    - +
    + +
    + +
    +
    + +
    +
    +
    +
    + + + + + + + View all {{resultLandingInfo.deletedByInferenceIds.length}} versions + + + + + + + + Link to + + + + Share + + + + Cite + + + + + + + + +
    +
    +
    +
    + +
    + + + +
    + + + + +
    + +
    + + + + + +
    + +
    + + + + + +
    + +
    + + + + + +
    + +
    + + +
    +
    + +
    +
    + + + + + + + +
    + +
    + +
    + + + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + +
    +
    + +
    + - - - - - - - - -
    + + + + + + + + +
    -
    -     - -
    +
    +     + +
    -
    -     - +
    +     + -
    -
    - -     -
    -
    +
    +
    + + + + @@ -340,7 +340,7 @@
    + [class.uk-animation-right]="viewAll">
    @@ -353,8 +353,8 @@
    + class="uk-offcanvas-switcher uk-flex uk-flex-center uk-flex-middle uk-hidden@m" + (click)="rightSidebarOffcanvasClicked = true;">
    @@ -371,62 +371,62 @@ - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    Citations
    -
    +
    Popularity
    -
    +
    Influence
    -
    +
    Downloads
    -
    +
    Views
    -
    -
    -
    {{formatNumber(resultLandingInfo.measure.citations)}}
    -
    {{resultLandingInfo.measure.popularity}}
    -
    {{resultLandingInfo.measure.influence}}
    -
    {{formatNumber(resultLandingInfo.measure.downloads)}}
    -
    {{formatNumber(resultLandingInfo.measure.views)}}
    -
    -
    -
    -
    - Metrics badge -
    -
    -
    +
    +
    +
    {{formatNumber(resultLandingInfo.measure.citations)}}
    +
    {{resultLandingInfo.measure.popularity}}
    +
    {{resultLandingInfo.measure.influence}}
    +
    {{formatNumber(resultLandingInfo.measure.downloads)}}
    +
    {{formatNumber(resultLandingInfo.measure.views)}}
    +
    +
    +
    +
    + Metrics badge +
    +
    +
    + && (!viewAll || viewAll=='egiNotebook')">
    @@ -442,9 +442,9 @@
    + class="uk-margin-bottom"> + (viewAllClicked)="viewAll=$event" (noCommunities)="noCommunities = true">
    - -
    -
    +
    +
    - - {{resultLandingInfo.hostedBy_collectedFrom[0].accessRight}} -
    - + {{resultLandingInfo.hostedBy_collectedFrom[0].accessRight}} +
    + - -
    - -
    - -
    - -
    - +
    + +
    + +
    + +
    + -
    - -
    - + +
    + -
    -
    -
    -
    - -
    - Summary - -
    -
    -     - -
    - References - -
    -
    -     - -
    - Related Research - -
    -
    -     - -
    - External Databases - -
    -
    -     +
    +
    +
    +
    + +
    + Summary + +
    +
    +     + +
    + References + +
    +
    +     + +
    + Related Research + +
    +
    +     + +
    + External Databases + +
    +
    +     + && (!viewAll || viewAll=='egiNotebook')">
    Compatible EOSC Services @@ -547,15 +547,15 @@
    - -
    - Enermaps Tool - -
    -
    -     -
    -
    + +
    + Enermaps Tool + +
    +
    +     +
    +
    @@ -619,35 +619,35 @@
    -
    - + {{getTypeName()}} + +
    + + +
    +
    @@ -713,12 +713,12 @@ - +
    + #AlertModalDeletedByInference large="true"> -
    + [large]="true"> +
    @@ -766,10 +766,10 @@ -
    + #fosSelectionModal [large]="true"> +
    -
    +
    @@ -790,9 +790,9 @@ class="uk-margin-bottom">
    {{header}}
    + input type="select" placeholder="Filter by relation" inputClass="flat x-small" + [options]="relatedClassFilters" [(value)]="relatedClassSelected" + (valueChange)="relatedClassChanged()">
    @@ -894,13 +894,13 @@

    {{item.name}} - - [ + [{{getReferenceIdName(id)}} - OpenAIRE] - +

    @@ -961,7 +961,7 @@
    Enermaps tool preview

    Visit {{detail[0]}}: - - {{word}} - + {{word}} + {{word}} - - + + @@ -1246,8 +1246,8 @@ -

    -
    +
    +
    diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 31b1831c..fe68a0fd 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -19,7 +19,7 @@
    Top 100 values are shown in the filters
    -
    +
    @@ -27,9 +27,13 @@
    - + class="uk-animation-fade uk-text-small"> + +
    +     + +
    + No filters available with that term
    diff --git a/searchPages/searchUtils/searchFilter.component.ts b/searchPages/searchUtils/searchFilter.component.ts index 9484c2c3..c6569607 100644 --- a/searchPages/searchUtils/searchFilter.component.ts +++ b/searchPages/searchUtils/searchFilter.component.ts @@ -5,7 +5,8 @@ import { EventEmitter, OnInit, OnChanges, - SimpleChanges + SimpleChanges, + ChangeDetectorRef } from '@angular/core'; import {Filter, Value} from './searchHelperClasses.class'; import {ActivatedRoute, Router} from "@angular/router"; @@ -42,7 +43,11 @@ export class SearchFilterComponent implements OnInit, OnChanges { sub; public isOpen: boolean = false; sortedValues; - constructor(private _router: Router, private route: ActivatedRoute) { + hasMatch: boolean = false; + + constructor(private _router: Router, + private route: ActivatedRoute, + private cdr: ChangeDetectorRef) { } ngOnDestroy() { @@ -115,6 +120,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { return false; } } + this.hasMatch = true; return true; } @@ -246,9 +252,13 @@ export class SearchFilterComponent implements OnInit, OnChanges { return 0; } }); - } + } this.sortedValues = Object.assign(sorted); + } + initMatching() { + this.hasMatch = false; + this.cdr.detectChanges(); } toggle(event) { @@ -324,4 +334,4 @@ export class SearchFilterComponent implements OnInit, OnChanges { return Object.entries(obj); } } -} +} \ No newline at end of file