Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Port dspace-7_x] fix #3241: Configuring the URI link target #3766

Merged
merged 3 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@

<!-- Render value as a link (href and label) -->
<ng-template #link let-value="value">
<a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
<a class="dont-break-out ds-simple-metadata-link"
[href]="value"
[attr.target]="getLinkAttributes(value).target"
[attr.rel]="getLinkAttributes(value).rel">
{{value}}
</a>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,20 @@ describe('MetadataValuesComponent', () => {
expect(comp.hasLink(mdValue)).toBe(true);
});

it('should return correct target and rel for internal links', () => {
spyOn(comp, 'hasInternalLink').and.returnValue(true);
const urlValue = '/internal-link';
const result = comp.getLinkAttributes(urlValue);
expect(result.target).toBe('_self');
expect(result.rel).toBe('');
});

it('should return correct target and rel for external links', () => {
spyOn(comp, 'hasInternalLink').and.returnValue(false);
const urlValue = 'https://www.dspace.org';
const result = comp.getLinkAttributes(urlValue);
expect(result.target).toBe('_blank');
expect(result.rel).toBe('noopener noreferrer');
});

});
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
import { hasValue } from '../../../shared/empty.util';
import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
import { environment } from '../../../../environments/environment';

/**
* This component renders the configured 'values' into the ds-metadata-field-wrapper component.
Expand Down Expand Up @@ -90,4 +91,25 @@
}
return queryParams;
}

/**
* Checks if the given link value is an internal link.
* @param linkValue - The link value to check.
* @returns True if the link value starts with the base URL defined in the environment configuration, false otherwise.
*/
hasInternalLink(linkValue: string): boolean {
return linkValue.startsWith(environment.ui.baseUrl);

Check warning on line 101 in src/app/item-page/field-components/metadata-values/metadata-values.component.ts

View check run for this annotation

Codecov / codecov/patch

src/app/item-page/field-components/metadata-values/metadata-values.component.ts#L101

Added line #L101 was not covered by tests
}

/**
* This method performs a validation and determines the target of the url.
* @returns - Returns the target url.
*/
getLinkAttributes(urlValue: string): { target: string, rel: string } {
if (this.hasInternalLink(urlValue)) {
return { target: '_self', rel: '' };
} else {
return { target: '_blank', rel: 'noopener noreferrer' };
}
}
}
Loading