From ff98a9bcd8a24da67fd13c6d64e63b46f525adcf Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 23 Jan 2023 13:32:25 +0100
Subject: [PATCH 1/2] Fixed ThemedListableObjectComponentLoader

---
 .../themed-listable-object-component-loader.component.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
index d2c50e22c9..44836fe2fc 100644
--- a/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
@@ -7,12 +7,12 @@ import { Context } from '../../../../core/shared/context.model';
 import { CollectionElementLinkType } from '../../collection-element-link.type';
 
 /**
- * Themed wrapper for SearchComponent
+ * Themed wrapper for ListableObjectComponentLoaderComponent
  */
 @Component({
   selector: 'ds-themed-listable-object-component-loader',
   styleUrls: [],
-  templateUrl: '../theme-support/themed.component.html',
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedListableObjectComponentLoaderComponent extends ThemedComponent<ListableObjectComponentLoaderComponent> {
   protected inAndOutputNames: (keyof ListableObjectComponentLoaderComponent & keyof this)[] = [
@@ -34,7 +34,7 @@ export class ThemedListableObjectComponentLoaderComponent extends ThemedComponen
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component`);
+    return import(`../../../../../themes/${themeName}/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {

From 4682507b25b918c99bb513cec3a5125e4f7df250 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 23 Jan 2023 13:48:30 +0100
Subject: [PATCH 2/2] Fixed in/outputs that changed for themed components

---
 .../search-filters/themed-search-filters.component.ts    | 5 ++++-
 .../search-sidebar/themed-search-sidebar.component.ts    | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/search/search-filters/themed-search-filters.component.ts b/src/app/shared/search/search-filters/themed-search-filters.component.ts
index 7bf2d3d0ac..a9a9c10e51 100644
--- a/src/app/shared/search/search-filters/themed-search-filters.component.ts
+++ b/src/app/shared/search/search-filters/themed-search-filters.component.ts
@@ -2,6 +2,8 @@ import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../../theme-support/themed.component';
 import { SearchFiltersComponent } from './search-filters.component';
 import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../../core/data/remote-data';
+import { SearchFilterConfig } from '../models/search-filter-config.model';
 
 /**
  * Themed wrapper for SearchFiltersComponent
@@ -17,9 +19,10 @@ export class ThemedSearchFiltersComponent extends ThemedComponent<SearchFiltersC
   @Input() currentScope: string;
   @Input() inPlaceSearch;
   @Input() refreshFilters: Observable<any>;
+  @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
 
   protected inAndOutputNames: (keyof SearchFiltersComponent & keyof this)[] = [
-    'currentConfiguration', 'currentScope', 'inPlaceSearch', 'refreshFilters'];
+    'filters', 'currentConfiguration', 'currentScope', 'inPlaceSearch', 'refreshFilters'];
 
   protected getComponentName(): string {
     return 'SearchFiltersComponent';
diff --git a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
index 470c947162..935f797532 100644
--- a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
@@ -5,7 +5,9 @@ import { SearchConfigurationOption } from '../search-switch-configuration/search
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { RemoteData } from '../../../core/data/remote-data';
+import { SearchFilterConfig } from '../models/search-filter-config.model';
 
 /**
  * Themed wrapper for SearchSidebarComponent
@@ -21,20 +23,21 @@ export class ThemedSearchSidebarComponent extends ThemedComponent<SearchSidebarC
   @Input() configurationList: SearchConfigurationOption[];
   @Input() currentScope: string;
   @Input() currentSortOption: SortOptions;
+  @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
   @Input() resultCount;
   @Input() viewModeList: ViewMode[];
   @Input() showViewModes = true;
   @Input() inPlaceSearch;
   @Input() searchOptions: PaginatedSearchOptions;
   @Input() sortOptionsList: SortOptions[];
-  @Input() refreshFilters: Observable<any>;
+  @Input() refreshFilters: BehaviorSubject<boolean>;
   @Output() toggleSidebar = new EventEmitter<boolean>();
   @Output() changeConfiguration: EventEmitter<SearchConfigurationOption> = new EventEmitter<SearchConfigurationOption>();
   @Output() changeViewMode: EventEmitter<ViewMode> = new EventEmitter<ViewMode>();
 
   protected inAndOutputNames: (keyof SearchSidebarComponent & keyof this)[] = [
     'configuration', 'configurationList', 'currentScope', 'currentSortOption',
-    'resultCount', 'viewModeList', 'showViewModes', 'inPlaceSearch',
+    'resultCount', 'filters', 'viewModeList', 'showViewModes', 'inPlaceSearch',
     'searchOptions', 'sortOptionsList', 'refreshFilters', 'toggleSidebar', 'changeConfiguration', 'changeViewMode'];
 
   protected getComponentName(): string {