ufal/fe-assetstore-files-are-not-loaded (#371)

* Redirection was broken after updating the namespace. The redirection links was changed from `href` to `routerLink` * Fixed test * Fixed test * namespace could be empty
dataquest-dev · Oct 5, 2023 · 4ab1746 · 4ab1746
1 parent 80394f1
commit 4ab1746
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 52 deletions.
diff --git a/src/aai/aai.js b/src/aai/aai.js
@@ -3,6 +3,7 @@
   function AAI() {
     var host = 'https://' + window.location.hostname,
         ourEntityID = host.match("lindat.mff.cuni.cz") ? "https://ufal-point.mff.cuni.cz" : host;
+    var namespace = ''
     this.defaults = {
       //host : 'https://ufal-point.mff.cuni.cz',
       host : host, //better default (useful when testing on ufal-point-dev)
@@ -33,7 +34,7 @@
           opts.responseUrl,
           [ ],
           opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target='+opts.target+'&entityID=');
-        djc.discoPath = window.location.origin + "/assets/";
+        djc.discoPath = window.location.origin + (namespace === '' ? namespace : '/' + namespace) + "/assets/";
         djc.metadata = [opts.metadataFeed];
         djc.subtitle = "Login via Your home institution (e.g. university)";
         djc.textHelp = opts.textHelp;
@@ -71,7 +72,7 @@
               case 'local':
                 // DiscoJuice.UI.setScreen(opts.localauth);
                 // jQuery('input#login').focus();
-                window.location = "/login?redirectUrl=" + window.location.href;
+                window.location = window.location.origin + (namespace === '' ? namespace : '/' + namespace) + "/login?redirectUrl=" + window.location.href;
                 break;
               //case 'saml':
               default:

diff --git a/src/aai/discojuice/discojuice.js b/src/aai/discojuice/discojuice.js
diff --git a/src/app/clarin-navbar-top/clarin-navbar-top.component.html b/src/app/clarin-navbar-top/clarin-navbar-top.component.html
@@ -19,12 +19,12 @@
       <a class="hidden" id="repository_path" [href]="repositoryPath"></a>
       <div *ngIf="authenticatedUser != null" class="badge clarin-logout-badge px-2 py-1">
         <span>
-          <a style="color: #FFF;" href="/profile">
+          <a routerLink="/profile" style="color: #FFF;">
             <i class="fa fa-user pr-1 fa-lg"></i>{{authenticatedUser.name}}
           </a>
         </span>
         <span class="text-white px-1">|</span>
-        <a style="color: #FFF;" href="/logout">
+        <a routerLink="/logout" style="color: #FFF;">
           <i class="fas fa-sign-out-alt pr-1 fa-lg" aria-hidden="true"></i>{{'logout.title' | translate}}
         </a>
       </div>

diff --git a/src/app/contact-page/contact-page.component.html b/src/app/contact-page/contact-page.component.html
@@ -6,7 +6,7 @@ <h1>{{'contact-us.title' | translate}}</h1>
               <p>{{'contact-us.description' | translate}}</p>
               <div class="text-left">
                 <span>{{'contact-us.form' | translate}} </span>
-                <a href="info/feedback" class="ml-4">{{'contact-us.feedback' | translate}}</a>
+                <a routerLink="info/feedback" class="ml-4">{{'contact-us.feedback' | translate}}</a>
               </div>
               <div class="text-left">
                 <span>{{'contact-us.email' | translate}}</span>

diff --git a/src/app/contact-page/contact-page.module.ts b/src/app/contact-page/contact-page.module.ts
@@ -4,13 +4,15 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ContactPageComponent } from './contact-page.component';
 import { ContactPageRoutingModule } from './contact-page-routing.module';
 import { ThemedContactPageComponent } from './themed-contact-page.component';
+import { RouterModule } from '@angular/router';
 
 @NgModule({
-  imports: [
-    CommonModule,
-    ContactPageRoutingModule,
-    TranslateModule
-  ],
+    imports: [
+        CommonModule,
+        ContactPageRoutingModule,
+        TranslateModule,
+        RouterModule
+    ],
   declarations: [
     ContactPageComponent,
     ThemedContactPageComponent

diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
@@ -32,18 +32,18 @@ <h5 class="h5-font carousel-deposit-cite">{{'home-page.carousel.deposit.cite' |
       </div>
       <div class="col-md-4 d-none d-lg-block">
         <div class="row">
-          <a class="col-md-7" style="height: 160px; position: relative;" href="/home">
-            <img alt="LINDAT/CLARIAH-CZ logo" class="logo" style="position: absolute; height: 50%; top: 0px; bottom: 0px; margin: auto;" src="../../assets/images/lindat-logo-new-sm.png">
+          <a routerLink="home" class="col-md-7" style="height: 160px; position: relative;">
+            <img alt="LINDAT/CLARIAH-CZ logo" class="logo" style="position: absolute; height: 50%; top: 0px; bottom: 0px; margin: auto;" src="assets/images/lindat-logo-new-sm.png">
           </a>
           <a class="col-md-5" style="height: 160px; position: relative;" href="http://www.clarin.eu/">
-            <img alt="LINDAT/CLARIAH-CZ logo" class="logo" style="position: absolute; height: 50%; top: 0px; bottom: 0px; margin: auto;" src="../../assets/images/clarin-logo.png">
+            <img alt="LINDAT/CLARIAH-CZ logo" class="logo" style="position: absolute; height: 50%; top: 0px; bottom: 0px; margin: auto;" src="assets/images/clarin-logo.png">
           </a>
         </div>
       </div>
     </div>
   </div>
   <div class="container">
-    <div class="row hidden-xs lindat-color-line">&nbsp;</div>
+    <div class="row hidden-xs lindat-color-line"><img class="w-100" src="assets/images/lindat_color_line.png"></div>
   </div>
   <div class="container clarin-home-page-color pt-4 pb-5">
     <div class="row justify-content-center pt-4">
@@ -57,7 +57,7 @@ <h5 class="h5-font carousel-deposit-cite">{{'home-page.carousel.deposit.cite' |
       </div>
     </div>
     <div class="row justify-content-center pt-3">
-      <a href="/search">{{'home-page.advanced-search' | translate}}</a>
+      <a href="javascript:void(0);" (click)="redirectToSearch('')">{{'home-page.advanced-search' | translate}}</a>
     </div>
     <div class="row justify-content-center pt-5">
       <div class="col-md-9">

diff --git a/src/app/home-page/home-page.component.scss b/src/app/home-page/home-page.component.scss
@@ -21,23 +21,9 @@
   }
 
   .lindat-color-line {
-    background-image: url('../../assets/images/lindat_color_line.png');
     height: 3px;
   }
 
-  .lindat-logo-big {
-    background-image: url('../../assets/images/lindat-logo-new-sm.png');
-    position: absolute;
-    height: 60%;
-    top: 0px;
-    bottom: 0px;
-    margin: auto;
-  }
-
-  .clarin-logo-big {
-    background-image: url('../../assets/images/clarin-logo.png');
-  }
-
   .clarin-fix-to-navbar {
     margin-top: -25px;
     box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 6px silver;

diff --git a/...age/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/...age/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -25,7 +25,7 @@
   <div class="{{columnSizes.columns[3].buildClasses()}} row-element d-flex align-items-center">
     <div class="text-center w-100">
       <div class="btn-group relationship-action-buttons">
-        <a *ngIf="bitstreamDownloadUrl != null" [href]="bitstreamDownloadUrl"
+        <a *ngIf="bitstreamDownloadUrl != null" [routerLink]="bitstreamDownloadUrl"
                 class="btn btn-outline-primary btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
                 [attr.data-test]="'download-button' | dsBrowserOnly">

diff --git a/.../edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/.../edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
@@ -1,5 +1,5 @@
 import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { of as observableOf } from 'rxjs';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -13,6 +13,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-dat
 import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
 import { By } from '@angular/platform-browser';
 import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe';
+import { RouterLinkDirectiveStub } from '../../../../shared/testing/router-link-directive.stub';
 
 let comp: ItemEditBitstreamComponent;
 let fixture: ComponentFixture<ItemEditBitstreamComponent>;
@@ -77,6 +78,7 @@ describe('ItemEditBitstreamComponent', () => {
         ItemEditBitstreamComponent,
         VarDirective,
         BrowserOnlyMockPipe,
+        RouterLinkDirectiveStub
       ],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService }
@@ -131,8 +133,11 @@ describe('ItemEditBitstreamComponent', () => {
   describe('when the component loads', () => {
     it('should contain download button with a valid link to the bitstreams download page', () => {
       fixture.detectChanges();
-      const downloadBtnHref = fixture.debugElement.query(By.css('[data-test="download-button"]')).nativeElement.getAttribute('href');
-      expect(downloadBtnHref).toEqual(comp.bitstreamDownloadUrl);
+      const linkDes = fixture.debugElement.queryAll(By.directive(RouterLinkDirectiveStub));
+      const routerLinkQuery = linkDes.map((de) => de.injector.get(RouterLinkDirectiveStub));
+
+      expect(routerLinkQuery.length).toBe(2);
+      expect(routerLinkQuery[0].routerLink).toBe(comp.bitstreamDownloadUrl);
     });
   });
 

diff --git a/src/app/login-page/autoregistration/autoregistration.component.html b/src/app/login-page/autoregistration/autoregistration.component.html
@@ -19,7 +19,7 @@ <h5 class="display-4">{{'clarin.autoregistration.welcome.message' | translate}}
       <div class="row">
         <div class="col-11">
           <div>
-            {{'clarin.autoregistration.repository.policy.message.0' | translate}} <b><a href="/info/privacy">{{ baseUrl+'/info/privacy' }}</a></b>
+            {{'clarin.autoregistration.repository.policy.message.0' | translate}} <b><a routerLink="/info/privacy">{{ baseUrl+'/info/privacy' }}</a></b>
           </div>
           <div>{{'clarin.autoregistration.repository.policy.message.1' | translate}}</div>
         </div>

diff --git a/src/app/page-error/page-error.component.html b/src/app/page-error/page-error.component.html
@@ -5,6 +5,6 @@ <h2><small>{{"error-page.description." + status | translate}}</small></h2>
   <p>{{"error-page." + code | translate}}</p>
   <br/>
   <p class="text-center">
-    <a href="/home" class="btn btn-primary">{{ status + ".link.home-page" | translate}}</a>
+    <a routerLink="/home" class="btn btn-primary">{{ status + ".link.home-page" | translate}}</a>
   </p>
 </div>
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -7,6 +7,6 @@ <h2><small>
   <p>{{"500.help" | translate}}</p>
   <br/>
   <p class="text-center">
-    <a href="home" class="btn btn-primary">{{"500.link.home-page" | translate}}</a>
+    <a routerLink="home" class="btn btn-primary">{{"500.link.home-page" | translate}}</a>
   </p>
 </div>
diff --git a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html
@@ -8,7 +8,7 @@
       <div class="pl-3">
         <div class="row pt-3 justify-content-between">
           <div class="">
-            <div><a [href]="itemUri" class="item-name">{{ itemName }}</a></div>
+            <div><a [routerLink]="itemUri" class="item-name">{{ itemName }}</a></div>
             <div class="pt-1"><strong>{{'item.view.box.author.message' | translate}}</strong></div>
           </div>
           <div>

diff --git a/...ubmission/sections/clarin-license-distribution/clarin-license-distribution.component.html b/...ubmission/sections/clarin-license-distribution/clarin-license-distribution.component.html
@@ -4,7 +4,7 @@
       <div id="aspect_submission_StepTransformer_item_head" class="form-group distribution_licnese_head">
         <span> {{'submission.sections.clarin-license.head.read-accept' | translate}} </span>
         <span class="">
-          <a [href]="contractRoutingPath + '?collectionId=' + collectionId" class="target_blank"
+          <a [routerLink]="contractRoutingPath + '?collectionId=' + collectionId" class="target_blank"
              target="_blank">{{'submission.sections.clarin-license.head.license-agreement' | translate}}</a>
         </span>
       </div>

diff --git a/src/app/submission/sections/clarin-license-resource/section-license.component.html b/src/app/submission/sections/clarin-license-resource/section-license.component.html
@@ -13,7 +13,7 @@
         <div id="placeholder">
           <span>{{'submission.sections.clarin-license.head.license-select-providing.0' | translate}}</span>
           <span>
-            <a href="/repository/xmlui/page/licenses" class="target_blank alert-link" target="_blank">
+            <a routerLink="licenses" class="target_blank alert-link" target="_blank">
               {{'submission.sections.clarin-license.head.license-select-providing.1' | translate}}
             </a>
           </span>

diff --git a/src/assets/images/error.png b/src/assets/images/error.png
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
@@ -7,6 +7,10 @@ body {
   overflow-x: hidden;
 }
 
+a {
+  cursor: pointer;
+}
+
 // Sticky Footer
 .outer-wrapper {
   display: flex;

diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
@@ -4,7 +4,7 @@
     <header data-version="3.0.5" data-build="05eff1186f12528f221a63b021c7b7dc81301429">
       <nav class="lindat-navbar lindat-navbar-expand-lg lindat-justify-content-between lindat-navbar-dark ">
         <div class="lindat-block lindat-block--clariah-theme-branding">
-          <a href="/home" class="lindat-navbar-brand lindat-d-flex lindat-align-items-center " aria-label="">
+          <a routerLink="home" class="lindat-navbar-brand lindat-d-flex lindat-align-items-center " aria-label="">
             <img src="https://lindat.mff.cuni.cz/sites/default/files/LINDAT-CLARIAH-cz-gray_0.svg" width="auto" height="53" style="height: 53px !important;" alt="LINDAT/CLARIAH-CZ logo" class="" />
           </a>
         </div>
@@ -17,34 +17,34 @@
             <div class="lindat-block lindat-block--clariah-theme-main-menu">
               <ul class="lindat-nav lindat-navbar-nav">
                 <li class="lindat-nav-item ">
-                  <a href="/community-list" class="lindat-nav-link">{{'navbar.community-list' | translate}}</a>
+                  <a routerLink="community-list" class="lindat-nav-link">{{'navbar.community-list' | translate}}</a>
                 </li>
                 <li class="lindat-nav-item ">
-                  <a href="/home" class="lindat-nav-link">{{'navbar.repository' | translate}}</a>
+                  <a routerLink="home" class="lindat-nav-link">{{'navbar.repository' | translate}}</a>
                 </li>
                 <li class="lindat-nav-item ">
-                  <a href="/#education" class="lindat-nav-link">{{'navbar.education' | translate}}</a>
+                  <a routerLink="education" class="lindat-nav-link">{{'navbar.education' | translate}}</a>
                 </li>
                 <li class="lindat-nav-item ">
-                  <a href="/#projects" class="lindat-nav-link">{{'navbar.project' | translate}}</a>
+                  <a routerLink="projects" class="lindat-nav-link">{{'navbar.project' | translate}}</a>
                 </li>
                 <li class="lindat-nav-item ">
-                  <a href="/#tools" class="lindat-nav-link ">{{'navbar.tools' | translate}}</a>
+                  <a routerLink="tools" class="lindat-nav-link ">{{'navbar.tools' | translate}}</a>
                 </li>
                 <li class="lindat-nav-item ">
-                  <a href="/en/services" class="lindat-nav-link ">{{'navbar.services' | translate}}</a>
+                  <a routerLink="en/services" class="lindat-nav-link ">{{'navbar.services' | translate}}</a>
                 </li>
                 <li class="lindat-nav-item lindat-dropdown">
-                  <a href="/" class="lindat-nav-link lindat-dropdown-toggle"
+                  <a routerLink="/" class="lindat-nav-link lindat-dropdown-toggle"
                      data-toggle="dropdown"
                      onclick="this.parentNode.querySelector('.lindat-dropdown-toggle+div.lindat-dropdown-menu').classList.toggle('lindat-show'); return false;">{{'navbar.about' | translate}}</a>
                   <div class="lindat-dropdown-menu">
-                    <a href="/partners" class="lindat-dropdown-item">{{'navbar.about.partners' | translate}}</a>
-                    <a href="/files/mission-en.pdf" class="lindat-dropdown-item">{{'navbar.about.mission-statement' | translate}}</a>
+                    <a routerLink="partners" class="lindat-dropdown-item">{{'navbar.about.partners' | translate}}</a>
+                    <a routerLink="files/mission-en.pdf" class="lindat-dropdown-item">{{'navbar.about.mission-statement' | translate}}</a>
                     <a href="https://www.clarin.eu/" class="lindat-dropdown-item">{{'navbar.about.clarin' | translate}}</a>
                     <a href="https://www.dariah.eu/" class="lindat-dropdown-item">{{'navbar.about.dariah' | translate}}</a>
-                    <a href="/integration" class="lindat-dropdown-item">{{'navbar.about.service-integrations' | translate}}</a>
-                    <a href="/partnership" class="lindat-dropdown-item">{{'navbar.about.project-partnership' | translate}}</a>
+                    <a routerLink="integration" class="lindat-dropdown-item">{{'navbar.about.service-integrations' | translate}}</a>
+                    <a routerLink="partnership" class="lindat-dropdown-item">{{'navbar.about.project-partnership' | translate}}</a>
                   </div>
                 </li>
               </ul>