Skip to content

Commit 1e36a10

Browse files
committed
[TLC-674] Properly test for existence of duplicates section
1 parent e76b6c9 commit 1e36a10

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
7676
*/
7777
showThumbnails: boolean;
7878

79-
enableDetectDuplicates$: Observable<any>;
80-
8179
constructor(
8280
protected linkService: LinkService,
8381
protected truncatableService: TruncatableService,
@@ -101,14 +99,6 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
10199
followLink('submitter')
102100
), followLink('action'));
103101

104-
// Get configuration for duplicate detection feature
105-
this.enableDetectDuplicates$ = this.configService.findByPropertyName('duplicate.enable').pipe(
106-
getFirstCompletedRemoteData(),
107-
map((rd: RemoteData<ConfigurationProperty>) => {
108-
return (rd.hasSucceeded && rd.payload && rd.payload.values[0] === 'true');
109-
})
110-
);
111-
112102
(this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
113103
getFirstCompletedRemoteData(),
114104
mergeMap((wfiRD: RemoteData<WorkflowItem>) => {

src/app/submission/objects/submission-objects.effects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ export class SubmissionObjectEffects {
449449
// or if configuration overrides this behaviour
450450
if (!alwaysDisplayDuplicates()) {
451451
const duplicatesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.Duplicates);
452-
if (isNotUndefined(duplicatesSectionId) && isEmpty((sections[duplicatesSectionId] as WorkspaceitemSectionDuplicatesObject).potentialDuplicates)) {
452+
if (isNotUndefined(duplicatesSectionId) && sections.hasOwnProperty(duplicatesSectionId) && isEmpty((sections[duplicatesSectionId] as WorkspaceitemSectionDuplicatesObject).potentialDuplicates)) {
453453
mappedActions.push(new CleanDuplicateDetectionAction(submissionId));
454454
}
455455
}

src/app/submission/objects/submission-objects.reducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ function deleteFile(state: SubmissionObjectState, action: DeleteUploadedFileActi
862862
}
863863

864864
function cleanDuplicateDetectionSection(state: SubmissionObjectState, action: CleanDuplicateDetectionAction): SubmissionObjectState {
865-
if (isNotEmpty(state[ action.payload.submissionId ])) {
865+
if (isNotEmpty(state[ action.payload.submissionId ]) && state[action.payload.submissionId].sections.hasOwnProperty('duplicates')) {
866866
return Object.assign({}, state, {
867867
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
868868
sections: Object.assign({}, state[ action.payload.submissionId ].sections, {

0 commit comments

Comments
 (0)