fix on dashboard's url parameter "type"
This commit is contained in:
parent
1069c6374d
commit
b2715dcf24
|
@ -63,15 +63,15 @@
|
||||||
<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab aria-label="drafts" label="{{'DASHBOARD.DRAFTS' | translate}}">
|
<mat-tab aria-label="drafts" label="{{'DASHBOARD.DRAFTS' | translate}}">
|
||||||
<app-recent-edited-activity [isActive]="currentType == 'drafts'" [includeDmps]="true" [includeDescriptions]="true" [onlyDrafts]="true" type="drafts"></app-recent-edited-activity>
|
<app-recent-edited-activity [isActive]="currentType == 'drafts'" [includeDmps]="true" [includeDescriptions]="true" [onlyDrafts]="true" type="drafts" [selectedType]="currentType"></app-recent-edited-activity>
|
||||||
<div *ngIf="totalDraftDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
<div *ngIf="totalDraftDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
||||||
</mat-tab>>
|
</mat-tab>>
|
||||||
<mat-tab aria-label="dmps" label="{{'DASHBOARD.DMPS' | translate}}">
|
<mat-tab aria-label="dmps" label="{{'DASHBOARD.DMPS' | translate}}">
|
||||||
<app-recent-edited-activity [isActive]="currentType == 'dmps'" [includeDmps]="true" type="dmps"></app-recent-edited-activity>
|
<app-recent-edited-activity [isActive]="currentType == 'dmps'" [includeDmps]="true" type="dmps" [selectedType]="currentType"></app-recent-edited-activity>
|
||||||
<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab aria-label="descriptions" label="{{'DASHBOARD.DESCRIPTIONS' | translate}}">
|
<mat-tab aria-label="descriptions" label="{{'DASHBOARD.DESCRIPTIONS' | translate}}">
|
||||||
<app-recent-edited-activity [isActive]="currentType == 'descriptions'" [includeDescriptions]="true" type="descriptions"></app-recent-edited-activity>
|
<app-recent-edited-activity [isActive]="currentType == 'descriptions'" [includeDescriptions]="true" type="descriptions" [selectedType]="currentType"></app-recent-edited-activity>
|
||||||
<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
|
||||||
<div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
|
<div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
|
||||||
<button mat-raised-button class="add-dataset" (click)="addNewDescription()">
|
<button mat-raised-button class="add-dataset" (click)="addNewDescription()">
|
||||||
|
|
|
@ -40,6 +40,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
listingItems: RecentActivityItem[]= [];
|
listingItems: RecentActivityItem[]= [];
|
||||||
|
|
||||||
@Input() type: string;
|
@Input() type: string;
|
||||||
|
@Input() selectedType: string;
|
||||||
@Input() includeDescriptions: boolean = false;
|
@Input() includeDescriptions: boolean = false;
|
||||||
@Input() includeDmps: boolean = false;
|
@Input() includeDmps: boolean = false;
|
||||||
@Input() onlyDrafts: boolean = false;
|
@Input() onlyDrafts: boolean = false;
|
||||||
|
@ -131,7 +132,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
|
|
||||||
updateUrl() {
|
updateUrl() {
|
||||||
let parametersArray: string[] = [
|
let parametersArray: string[] = [
|
||||||
...(this.type ? ["type=" + this.type] : []),
|
...( this.selectedType && this.type === this.selectedType ? ["type=" + this.selectedType] : []),
|
||||||
...(this.currentPage > 1 ? ["page=" + this.currentPage] : []),
|
...(this.currentPage > 1 ? ["page=" + this.currentPage] : []),
|
||||||
...(this.formGroup.get("like").value ? ["keyword=" + this.formGroup.get("like").value] : [])
|
...(this.formGroup.get("like").value ? ["keyword=" + this.formGroup.get("like").value] : [])
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue