records: Fix external link issue

* Returns an object representing the link instead of the link directly. * Removes icon for viewing resource detail. * Adds link to detail in JSON component. * Removes institution custom component for testing default JSON component. * Fixes issue #35 * Fixes issue #38 Co-Authored-by: Sébastien Délèze <sebastien.deleze@rero.ch>
rero · Nov 6, 2019 · 243fe0e · 243fe0e
1 parent d5215cd
commit 243fe0e
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 54 deletions.
diff --git a/projects/ng-core-tester/src/app/app-routing.module.ts b/projects/ng-core-tester/src/app/app-routing.module.ts
@@ -20,7 +20,6 @@ import { of, Observable } from 'rxjs';
 
 import { HomeComponent } from './home/home.component';
 import { DocumentComponent } from './record/document/document.component';
-import { InstitutionComponent } from './record/institution/institution.component';
 import { DetailComponent } from './record/document/detail/detail.component';
 import { EditorComponent } from '@rero/ng-core';
 import { RecordSearchComponent } from '@rero/ng-core';
@@ -213,8 +212,7 @@ const routes: Routes = [
         },
         {
           key: 'institutions',
-          label: 'Organisations',
-          component: InstitutionComponent
+          label: 'Organisations'
         }
       ]
     }

diff --git a/projects/ng-core-tester/src/app/app.module.ts b/projects/ng-core-tester/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { CoreModule, RecordModule, SharedModule } from '@rero/ng-core';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { DocumentComponent } from './record/document/document.component';
-import { InstitutionComponent } from './record/institution/institution.component';
 import { HomeComponent } from './home/home.component';
 import { DetailComponent } from './record/document/detail/detail.component';
 import { CoreConfigService } from '@rero/ng-core';
@@ -36,7 +35,6 @@ import { SearchBarComponent } from './search-bar/search-bar.component';
   declarations: [
     AppComponent,
     DocumentComponent,
-    InstitutionComponent,
     HomeComponent,
     DetailComponent,
     SearchBarComponent
@@ -60,8 +58,7 @@ import { SearchBarComponent } from './search-bar/search-bar.component';
   ],
   bootstrap: [AppComponent],
   entryComponents: [
-    DocumentComponent,
-    InstitutionComponent
+    DocumentComponent
   ]
 })
 export class AppModule { }
diff --git a/projects/ng-core-tester/src/app/home/home.component.ts b/projects/ng-core-tester/src/app/home/home.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 
 import { DialogService, ApiService, TranslateLanguageService } from '@rero/ng-core';
 import { DocumentComponent } from '../record/document/document.component';
-import { InstitutionComponent } from '../record/institution/institution.component';
 import { ToastrService } from 'ngx-toastr';
 
 @Component({
@@ -21,8 +20,7 @@ export class HomeComponent {
     },
     {
       key: 'institutions',
-      label: 'Organisations',
-      component: InstitutionComponent
+      label: 'Organisations'
     }
   ];
 

diff --git a/projects/ng-core-tester/src/app/record/document/document.component.html b/projects/ng-core-tester/src/app/record/document/document.component.html
@@ -1,5 +1,14 @@
 <h5>
-    <a href [routerLink]="detailUrl" *ngIf="detailUrl; else titleWithoutLink">{{ record.metadata.title }}</a>
+    <ng-container *ngIf="detailUrl; else titleWithoutLink">
+        <a [routerLink]="detailUrl.link" *ngIf="detailUrl.external === false; else hrefLink">
+            {{ record.metadata.title }}
+        </a>
+        <ng-template #hrefLink>
+            <a [href]="detailUrl.link">
+                {{ record.metadata.title }}
+            </a>
+        </ng-template>
+    </ng-container>
     <ng-template #titleWithoutLink>
         {{ record.metadata.title }}
     </ng-template>

diff --git a/projects/ng-core-tester/src/app/record/document/document.component.ts b/projects/ng-core-tester/src/app/record/document/document.component.ts
@@ -12,5 +12,5 @@ export class DocumentComponent implements ResultItem {
   type: string;
 
   @Input()
-  detailUrl: string;
+  detailUrl: { link: string, external: boolean };
 }
diff --git a/projects/ng-core-tester/src/app/record/institution/institution.component.html b/projects/ng-core-tester/src/app/record/institution/institution.component.html
diff --git a/projects/ng-core-tester/src/app/record/institution/institution.component.ts b/projects/ng-core-tester/src/app/record/institution/institution.component.ts
diff --git a/projects/rero/ng-core/src/lib/record/search/record-search.component.spec.ts b/projects/rero/ng-core/src/lib/record/search/record-search.component.spec.ts
@@ -292,13 +292,13 @@ describe('RecordSearchComponent', () => {
 
   it('should resolve detail url', async(() => {
     component.resolveDetailUrl({ metadata: { pid: 100 } }).subscribe((result: any) => {
-      expect(result).toBe('/custom/url/for/detail/documents/100');
+      expect(result.link).toBe('/custom/url/for/detail/documents/100');
     });
 
     component.detailUrl = null;
 
     component.resolveDetailUrl({ metadata: { pid: 100 } }).subscribe((result: any) => {
-      expect(result).toBe('detail/100');
+      expect(result.link).toBe('detail/100');
     });
 
     component.types = [

diff --git a/projects/rero/ng-core/src/lib/record/search/record-search.component.ts b/projects/rero/ng-core/src/lib/record/search/record-search.component.ts
@@ -461,10 +461,13 @@ export class RecordSearchComponent implements OnInit {
    * In case record cannot be read, returns null.
    * @param record - Generate detail URL for this record.
    */
-  resolveDetailUrl(record: any) {
-    const url = this.detailUrl ?
-      this.detailUrl.replace(':type', this.currentType).replace(':pid', record.metadata.pid) :
-      `detail/${record.metadata.pid}`;
+  resolveDetailUrl(record: any): Observable<any> {
+    const url = { link: `detail/${record.metadata.pid}`, external: false };
+
+    if (this.detailUrl) {
+      url.link = this.detailUrl.replace(':type', this.currentType).replace(':pid', record.metadata.pid);
+      url.external = true;
+    }
 
     if (!this.config.canRead) {
       return of(url);

diff --git a/projects/rero/ng-core/src/lib/record/search/result/item/json.component.ts b/projects/rero/ng-core/src/lib/record/search/result/item/json.component.ts
@@ -21,6 +21,16 @@ import { ResultItem } from './result-item';
 @Component({
   template: `
     {{ record|json }}
+    <div class="mt-3" *ngIf="detailUrl">
+      <a class="btn btn-primary btn-sm" [routerLink]="detailUrl.link" *ngIf="detailUrl.external === false; else hrefLink">
+        <i class="fa fa-file-o mr-2"></i>{{ 'Show' | translate }}
+      </a>
+      <ng-template #hrefLink>
+        <a class="btn btn-primary btn-sm" [href]="detailUrl.link">
+          <i class="fa fa-file-o mr-2"></i>{{ 'Show' | translate }}
+        </a>
+      </ng-template>
+    </div>
   `
 })
 export class JsonComponent implements ResultItem {
@@ -31,5 +41,5 @@ export class JsonComponent implements ResultItem {
   type: string;
 
   @Input()
-  detailUrl: string;
+  detailUrl: { link: string, external: boolean };
 }
diff --git a/projects/rero/ng-core/src/lib/record/search/result/item/result-item.ts b/projects/rero/ng-core/src/lib/record/search/result/item/result-item.ts
@@ -17,5 +17,5 @@
 export interface ResultItem {
     record: any;
     type: string;
-    detailUrl: string;
+    detailUrl: { link: string, external: boolean };
 }
diff --git a/projects/rero/ng-core/src/lib/record/search/result/record-search-result.component.html b/projects/rero/ng-core/src/lib/record/search/result/record-search-result.component.html
@@ -19,24 +19,21 @@
         <ng-template ngCoreRecordSearchResult></ng-template>
     </div>
     <div class="col-2 text-right">
-        <a href class="btn btn-link p-0 ml-2" [title]="'Show'|translate" [routerLink]="detailUrl" *ngIf="detailUrl">
-            <i class="fa fa-file-o"></i>
-        </a>
         <a href class="btn btn-link p-0 ml-2" [title]="'Edit'|translate" routerLink="edit/{{ record.metadata.pid }}"
             *ngIf="inRouting && adminMode && updateStatus && updateStatus.can">
             <i class="fa fa-pencil"></i>
         </a>
         <span class="ml-2" *ngIf="adminMode && deleteStatus">
-            <button class="btn btn-link p-0" [title]="'Delete'|translate" (click)="deleteRecord(record.metadata.pid)" *ngIf="deleteStatus.can; else deleteMessageLink">
+            <button class="btn btn-link p-0" [title]="'Delete'|translate" (click)="deleteRecord(record.metadata.pid)"
+                *ngIf="deleteStatus.can; else deleteMessageLink">
                 <i class="fa fa-trash"></i>
             </button>
             <ng-template #deleteMessageLink>
-                <button class="btn btn-link p-0 text-muted" [title]="'Delete'|translate" (click)="showDeleteMessage(deleteStatus.message)" *ngIf="deleteStatus.message">
+                <button class="btn btn-link p-0 text-muted" [title]="'Delete'|translate"
+                    (click)="showDeleteMessage(deleteStatus.message)" *ngIf="deleteStatus.message">
                     <i class="fa fa-trash"></i>
                 </button>
             </ng-template>
-
         </span>
-
     </div>
-</div>
+</div>
diff --git a/projects/rero/ng-core/src/lib/record/search/result/record-search-result.component.ts b/projects/rero/ng-core/src/lib/record/search/result/record-search-result.component.ts
@@ -46,7 +46,7 @@ export class RecordSearchResultComponent implements OnInit {
   /**
    * Detail URL value, resolved by observable property detailUrl$.
    */
-  detailUrl: string;
+  detailUrl: { link: string, external: boolean };
 
   /**
    * Record to display
@@ -100,7 +100,7 @@ export class RecordSearchResultComponent implements OnInit {
    * Observable emitting current value of record URL.
    */
   @Input()
-  detailUrl$: Observable<string> = null;
+  detailUrl$: Observable<{ link: string, external: boolean }> = null;
 
   /**
    * Event emitted when a record is deleted
@@ -139,7 +139,7 @@ export class RecordSearchResultComponent implements OnInit {
     }
 
     if (this.detailUrl$) {
-      this.detailUrl$.subscribe((url: string) => {
+      this.detailUrl$.subscribe((url: { link: string, external: boolean }) => {
         this.detailUrl = url;
       });
     }