Project

General

Profile

« Previous | Next » 

Revision 56947

[mergeResultLandingPage | Library]:
1. alert.ts: Add input field 'classBody' to add class in modal (e.g. for width).
2. project.component & resultLanding.component: Call <metrics> only when the accordion in clicked.
3. resultLanding.component:
a. Bug fix: variable was used as string
b. Bioentities preprocessing not only for publications
c. metrics valid only when actually clicked
d. modal for other versions (deleted by inference) added in html only if there are other versions & use 'classBody' to set its width.

View differences:

resultLanding.component.html
348 348
                  Metrics
349 349
                </a>
350 350
                <div class="uk-accordion-content">
351
                  <metrics [pageViews]="pageViews"
351
                  <metrics *ngIf="metricsClicked" [pageViews]="pageViews"
352 352
                           [id]="id" [entityType]="'results'" [entity]="title"
353 353
                           (metricsResults)="metricsResults($event)" [properties]=properties>
354 354
                  </metrics>
......
477 477
              </li>
478 478
            </ul>
479 479
          </div>
480
          <modal-alert *ngIf="resultLandingInfo.deletedByInferenceIds"
481
                       #AlertModalDeletedByInference classBody="uk-width-xxlarge">
482
            <deletedByInference *ngIf="type == 'publication'"
483
                                [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'publications'"></deletedByInference>
484
            <deletedByInference *ngIf="type == 'dataset'"
485
                                [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'research data'"></deletedByInference>
486
            <deletedByInference *ngIf="type == 'software'"
487
                                [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'software'"></deletedByInference>
488
            <deletedByInference *ngIf="type == 'orp'"
489
                                [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'other research products'"></deletedByInference>
490
          </modal-alert>
480 491
        </div>
481 492
        <helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
482 493
                [texts]="pageContents['bottom']"></helper>
......
487 498
  </div>
488 499
</div>
489 500

  
490
<modal-alert #AlertModalDeletedByInference>
491
  <deletedByInference *ngIf="type == 'publication'"
492
                      [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'publications'"></deletedByInference>
493
  <deletedByInference *ngIf="type == 'dataset'"
494
                      [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'research data'"></deletedByInference>
495
  <deletedByInference *ngIf="type == 'software'"
496
                      [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'software'"></deletedByInference>
497
  <deletedByInference *ngIf="type == 'orp'"
498
                      [id]="id" [ids]="resultLandingInfo.deletedByInferenceIds" [type]="'other research products'"></deletedByInference>
499
</modal-alert>
500 501

  

Also available in: Unified diff