diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html index e3293be3a04..8f208c4a153 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html @@ -3,12 +3,12 @@ - - + + - - + +
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index 178ed86c40c..243e3b898b9 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -102,7 +102,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -187,7 +187,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html index 8d7fbda4af9..dbee45223c6 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html @@ -3,12 +3,12 @@ - - + + - - + +
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index 71fa83a3b1e..1f3882d642a 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -101,7 +101,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -184,7 +184,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html index 6d7f9293ec4..77e137597e6 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html @@ -2,12 +2,12 @@
- - + + - - + +
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts index 07970d71282..4a1c46d2524 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts @@ -97,7 +97,7 @@ describe('JournalSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -157,7 +157,7 @@ describe('JournalSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html index 07c7c5bb893..0bb48432ee8 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html @@ -3,18 +3,18 @@ - - + + - - + +
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts index 9609a9582aa..88109b26d31 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts @@ -104,7 +104,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -171,7 +171,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeNull(); }); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html index f3f892bc986..8eea99f606c 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html @@ -3,18 +3,18 @@ - - + + - - + +
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts index 31018520f62..3e13aa665ca 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts @@ -104,7 +104,7 @@ describe('PersonSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -171,7 +171,7 @@ describe('PersonSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html index 93289aa5251..77ae47f69de 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html @@ -3,18 +3,18 @@ - - + + - - + +
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index 0cb3e63e870..3186aa60670 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -96,7 +96,7 @@ describe('ProjectSearchResultListElementComponent', () => { }); it('should add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -157,7 +157,7 @@ describe('ProjectSearchResultListElementComponent', () => { }); it('should not add thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html index dd2589c7262..32a85062bb0 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html @@ -2,18 +2,18 @@
- - + + - - + +
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts index 9e4d3471506..c596f49f1eb 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts @@ -167,8 +167,8 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { fixture.detectChanges(); }); - it('should add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeTruthy(); }); }); @@ -223,8 +223,8 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { fixture.detectChanges(); }); - it('should not add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should not add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeNull(); }); }); diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html index c8a02e039c7..cbc78605cad 100644 --- a/src/app/item-page/media-viewer/media-viewer.component.html +++ b/src/app/item-page/media-viewer/media-viewer.component.html @@ -20,8 +20,8 @@ [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder" [preview]="false" > - - + + diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts index 71d1343a30d..07e5961ec0c 100644 --- a/src/app/my-dspace-page/my-dspace-search.module.ts +++ b/src/app/my-dspace-page/my-dspace-search.module.ts @@ -62,6 +62,10 @@ const DECLARATIONS = [ ResearchEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(), ], + exports: [ + ItemCollectionComponent, + ItemSubmitterComponent + ], declarations: [ ...DECLARATIONS, ] diff --git a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts index 08a13eddf8e..2a216051099 100644 --- a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts @@ -24,7 +24,7 @@ export class ThemedComcolPageBrowseByComponent extends ThemedComponent { - return import(`../../../../themes/${themeName}/app/shared/comcol-page-browse-by/comcol-page-browse-by.component`); + return import(`../../../../themes/${themeName}/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component`); } protected importUnthemedComponent(): Promise { diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html index c8ef730faf4..ac599adfba4 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html @@ -1,7 +1,7 @@
- - + +
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts index aa618add35a..926d74c27a9 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts @@ -118,8 +118,8 @@ describe('ItemListPreviewComponent', () => { component.item = mockItemWithAuthorAndDate; fixture.detectChanges(); }); - it('should add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeTruthy(); }); }); @@ -223,8 +223,8 @@ describe('ItemListPreviewComponent', () => { component.item = mockItemWithAuthorAndDate; fixture.detectChanges(); }); - it('should add the ds-thumbnail element', () => { - const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add the thumbnail element', () => { + const thumbnail = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnail).toBeFalsy(); }); }); diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index f7a687048a2..db10cbee526 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -2,12 +2,12 @@
- - + + - - + +
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index 7665b7d64e3..224e98c9819 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -215,8 +215,8 @@ describe('ItemSearchResultListElementComponent', () => { expect(publicationListElementComponent.showThumbnails).toBeTrue(); }); - it('should add ds-thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should add thumbnail element', () => { + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeTruthy(); }); }); @@ -395,8 +395,8 @@ describe('ItemSearchResultListElementComponent', () => { fixture.detectChanges(); }); - it('should not add ds-thumbnail element', () => { - const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail')); + it('should not add thumbnail element', () => { + const thumbnailElement = fixture.debugElement.query(By.css('ds-themed-thumbnail')); expect(thumbnailElement).toBeFalsy(); }); }); diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts index 03f6f37e251..f44b1261286 100644 --- a/src/app/shared/search/themed-search.component.ts +++ b/src/app/shared/search/themed-search.component.ts @@ -9,6 +9,8 @@ import { ViewMode } from '../../core/shared/view-mode.model'; import { SearchObjects } from './models/search-objects.model'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { ListableObject } from '../object-collection/shared/listable-object.model'; +import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; /** * Themed wrapper for {@link SearchComponent} @@ -17,6 +19,12 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode selector: 'ds-themed-search', styleUrls: [], templateUrl: '../theme-support/themed.component.html', + providers: [ + { + provide: SEARCH_CONFIG_SERVICE, + useClass: SearchConfigurationService + } + ] }) export class ThemedSearchComponent extends ThemedComponent { diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts deleted file mode 100644 index c6805175b05..00000000000 --- a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; -import { ComcolPageBrowseByComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component'; - -/** - * A component to display the "Browse By" section of a Community or Collection page - * It expects the ID of the Community or Collection as input to be passed on as a scope - */ -@Component({ - selector: 'ds-comcol-page-browse-by', - // styleUrls: ['./comcol-page-browse-by.component.scss'], - styleUrls: ['../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'], - // templateUrl: './comcol-page-browse-by.component.html' - templateUrl: '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html' -}) -export class ComcolPageBrowseByComponent extends BaseComponent {} diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts deleted file mode 100644 index ef68f1538fa..00000000000 --- a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component } from '@angular/core'; -import { ComcolPageHandleComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component'; - - -/** - * This component builds a URL from the value of "handle" - */ - -@Component({ - selector: 'ds-comcol-page-handle', - // templateUrl: './comcol-page-handle.component.html', - templateUrl: '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html', - // styleUrls: ['./comcol-page-handle.component.scss'], - styleUrls: ['../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'], -}) - - -export class ComcolPageHandleComponent extends BaseComponent {} diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html similarity index 100% rename from src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html rename to src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss similarity index 100% rename from src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss rename to src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss diff --git a/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts new file mode 100644 index 00000000000..de9ad27693d --- /dev/null +++ b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; +import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component'; + +@Component({ + selector: 'ds-comcol-page-browse-by', + // styleUrls: ['./comcol-page-browse-by.component.scss'], + styleUrls: ['../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'], + // templateUrl: './comcol-page-browse-by.component.html' + templateUrl: '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html', +}) +export class ComcolPageBrowseByComponent extends BaseComponent { +} diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html similarity index 100% rename from src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html rename to src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss similarity index 100% rename from src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss rename to src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss diff --git a/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts new file mode 100644 index 00000000000..f0f79fddd28 --- /dev/null +++ b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; +import { ComcolPageHandleComponent as BaseComponent} from '../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component'; + +@Component({ + selector: 'ds-comcol-page-handle', + // templateUrl: './comcol-page-handle.component.html', + templateUrl: '../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html', + // styleUrls: ['./comcol-page-handle.component.scss'], + styleUrls: ['../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'], +}) +export class ComcolPageHandleComponent extends BaseComponent { +} diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts new file mode 100644 index 00000000000..3d5003df600 --- /dev/null +++ b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; +import { fadeInOut } from '../../../../../../../app/shared/animations/fade'; +import { ItemListPreviewComponent as BaseComponent } from '../../../../../../../app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component'; + +@Component({ + selector: 'ds-item-list-preview', + // styleUrls: ['./item-list-preview.component.scss'], + styleUrls: ['../../../../../../../app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss'], + // templateUrl: './item-list-preview.component.html', + templateUrl: '../../../../../../../app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html', + animations: [fadeInOut], +}) +export class ItemListPreviewComponent extends BaseComponent { +} diff --git a/src/themes/custom/app/shared/search/search.component.html b/src/themes/custom/app/shared/search/search.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/shared/search/search.component.scss b/src/themes/custom/app/shared/search/search.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/shared/search/search.component.ts b/src/themes/custom/app/shared/search/search.component.ts new file mode 100644 index 00000000000..f54f707e538 --- /dev/null +++ b/src/themes/custom/app/shared/search/search.component.ts @@ -0,0 +1,13 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { pushInOut } from '../../../../../app/shared/animations/push'; +import { SearchComponent as BaseComponent } from '../../../../../app/shared/search/search.component'; + +@Component({ + selector: 'ds-search', + styleUrls: ['./search.component.scss'], + templateUrl: './search.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [pushInOut], +}) +export class SearchComponent extends BaseComponent { +} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 73400e78806..575eb1ade50 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -81,7 +81,7 @@ import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component'; import { FeedbackComponent } from './app/info/feedback/feedback.component'; import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component'; -import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component'; +import { ComcolPageHandleComponent } from './app/shared/comcol/comcol-page-handle/comcol-page-handle.component'; import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component'; import { ExpandableNavbarSectionComponent @@ -92,7 +92,7 @@ import { import { LoadingComponent } from './app/shared/loading/loading.component'; import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component'; import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component'; -import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component'; +import { ComcolPageBrowseByComponent } from './app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component'; import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component'; import { CommunityPageSubCommunityListComponent } from './app/community-page/sub-community-list/community-page-sub-community-list.component'; import { CommunityPageSubCollectionListComponent } from './app/community-page/sub-collection-list/community-page-sub-collection-list.component'; @@ -156,9 +156,11 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/ import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component'; import { FormModule } from '../../app/shared/form/form.module'; import { RequestCopyModule } from 'src/app/request-copy/request-copy.module'; -import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component'; +import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component'; import { BrowseByComponent } from './app/shared/browse-by/browse-by.component'; import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component'; +import { SearchComponent } from './app/shared/search/search.component'; +import { ItemListPreviewComponent } from './app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component'; const DECLARATIONS = [ FileSectionComponent, @@ -245,6 +247,8 @@ const DECLARATIONS = [ UserMenuComponent, BrowseByComponent, RegisterEmailFormComponent, + SearchComponent, + ItemListPreviewComponent, ]; @NgModule({