From 1dcfb729a827e867f8f0120f2bb223a7cee7b5be Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Wed, 21 Oct 2020 10:23:56 +0200 Subject: [PATCH 1/2] fix issue where item search results would always have a shadow, instead of only when they're focused --- .../search-result-grid-element.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts index dc05f78e40..c8c413a81b 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts @@ -32,9 +32,6 @@ export class SearchResultGridElementComponent, K exten protected bitstreamDataService: BitstreamDataService ) { super(); - if (hasValue(this.object)) { - this.isCollapsed$ = this.isCollapsed(); - } } /** @@ -43,6 +40,7 @@ export class SearchResultGridElementComponent, K exten ngOnInit(): void { if (hasValue(this.object)) { this.dso = this.object.indexableObject; + this.isCollapsed$ = this.isCollapsed(); } } From c4687116e5c237a5daf4523ccd5835381e9c4399 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Wed, 21 Oct 2020 11:35:05 +0200 Subject: [PATCH 2/2] add isCollapsed to mock TruncatableService --- ...arch-result-admin-workflow-grid-element.component.spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts index 2f3f88fa70..6436f2d873 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts @@ -18,6 +18,7 @@ import { WorkflowItemSearchResult } from '../../../../../shared/object-collectio import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock'; +import { of as observableOf } from 'rxjs'; describe('WorkflowItemAdminWorkflowGridElementComponent', () => { let component: WorkflowItemSearchResultAdminWorkflowGridElementComponent; @@ -50,7 +51,9 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => { ], providers: [ { provide: LinkService, useValue: linkService }, - { provide: TruncatableService, useValue: {} }, + { provide: TruncatableService, useValue: { + isCollapsed: () => observableOf(true), + } }, { provide: BitstreamDataService, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA]