Custom theme fixes

- Moved PublicationSidebarSearchListElementComponent to correct folder
- Synced standalone imports in the custom theme with src/app
- Pointed custom theme's SearchComponent template to the ones from src/app

Author: alexandrevryghem

src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts

@@ -24,9 +24,9 @@ import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzo
   selector: 'ds-base-metadata-import-page',
   templateUrl: './metadata-import-page.component.html',
   imports: [
-    TranslateModule,
-    FormsModule,
     FileDropzoneNoUploaderComponent,
+    FormsModule,
+    TranslateModule,
   ],
   standalone: true,
 })

src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts

@@ -13,7 +13,10 @@ import { TranslateModule } from '@ngx-translate/core';
   selector: 'ds-base-comcol-page-handle',
   styleUrls: ['./comcol-page-handle.component.scss'],
   templateUrl: './comcol-page-handle.component.html',
-  imports: [NgIf, TranslateModule],
+  imports: [
+    NgIf,
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class ComcolPageHandleComponent {

src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts

@@ -20,7 +20,12 @@ import { SearchResult } from '../../../../search/models/search-result.model';
   selector: 'ds-base-item-detail-preview-field',
   templateUrl: './item-detail-preview-field.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgIf, NgFor, TranslateModule],
+  imports: [
+    MetadataFieldWrapperComponent,
+    NgFor,
+    NgIf,
+    TranslateModule,
+  ],
 })
 export class ItemDetailPreviewFieldComponent {
 

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

@@ -38,7 +38,19 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
   templateUrl: 'item-list-preview.component.html',
   animations: [fadeInOut],
   standalone: true,
-  imports: [NgIf, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, ItemSubmitterComponent, ItemCollectionComponent, AsyncPipe, TranslateModule],
+  imports: [
+    AsyncPipe,
+    ItemCollectionComponent,
+    ItemSubmitterComponent,
+    NgClass,
+    NgFor,
+    NgIf,
+    ThemedBadgesComponent,
+    ThemedThumbnailComponent,
+    TranslateModule,
+    TruncatableComponent,
+    TruncatablePartComponent,
+  ],
 })
 export class ItemListPreviewComponent implements OnInit {
 

src/app/shared/search/search.component.ts

@@ -88,7 +88,18 @@ import { SearchConfigurationOption } from './search-switch-configuration/search-
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [pushInOut],
   standalone: true,
-  imports: [NgIf, NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
+  imports: [
+    AsyncPipe,
+    NgIf,
+    NgTemplateOutlet,
+    PageWithSidebarComponent,
+    ThemedSearchFormComponent,
+    ThemedSearchResultsComponent,
+    ThemedSearchSidebarComponent,
+    TranslateModule,
+    SearchLabelsComponent,
+    ViewModeSwitchComponent,
+  ],
 })
 
 /**

src/themes/custom/app/login-page/login-page.component.ts

@@ -14,7 +14,7 @@ import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/
   // templateUrl: './login-page.component.html'
   templateUrl: '../../../../app/login-page/login-page.component.html',
   standalone: true,
-  imports: [ThemedLogInComponent ,TranslateModule],
+  imports: [ThemedLogInComponent, TranslateModule],
 })
 export class LoginPageComponent extends BaseComponent {
 }

…debar-search-list-element.component.html …debar-search-list-element.component.htmlsrc/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.html renamed to src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.html renamed to src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html

@@ -6,12 +6,12 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { Context } from '../../../../../../../app/core/shared/context.model';
-import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
-import { ItemSearchResult } from '../../../../../../../app/shared/object-collection/shared/item-search-result.model';
-import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
-import { PublicationSidebarSearchListElementComponent as BaseComponent } from '../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
-import { TruncatablePartComponent } from '../../../../../../../app/shared/truncatable/truncatable-part/truncatable-part.component';
+import { Context } from '../../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../../app/core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../../../../app/shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { PublicationSidebarSearchListElementComponent as BaseComponent } from '../../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
+import { TruncatablePartComponent } from '../../../../../../../../app/shared/truncatable/truncatable-part/truncatable-part.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal, 'custom')
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'custom')
@@ -20,7 +20,7 @@ import { TruncatablePartComponent } from '../../../../../../../app/shared/trunca
 @Component({
   selector: 'ds-publication-sidebar-search-list-element',
   // templateUrl: './publication-sidebar-search-list-element.component.html',
-  templateUrl: '../../../../../../../app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
   imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
 })

…sidebar-search-list-element.component.ts …sidebar-search-list-element.component.tssrc/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts renamed to src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts renamed to src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts

@@ -20,8 +20,10 @@ import { ViewModeSwitchComponent } from '../../../../../app/shared/view-mode-swi
 
 @Component({
   selector: 'ds-themed-search',
-  styleUrls: ['./search.component.scss'],
-  templateUrl: './search.component.html',
+  // styleUrls: ['./search.component.scss'],
+  styleUrls: ['../../../../../app/shared/search/search.component.scss'],
+  // templateUrl: './search.component.html',
+  templateUrl: '../../../../../app/shared/search/search.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [pushInOut],
   standalone: true,

src/themes/custom/app/shared/search/search.component.ts

@@ -29,7 +29,7 @@ import { BrowseEntryListElementComponent } from './app/shared/object-list/browse
 import { CollectionListElementComponent } from './app/shared/object-list/collection-list-element/collection-list-element.component';
 import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
 import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { PublicationSidebarSearchListElementComponent } from './app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component';
+import { PublicationSidebarSearchListElementComponent } from './app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
 import { StartsWithDateComponent } from './app/shared/starts-with/date/starts-with-date.component';
 import { StartsWithTextComponent } from './app/shared/starts-with/text/starts-with-text.component';