Skip to content

Commit fc7997d

Browse files
100479: Removed the default input values to make it possible to override them in themes
1 parent 7b27251 commit fc7997d

7 files changed

Lines changed: 10 additions & 45 deletions

File tree

src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class ThemedMetadataRepresentationListComponent extends ThemedComponent<M
1919

2020
@Input() label: string;
2121

22-
@Input() incrementBy = 10;
22+
@Input() incrementBy: number;
2323

2424
protected getComponentName(): string {
2525
return 'MetadataRepresentationListComponent';

src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ export class ThemedCollectionDropdownComponent extends ThemedComponent<Collectio
1111

1212
@Input() entityType: string;
1313

14-
@Output() searchComplete = new EventEmitter<any>();
14+
@Output() searchComplete: EventEmitter<any> = new EventEmitter();
1515

16-
@Output() theOnlySelectable = new EventEmitter<CollectionListEntry>();
16+
@Output() theOnlySelectable: EventEmitter<CollectionListEntry> = new EventEmitter();
1717

18-
@Output() selectionChange = new EventEmitter<CollectionListEntry>();
18+
@Output() selectionChange = new EventEmitter();
1919

2020
protected inAndOutputNames: (keyof CollectionDropdownComponent & keyof this)[] = ['entityType', 'searchComplete', 'theOnlySelectable', 'selectionChange'];
2121

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,14 @@ import { RelationshipOptions } from '../../../models/relationship-options.model'
44
import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
55
import { Context } from '../../../../../../core/shared/context.model';
66
import { Item } from '../../../../../../core/shared/item.model';
7-
import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
8-
import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
97
import { Collection } from '../../../../../../core/shared/collection.model';
108
import { ExternalSource } from '../../../../../../core/shared/external-source.model';
119
import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
12-
import { fadeIn, fadeInOut } from '../../../../../animations/fade';
1310

1411
@Component({
1512
selector: 'ds-themed-dynamic-lookup-relation-external-source-tab',
1613
styleUrls: [],
1714
templateUrl: '../../../../../theme-support/themed.component.html',
18-
providers: [
19-
{
20-
provide: SEARCH_CONFIG_SERVICE,
21-
useClass: SearchConfigurationService
22-
}
23-
],
24-
animations: [
25-
fadeIn,
26-
fadeInOut
27-
]
2815
})
2916
export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
3017
protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId',
@@ -44,7 +31,7 @@ export class ThemedDynamicLookupRelationExternalSourceTabComponent extends Theme
4431

4532
@Input() repeatable: boolean;
4633

47-
@Output() importedObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
34+
@Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();
4835

4936
@Input() externalSource: ExternalSource;
5037

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,11 @@ import { Item } from '../../../../../../core/shared/item.model';
1010
import { SearchResult } from '../../../../../search/models/search-result.model';
1111
import { SearchObjects } from '../../../../../search/models/search-objects.model';
1212
import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
13-
import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
14-
import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
1513

1614
@Component({
1715
selector: 'ds-themed-dynamic-lookup-relation-search-tab',
1816
styleUrls: [],
1917
templateUrl: '../../../../../theme-support/themed.component.html',
20-
providers: [
21-
{
22-
provide: SEARCH_CONFIG_SERVICE,
23-
useClass: SearchConfigurationService
24-
}
25-
]
2618
})
2719
export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedComponent<DsDynamicLookupRelationSearchTabComponent> {
2820
protected inAndOutputNames: (keyof DsDynamicLookupRelationSearchTabComponent & keyof this)[] = ['relationship', 'listId',
@@ -51,11 +43,11 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
5143

5244
@Input() isEditRelationship: boolean;
5345

54-
@Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
46+
@Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
5547

56-
@Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
48+
@Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
5749

58-
@Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter<SearchObjects<DSpaceObject>>();
50+
@Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
5951

6052
protected getComponentName(): string {
6153
return 'DsDynamicLookupRelationSearchTabComponent';

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import { ChangeDetectorRef, Component, ComponentFactoryResolver, Input } from '@angular/core';
1+
import { Component, Input } from '@angular/core';
22
import { ThemedComponent } from '../../../theme-support/themed.component';
33
import { ItemListPreviewComponent } from './item-list-preview.component';
44
import { Item } from '../../../../core/shared/item.model';
55
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
66
import { SearchResult } from '../../../search/models/search-result.model';
77
import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model';
8-
import { ThemeService } from 'src/app/shared/theme-support/theme.service';
98

109
/**
1110
* Themed wrapper for ItemListPreviewComponent
@@ -28,18 +27,6 @@ export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPrev
2827

2928
@Input() workflowItem: WorkflowItem;
3029

31-
constructor(
32-
protected resolver: ComponentFactoryResolver,
33-
protected cdr: ChangeDetectorRef,
34-
protected themeService: ThemeService,
35-
) {
36-
super(resolver, cdr, themeService);
37-
}
38-
39-
ngOnInit() {
40-
super.ngOnInit();
41-
}
42-
4330
protected getComponentName(): string {
4431
return 'ItemListPreviewComponent';
4532
}

src/app/shared/object-list/themed-object-list.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Component, EventEmitter, Input, Output} from '@angular/core';
22
import { ObjectListComponent } from './object-list.component';
33
import { ThemedComponent } from '../theme-support/themed.component';
4-
import {ViewMode} from '../../core/shared/view-mode.model';
54
import {PaginationComponentOptions} from '../pagination/pagination-component-options.model';
65
import {SortDirection, SortOptions} from '../../core/cache/models/sort-options.model';
76
import {CollectionElementLinkType} from '../object-collection/collection-element-link.type';

src/app/shared/search/search-results/themed-search-results.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsC
2929

3030
@Input() searchConfig: PaginatedSearchOptions;
3131

32-
@Input() showCsvExport = false;
32+
@Input() showCsvExport: boolean;
3333

3434
@Input() sortConfig: SortOptions;
3535

0 commit comments

Comments
 (0)