From 7ee425e4a375bfafe509def7d8492189fd0d51b5 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 17 Jan 2024 15:05:57 +0100 Subject: [PATCH 1/3] 111103: Added SearchComponent to custom theme in order to easily theme it --- .../custom/app/shared/search/search.component.html | 0 .../custom/app/shared/search/search.component.scss | 0 .../custom/app/shared/search/search.component.ts | 13 +++++++++++++ src/themes/custom/lazy-theme.module.ts | 2 ++ 4 files changed, 15 insertions(+) create mode 100644 src/themes/custom/app/shared/search/search.component.html create mode 100644 src/themes/custom/app/shared/search/search.component.scss create mode 100644 src/themes/custom/app/shared/search/search.component.ts 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 0000000000..e69de29bb2 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 0000000000..e69de29bb2 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 0000000000..f54f707e53 --- /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 edb3f5478c..4c4faa5193 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -156,6 +156,7 @@ 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 { SearchComponent } from './app/shared/search/search.component'; const DECLARATIONS = [ FileSectionComponent, @@ -239,6 +240,7 @@ const DECLARATIONS = [ SubmissionSectionUploadFileComponent, ItemStatusComponent, EditBitstreamPageComponent, + SearchComponent, ]; @NgModule({ From 5d123277b014b24943a5c3947c8c6493db69f379 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Thu, 18 Jan 2024 15:51:19 +0100 Subject: [PATCH 2/3] Moved custom theme ComcolPageBrowseByComponent & ComcolPageHandleComponent to their correct folder --- .../themed-comcol-page-browse-by.component.ts | 2 +- .../comcol-page-browse-by.component.ts | 15 --------------- .../comcol-page-handle.component.ts | 18 ------------------ .../comcol-page-browse-by.component.html | 0 .../comcol-page-browse-by.component.scss | 0 .../comcol-page-browse-by.component.ts | 12 ++++++++++++ .../comcol-page-handle.component.html | 0 .../comcol-page-handle.component.scss | 0 .../comcol-page-handle.component.ts | 12 ++++++++++++ src/themes/custom/lazy-theme.module.ts | 4 ++-- 10 files changed, 27 insertions(+), 36 deletions(-) delete mode 100644 src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts delete mode 100644 src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts rename src/themes/custom/app/shared/{ => comcol}/comcol-page-browse-by/comcol-page-browse-by.component.html (100%) rename src/themes/custom/app/shared/{ => comcol}/comcol-page-browse-by/comcol-page-browse-by.component.scss (100%) create mode 100644 src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts rename src/themes/custom/app/shared/{ => comcol}/comcol-page-handle/comcol-page-handle.component.html (100%) rename src/themes/custom/app/shared/{ => comcol}/comcol-page-handle/comcol-page-handle.component.scss (100%) create mode 100644 src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts 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 08a13eddf8..2a21605109 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/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 c6805175b0..0000000000 --- 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 ef68f1538f..0000000000 --- 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 0000000000..de9ad27693 --- /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 0000000000..f0f79fddd2 --- /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/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 4c4faa5193..42d24665ce 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'; From 8bf7e4fb5aab029ec2405a8ed6a698499edff691 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Fri, 19 Jan 2024 08:53:50 +0100 Subject: [PATCH 3/3] Added ItemListPreviewComponent template to custom theme --- src/app/my-dspace-page/my-dspace-search.module.ts | 3 +++ .../item-list-preview.component.html | 0 .../item-list-preview.component.scss | 0 .../item-list-preview.component.ts | 14 ++++++++++++++ src/themes/custom/lazy-theme.module.ts | 2 ++ 5 files changed, 19 insertions(+) create mode 100644 src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html create mode 100644 src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss create mode 100644 src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts 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 71d1343a30..ec755c6e91 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,9 @@ const DECLARATIONS = [ ResearchEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(), ], + exports: [ + ...DECLARATIONS, + ], declarations: [ ...DECLARATIONS, ] 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 0000000000..e69de29bb2 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 0000000000..e69de29bb2 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 0000000000..3d5003df60 --- /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/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 42d24665ce..a694d8349a 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -157,6 +157,7 @@ import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream- import { FormModule } from '../../app/shared/form/form.module'; import { RequestCopyModule } from 'src/app/request-copy/request-copy.module'; 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, @@ -241,6 +242,7 @@ const DECLARATIONS = [ ItemStatusComponent, EditBitstreamPageComponent, SearchComponent, + ItemListPreviewComponent, ]; @NgModule({