Skip to content

Commit fa5214e

Browse files
committed
Added version history as item-field
1 parent 640a076 commit fa5214e

6 files changed

Lines changed: 31 additions & 9 deletions

File tree

src/app/item-page/simple/item-page.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
99
<ds-item-versions-notice [item]="item"></ds-item-versions-notice>
1010
<ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
11-
<ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
11+
<!-- <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions> -->
1212
<div *ngIf="(hasFiles | async) === true">
1313
<ds-clarin-files-section [item]="item" [itemHandle]="itemHandle"></ds-clarin-files-section>
1414
</div>

src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@
114114
[iconName]="'fa-sitemap'"
115115
[separator]="'<br />'">
116116
</ds-clarin-collections-item-field>
117+
<ds-item-versions
118+
[item]="object"
119+
[iconName]="'fa-history'"
120+
[displayTitle]="false"
121+
[displayActions]="true">
122+
</ds-item-versions>
117123
<div class="clarin-item-page-field">
118124
<a [routerLink]="[itemPageRoute + '/full']">
119125
{{"item.page.link.full" | translate}}

src/app/item-page/versions/item-versions.component.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
<div *ngIf="(versionsDTO$ | async) as versionsDTO; else noItemVersion" class="mb-2">
2-
<div *ngIf="(versionRD$ | async)?.payload as itemVersion">
3-
4-
<!-- Toggle Header -->
5-
<div class="d-flex align-items-center mb-2 cursor-pointer" (click)="toggleVersionHistory()">
6-
<h4 class="mb-0 me-2">{{ "item.version.history.head" | translate }}</h4>
7-
<i class="fas" [ngClass]="showVersionHistory ? 'fa-chevron-up' : 'fa-chevron-down'"></i>
1+
<div *ngIf="(versionsDTO$ | async) as versionsDTO; else noItemVersion">
2+
<div *ngIf="(versionRD$ | async)?.payload as itemVersion" class="row clarin-item-page-field">
3+
<div class="col-lg-3 col-2-5 d-flex align-self-start">
4+
<div><i [class]="'fas ' + iconName + ' fa-xs'"></i></div>
5+
<!-- Toggle Header -->
6+
<div class="pl-1 d-flex align-items-center cursor-pointer" (click)="toggleVersionHistory()">
7+
<b class="mb-0 me-2">{{ "item.version.history.head" | translate }}</b>
8+
<i class="fas" [ngClass]="showVersionHistory ? 'fa-chevron-up' : 'fa-chevron-down'"></i>
9+
</div>
810
</div>
911

1012
<!-- Collapsible Content -->
11-
<div class="collapse" [ngClass]="{'show': showVersionHistory}">
13+
<div class="col-lg-9 collapse" [ngClass]="{'show': showVersionHistory}">
1214
<ds-pagination *ngIf="versionsDTO.versionDTOs.length > 0"
1315
(paginationChange)="onPageChange()"
1416
[hideGear]="true"

src/app/item-page/versions/item-versions.component.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@
77
float: right;
88
text-align: right;
99
}
10+
11+
@media (min-width: 992px) {
12+
.col-2-5 {
13+
flex: 0 0 20%;
14+
max-width: 20%;
15+
}
16+
}

src/app/item-page/versions/item-versions.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
8080
*/
8181
@Input() item: Item;
8282

83+
/**
84+
* Fontawesome v5. icon name with default settings.
85+
*/
86+
@Input() iconName: string;
87+
8388
/**
8489
* An option to display the list of versions, even when there aren't any.
8590
* Instead of the table, an alert will be displayed, notifying the user there are no other versions present

src/themes/custom/eager-theme.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import { CollectionDropdownComponent } from './app/shared/collection-dropdown/co
4444
import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
4545
import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
4646
import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
47+
import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
4748
import { FileDownloadLinkComponent } from './app/shared/file-download-link/file-download-link.component';
4849
import { StartsWithDateComponent } from './app/shared/starts-with/date/starts-with-date.component';
4950
import { StartsWithTextComponent } from './app/shared/starts-with/text/starts-with-text.component';
@@ -111,6 +112,7 @@ const DECLARATIONS = [
111112
ResultsBackButtonModule,
112113
ItemPageModule,
113114
ItemSharedModule,
115+
ItemVersionsModule,
114116
DsoPageModule,
115117
],
116118
declarations: DECLARATIONS,

0 commit comments

Comments
 (0)