fixes
This commit is contained in:
parent
5e5bd39313
commit
a1ee9c82bc
|
@ -140,6 +140,7 @@ public class GrantManager {
|
|||
|
||||
grants.add(grant);
|
||||
}
|
||||
grants = grants.stream().filter(grant -> grant.getLabel() != null).collect(Collectors.toList());
|
||||
grants.sort(Comparator.comparing(Grant::getLabel));
|
||||
grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList());
|
||||
return grants;
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
<button mat-raised-button type="button" class="col-auto align-self-center new-releases-btn">{{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}</button>
|
||||
</a>
|
||||
</div>
|
||||
<!-- <span class="col-auto ml-auto">
|
||||
<img class="laptop-img\6" src="../../../assets/images/dashboard-popup.png">
|
||||
</span> -->
|
||||
<span class="new-releases-logo">
|
||||
<img class="laptop-img\6" src="../../../assets/images/new-releases-logo.png">
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">
|
||||
|
|
|
@ -500,6 +500,12 @@ input[type="text"] {
|
|||
opacity: 1;
|
||||
}
|
||||
|
||||
.new-releases-logo {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
/* ::ng-deep .mat-tab-group {
|
||||
height: 100%;
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
<ul *ngIf="hasProfile(i)" class="add-dataset-option">
|
||||
<ul *ngIf="dmp?.id && hasProfile(i)" class="add-dataset-option">
|
||||
<li>
|
||||
<a class="add-dataset-action" [routerLink]="['/datasets/new/' + dmp.id + '/' + i]">
|
||||
<mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-FOR-SECTION' | translate}}
|
||||
|
|
|
@ -486,7 +486,7 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im
|
|||
}
|
||||
|
||||
hasProfile(sectionIndex: number): boolean {
|
||||
return this.formGroup.get('profiles') && this.formGroup.get('profiles').value && this.formGroup.get('profiles').value.some(x => x.data.dmpSectionIndex.includes(sectionIndex));
|
||||
return this.formGroup.get('profiles') && this.formGroup.get('profiles').value && this.formGroup.get('profiles').value.some(x => x.data?.dmpSectionIndex?.includes(sectionIndex));
|
||||
}
|
||||
|
||||
addDataset(dmpSectionIndex: number) {
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 4.0 KiB |
Loading…
Reference in New Issue