Skip to content

Commit 9aae4c1

Browse files
[DSC-1708] manages ROR badge for ORgUnits
1 parent 2de451d commit 9aae4c1

3 files changed

Lines changed: 19 additions & 11 deletions

File tree

src/app/shared/metadata-link-view/metadata-link-view-popover/metadata-link-view-popover.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@
1717
<span class="ellipsis-y-3" *ngIf="longTextMetadataList.includes(metadata)">
1818
{{ item.firstMetadataValue(metadata) }}
1919
</span>
20-
<a [href]="item.firstMetadataValue(metadata)" target="_blank" *ngIf="isLink(item.firstMetadataValue(metadata)) && !showIconMetadataList.includes(metadata)">
20+
<a [href]="item.firstMetadataValue(metadata)" target="_blank" *ngIf="isLink(item.firstMetadataValue(metadata)) && !getSourceSubTypeIdentifier(metadata)">
2121
{{ item.firstMetadataValue(metadata) }}
2222
</a>
23-
<!-- TODO: Fix later using configuration -->
24-
<div *ngIf="metadata === 'organization.identifier.ror'" class="d-flex align-items-center">
23+
24+
<div *ngIf="getSourceSubTypeIdentifier(metadata)" class="d-flex align-items-center">
2525
<ng-container *ngVar="item.firstMetadataValue(metadata) as rorValue">
2626
<a *ngIf="isLink(rorValue)" [href]="item.firstMetadataValue(metadata)" target="_blank" >
2727
{{ item.firstMetadataValue(metadata) }}
2828
</a>
29-
<a *ngIf="!isLink(rorValue)" [href]="'https://ror.org/' + item.firstMetadataValue(metadata)" target="_blank" >
29+
<a *ngIf="!isLink(rorValue)" [href]="getSourceSubTypeIdentifier(metadata)?.link + '/' + item.firstMetadataValue(metadata)" target="_blank" >
3030
{{ item.firstMetadataValue(metadata) }}
3131
</a>
3232
</ng-container>
3333
<img
3434
placement="top"
35-
ngbTooltip="https://ror.org"
35+
[ngbTooltip]="getSourceSubTypeIdentifier(metadata)?.link"
3636
class="source-icon"
3737
alt="source-logo"
38-
src="assets/images/ror.logo.icon.svg"
38+
[src]="getSourceSubTypeIdentifier(metadata)?.icon"
3939
data-test="sourceIcon"
4040
/>
4141
</div>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.source-icon {
2-
height: 1.2rem;
2+
height: var(--ds-identifier-sybetype-icon-height);
3+
min-height: 16px;
4+
width: auto;
35
padding-left: 0.3rem;
46
}

src/app/shared/metadata-link-view/metadata-link-view-popover/metadata-link-view-popover.component.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { IdentifierSubtypesConfig } from './../../../../config/identifier-subtypes-config.interface';
12
import { MetadataLinkViewPopoverDataConfig } from 'src/config/metadata-link-view-popoverdata-config.interface';
23
import { Item } from './../../../core/shared/item.model';
34
import { Component, Input, OnInit } from '@angular/core';
@@ -25,14 +26,12 @@ export class MetadataLinkViewPopoverComponent implements OnInit {
2526

2627
longTextMetadataList = ['dc.description.abstract', 'dc.description'];
2728

28-
showIconMetadataList = ['organization.identifier.ror'];
29-
3029
sourceIcons: AuthorithyIcon[] = environment.submission.icons.authority.sourceIcons;
3130

32-
/**
31+
/**
3332
* The identifier subtype configurations
3433
*/
35-
// identifierSubtypeConfig: IdentifierSubtypesConfig[] = environment.identifierSubtypes;
34+
identifierSubtypeConfig: IdentifierSubtypesConfig[] = environment.identifierSubtypes;
3635

3736
isOtherEntityType = false;
3837

@@ -57,4 +56,11 @@ export class MetadataLinkViewPopoverComponent implements OnInit {
5756
getItemPageRoute(): string {
5857
return getItemPageRoute(this.item);
5958
}
59+
60+
getSourceSubTypeIdentifier(metadataValue: string): IdentifierSubtypesConfig {
61+
const metadataValueSplited = metadataValue.split('.');
62+
const subtype = metadataValueSplited[metadataValueSplited.length - 1];
63+
const identifierSubtype = this.identifierSubtypeConfig.find((config) => config.name === subtype);
64+
return identifierSubtype;
65+
}
6066
}

0 commit comments

Comments
 (0)