Skip to content

Commit 71c8a4a

Browse files
committed
[DSC-1555] Disable thumbnail preview for mydspace page results
1 parent 8230199 commit 71c8a4a

30 files changed

Lines changed: 119 additions & 72 deletions

File tree

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
3636

3737
ngOnInit(): void {
3838
super.ngOnInit();
39-
this.showThumbnails = this.appConfig.browseBy.showThumbnails;
4039
}
4140
}

src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
1+
import {
2+
listableObjectComponent
3+
} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
24
import { ViewMode } from '../../../../../core/shared/view-mode.model';
35
import { Context } from '../../../../../core/shared/context.model';
46
import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
5-
import { Component } from '@angular/core';
6-
import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
7+
import { Component, Inject } from '@angular/core';
8+
import {
9+
SidebarSearchListElementComponent
10+
} from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
711
import { Item } from '../../../../../core/shared/item.model';
812
import { isNotEmpty } from '../../../../../shared/empty.util';
913
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
1014
import { LinkService } from '../../../../../core/cache/builders/link.service';
1115
import { TranslateService } from '@ngx-translate/core';
1216
import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
17+
import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
1318

1419
@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
1520
@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
@@ -22,12 +27,13 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
2227
* a sidebar search modal
2328
*/
2429
export class PersonSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
25-
constructor(protected truncatableService: TruncatableService,
30+
constructor(@Inject(APP_CONFIG) protected appConfig: AppConfig,
31+
protected truncatableService: TruncatableService,
2632
protected linkService: LinkService,
2733
protected translateService: TranslateService,
2834
public dsoNameService: DSONameService,
2935
) {
30-
super(truncatableService, linkService, dsoNameService);
36+
super(appConfig, truncatableService, linkService, dsoNameService);
3137
}
3238

3339
/**

src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
<div class="card p-1">
4141
<ng-container
4242
*ngFor="let match of object.matchObjects | slice: (pageConfig.currentPage-1) * pageConfig.pageSize : pageConfig.currentPage * pageConfig.pageSize">
43-
<ds-themed-item-list-preview [item]="match" [object]="itemPreviewObject" [metadataList]="metadataList">
43+
<ds-themed-item-list-preview [item]="match"
44+
[object]="itemPreviewObject"
45+
[metadataList]="metadataList"
46+
[showThumbnails]="showThumbnails">
4447
</ds-themed-item-list-preview>
4548
<div class="offset-2">
4649
<a class="btn btn-primary mt-1" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"

src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { Component, Inject, OnInit } from '@angular/core';
22
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
3-
import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
3+
import {
4+
SearchResultListElementComponent
5+
} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
46
import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
5-
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
7+
import {
8+
listableObjectComponent
9+
} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
610
import { ViewMode } from '../../../../../core/shared/view-mode.model';
711
import { Item } from '../../../../../core/shared/item.model';
812
import { Context } from '../../../../../core/shared/context.model';
@@ -72,7 +76,6 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
7276
}
7377
);
7478
}
75-
this.showThumbnails = this.appConfig.browseBy.showThumbnails;
7679
}
7780

7881
select(value) {

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { Component, Inject, OnInit } from '@angular/core';
22
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
3-
import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
3+
import {
4+
SearchResultListElementComponent
5+
} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
46
import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
5-
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
7+
import {
8+
listableObjectComponent
9+
} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
610
import { ViewMode } from '../../../../../core/shared/view-mode.model';
711
import { Item } from '../../../../../core/shared/item.model';
812
import { Context } from '../../../../../core/shared/context.model';
@@ -65,7 +69,6 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
6569
this.selectedName = nameVariant || defaultValue;
6670
}
6771
);
68-
this.showThumbnails = this.appConfig.browseBy.showThumbnails;
6972
}
7073

7174
select(value) {

src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
2-
import {Observable} from 'rxjs';
3-
import {Item} from '../../../core/shared/item.model';
4-
import {MetadataValue} from '../../../core/shared/metadata.models';
5-
import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service';
2+
import { Observable } from 'rxjs';
3+
import { Item } from '../../../core/shared/item.model';
4+
import { MetadataValue } from '../../../core/shared/metadata.models';
5+
import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
66
import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
77

88
@Component({
@@ -36,6 +36,11 @@ export class VirtualMetadataComponent implements OnInit {
3636
*/
3737
@Input() rightItem: Item;
3838

39+
/**
40+
* Whether to show the thumbnail preview
41+
*/
42+
@Input() showThumbnails;
43+
3944
/**
4045
* Emits when the close button is pressed.
4146
*/
@@ -46,12 +51,6 @@ export class VirtualMetadataComponent implements OnInit {
4651
*/
4752
@Output() save = new EventEmitter();
4853

49-
/**
50-
* Indicates when thumbnails are required by configuration and therefore
51-
* need to be hidden in the modal layout.
52-
*/
53-
showThumbnails: boolean;
54-
5554
/**
5655
* Get an array of the left and the right item of the relationship to be deleted.
5756
*/
@@ -65,7 +64,7 @@ export class VirtualMetadataComponent implements OnInit {
6564
protected objectUpdatesService: ObjectUpdatesService,
6665
@Inject(APP_CONFIG) protected appConfig: AppConfig,
6766
) {
68-
this.showThumbnails = this.appConfig.browseBy.showThumbnails;
67+
this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
6968
}
7069

7170
/**

src/app/my-dspace-page/my-dspace-page.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[configurationList]="(configurationList$ | async)"
99
[context]="context"
1010
[viewModeList]="viewModeList"
11-
[projection]="projection">
11+
[projection]="projection"
12+
[showThumbnails]="false">
1213
<ds-my-dspace-new-bulk-import additionalSearchFormOptions></ds-my-dspace-new-bulk-import>
1314
</ds-search>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ <h4 class="alert-heading mb-0">{{ 'claimed-approved-search-result-list-element.t
55
[item]="(workflowitem?.item | async)?.payload"
66
[object]="object"
77
[badgeContext]="badgeContext"
8-
[showSubmitter]="showSubmitter"></ds-themed-item-list-preview>
8+
[showSubmitter]="showSubmitter"
9+
[showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
910
</div>
1011
</ng-container>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ <h4 class="alert-heading mb-0">{{ 'claimed-declined-search-result-list-element.t
55
[item]="(workflowitem?.item | async)?.payload"
66
[object]="object"
77
[badgeContext]="badgeContext"
8-
[showSubmitter]="showSubmitter"></ds-themed-item-list-preview>
8+
[showSubmitter]="showSubmitter"
9+
[showThumbnails]="showThumbnails"></ds-themed-item-list-preview>
910
</div>
1011
</ng-container>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ <h4 class="alert-heading mb-0">{{ 'claimed-declined-task-search-result-list-elem
55
[item]="(workflowitem?.item | async)?.payload"
66
[object]="object"
77
[badgeContext]="badgeContext"
8-
[showSubmitter]="showSubmitter">
8+
[showSubmitter]="showSubmitter"
9+
[showThumbnails]="showThumbnails">
910
</ds-themed-item-list-preview>
1011
</div>
1112
</ng-container>

0 commit comments

Comments
 (0)