Skip to content

Commit eb5acf8

Browse files
alexandrevryghemalexandrevryghem
committed
Merge branch 'w2p-112807_theme-ItemDetailPreviewFieldComponent' into minor-themed-component-fixes_contribute-main
# Conflicts: # src/app/my-dspace-page/my-dspace-search.module.ts # src/themes/custom/lazy-theme.module.ts
2 parents c23500b + 6764006 commit eb5acf8

6 files changed

Lines changed: 75 additions & 8 deletions

File tree

‎src/app/my-dspace-page/my-dspace-search.module.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydsp
99
import { ClaimedTaskSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component';
1010
import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
1111
import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
12+
import { ThemedItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/themed-item-detail-preview-field.component';
1213
import { ItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
1314
import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
1415
import { WorkflowItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
@@ -48,6 +49,7 @@ const DECLARATIONS = [
4849
ItemCollectionComponent,
4950
ItemDetailPreviewComponent,
5051
ItemDetailPreviewFieldComponent,
52+
ThemedItemDetailPreviewFieldComponent,
5153
ItemListPreviewComponent,
5254
ThemedItemListPreviewComponent,
5355
];

‎src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/themed-item-detail-preview-field.component.ts‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import {
2+
Component,
3+
Input,
4+
} from '@angular/core';
5+
6+
import { Item } from '../../../../../core/shared/item.model';
7+
import { SearchResult } from '../../../../search/models/search-result.model';
8+
import { ThemedComponent } from '../../../../theme-support/themed.component';
9+
import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component';
10+
11+
/**
12+
* Themed wrapper for {@link ItemDetailPreviewFieldComponent}
13+
*/
14+
@Component({
15+
selector: 'ds-themed-item-detail-preview-field',
16+
templateUrl: '../../../../theme-support/themed.component.html',
17+
})
18+
export class ThemedItemDetailPreviewFieldComponent extends ThemedComponent<ItemDetailPreviewFieldComponent> {
19+
20+
protected inAndOutputNames: (keyof ItemDetailPreviewFieldComponent & keyof this)[] = [
21+
'item',
22+
'object',
23+
'label',
24+
'metadata',
25+
'placeholder',
26+
'separator',
27+
];
28+
29+
@Input() item: Item;
30+
31+
@Input() object: SearchResult<any>;
32+
33+
@Input() label: string;
34+
35+
@Input() metadata: string | string[];
36+
37+
@Input() placeholder: string;
38+
39+
@Input() separator: string;
40+
41+
protected getComponentName(): string {
42+
return 'ItemDetailPreviewFieldComponent';
43+
}
44+
45+
protected importThemedComponent(themeName: string): Promise<any> {
46+
return import(`../../../../../../themes/${themeName}/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component`);
47+
}
48+
49+
protected importUnthemedComponent(): Promise<any> {
50+
return import('./item-detail-preview-field.component');
51+
}
52+
}

‎src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@
2222
</ng-container>
2323
</ds-metadata-field-wrapper>
2424
</ng-container>
25-
<ds-item-detail-preview-field [item]="item"
25+
<ds-themed-item-detail-preview-field [item]="item"
2626
[object]="object"
2727
[label]="('item.page.date' | translate)"
2828
[metadata]="'dc.date.issued'"
2929
[separator]="separator"
30-
[placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
31-
<ds-item-detail-preview-field [item]="item"
30+
[placeholder]="('mydspace.results.no-date' | translate)"></ds-themed-item-detail-preview-field>
31+
<ds-themed-item-detail-preview-field [item]="item"
3232
[object]="object"
3333
[label]="('item.page.author' | translate)"
3434
[metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
3535
[separator]="separator"
36-
[placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>
36+
[placeholder]="('mydspace.results.no-authors' | translate)"></ds-themed-item-detail-preview-field>
3737
</div>
3838
<div class="col-xs-12 col-md-6">
39-
<ds-item-detail-preview-field [item]="item"
39+
<ds-themed-item-detail-preview-field [item]="item"
4040
[object]="object"
4141
[label]="('item.page.abstract' | translate)"
4242
[metadata]="'dc.description.abstract'"
4343
[separator]="separator"
44-
[placeholder]="('mydspace.results.no-abstract' | translate)"></ds-item-detail-preview-field>
45-
<ds-item-detail-preview-field [item]="item"
44+
[placeholder]="('mydspace.results.no-abstract' | translate)"></ds-themed-item-detail-preview-field>
45+
<ds-themed-item-detail-preview-field [item]="item"
4646
[object]="object"
4747
[label]="('item.page.uri' | translate)"
4848
[metadata]="'dc.identifier.uri'"
4949
[separator]="separator"
50-
[placeholder]="('mydspace.results.no-uri' | translate)"></ds-item-detail-preview-field>
50+
[placeholder]="('mydspace.results.no-uri' | translate)"></ds-themed-item-detail-preview-field>
5151
<div>
5252
<ng-content></ng-content>
5353
</div>

‎src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html‎

Whitespace-only changes.

‎src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
3+
import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../../../../../app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
4+
5+
@Component({
6+
selector: 'ds-item-detail-preview-field',
7+
// templateUrl: './item-detail-preview-field.component.html',
8+
templateUrl: '../../../../../../../../app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html',
9+
})
10+
export class ItemDetailPreviewFieldComponent extends BaseComponent {
11+
}

‎src/themes/custom/lazy-theme.module.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ import { BadgesComponent } from './app/shared/object-collection/shared/badges/ba
120120
import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
121121
import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
122122
import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
123+
import { ItemDetailPreviewFieldComponent } from './app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
123124
import { ItemListPreviewComponent } from './app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
124125
import { ObjectListComponent } from './app/shared/object-list/object-list.component';
125126
import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
@@ -229,6 +230,7 @@ const DECLARATIONS = [
229230
SearchComponent,
230231
ItemListPreviewComponent,
231232
MetadataImportPageComponent,
233+
ItemDetailPreviewFieldComponent,
232234
];
233235

234236
@NgModule({

0 commit comments

Comments
 (0)