diff --git a/src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-100.png b/src/res/images/AllenMouseCommonCoordinateFrameworkv32015-100.png similarity index 100% rename from src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-100.png rename to src/res/images/AllenMouseCommonCoordinateFrameworkv32015-100.png diff --git a/src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-200.png b/src/res/images/AllenMouseCommonCoordinateFrameworkv32015-200.png similarity index 100% rename from src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-200.png rename to src/res/images/AllenMouseCommonCoordinateFrameworkv32015-200.png diff --git a/src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-300.png b/src/res/images/AllenMouseCommonCoordinateFrameworkv32015-300.png similarity index 100% rename from src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-300.png rename to src/res/images/AllenMouseCommonCoordinateFrameworkv32015-300.png diff --git a/src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-400.png b/src/res/images/AllenMouseCommonCoordinateFrameworkv32015-400.png similarity index 100% rename from src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas-400.png rename to src/res/images/AllenMouseCommonCoordinateFrameworkv32015-400.png diff --git a/src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas.png b/src/res/images/AllenMouseCommonCoordinateFrameworkv32015.png similarity index 100% rename from src/res/images/AllenadultmousebrainreferenceatlasV3BrainAtlas.png rename to src/res/images/AllenMouseCommonCoordinateFrameworkv32015.png diff --git a/src/res/images/WaxholmSpaceratbrainatlasv20-100.png b/src/res/images/WaxholmSpaceratbrainMRIDTI-100.png similarity index 100% rename from src/res/images/WaxholmSpaceratbrainatlasv20-100.png rename to src/res/images/WaxholmSpaceratbrainMRIDTI-100.png diff --git a/src/res/images/WaxholmSpaceratbrainatlasv20-200.png b/src/res/images/WaxholmSpaceratbrainMRIDTI-200.png similarity index 100% rename from src/res/images/WaxholmSpaceratbrainatlasv20-200.png rename to src/res/images/WaxholmSpaceratbrainMRIDTI-200.png diff --git a/src/res/images/WaxholmSpaceratbrainatlasv20-300.png b/src/res/images/WaxholmSpaceratbrainMRIDTI-300.png similarity index 100% rename from src/res/images/WaxholmSpaceratbrainatlasv20-300.png rename to src/res/images/WaxholmSpaceratbrainMRIDTI-300.png diff --git a/src/res/images/WaxholmSpaceratbrainatlasv20-400.png b/src/res/images/WaxholmSpaceratbrainMRIDTI-400.png similarity index 100% rename from src/res/images/WaxholmSpaceratbrainatlasv20-400.png rename to src/res/images/WaxholmSpaceratbrainMRIDTI-400.png diff --git a/src/res/images/WaxholmSpaceratbrainatlasv20.png b/src/res/images/WaxholmSpaceratbrainMRIDTI.png similarity index 100% rename from src/res/images/WaxholmSpaceratbrainatlasv20.png rename to src/res/images/WaxholmSpaceratbrainMRIDTI.png diff --git a/src/ui/databrowserModule/singleDataset/singleDataset.template.html b/src/ui/databrowserModule/singleDataset/singleDataset.template.html index adeb851f8b2c0adeba23777ab10f582bf4ddf19b..2abde63a3f58b052f17081b80c24a7569b4578b0 100644 --- a/src/ui/databrowserModule/singleDataset/singleDataset.template.html +++ b/src/ui/databrowserModule/singleDataset/singleDataset.template.html @@ -14,12 +14,15 @@ <!-- publications --> <mat-card-content> - <div class="d-inline-block mb-2" + <div class="d-block mb-2" *ngFor="let publication of publications"> - <a [href]="publication.doi | doiParserPipe" + <a *ngIf="publication.doi; else plainText" [href]="publication.doi | doiParserPipe" target="_blank"> {{ publication.cite }} </a> + <ng-template #plainText> + {{ publication.cite }} + </ng-template> </div> </mat-card-content> diff --git a/src/util/pipes/doiPipe.pipe.spec.ts b/src/util/pipes/doiPipe.pipe.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..300f84ffc07790d02e8ea458ed3ccd03787c04fb --- /dev/null +++ b/src/util/pipes/doiPipe.pipe.spec.ts @@ -0,0 +1,17 @@ +import {} from 'jasmine' +import { DoiParserPipe } from './doiPipe.pipe' + +describe('doiPipe.pipe.ts', () => { + const pipe = new DoiParserPipe() + describe('DoiParsePIpe' , () => { + it('should parse string without prefix by appending doi prefix', () => { + const result = pipe.transform('123.456') + expect(result).toBe(`https://doi.org/123.456`) + }) + + it('should not append doi prefix if the first argument leads by http or https', () => { + expect(pipe.transform('http://google.com')).toBe('http://google.com') + expect(pipe.transform('https://google.com')).toBe('https://google.com') + }) + }) +}) \ No newline at end of file diff --git a/src/util/pipes/doiPipe.pipe.ts b/src/util/pipes/doiPipe.pipe.ts index 353b8ea659908a78a4c9fe23aa5605b4584889c0..913401ec1a929b9936fdd10c34200439936e2e48 100644 --- a/src/util/pipes/doiPipe.pipe.ts +++ b/src/util/pipes/doiPipe.pipe.ts @@ -6,7 +6,7 @@ import { Pipe, PipeTransform } from "@angular/core"; export class DoiParserPipe implements PipeTransform{ public transform(s: string, prefix: string = 'https://doi.org/'){ - const prependFlag = /^https?:\.\./.test(s) - return `${prependFlag ? prefix : ''}${s}` + const hasProtocol = /^https?\:\/\//.test(s) + return `${hasProtocol ? '' : prefix}${s}` } } \ No newline at end of file