From cbf0db5342156f0053b719cc0a4d4c7bd39d96bf Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 11 May 2022 11:30:25 +0200
Subject: [PATCH] Add themed loading component in custom theme and fix issues

---
 src/app/navbar/navbar.component.html                |  4 ++--
 src/app/shared/menu/menu-section.decorator.ts       |  2 +-
 src/app/shared/theme-support/themed.component.ts    |  1 +
 .../app/shared/loading/loading.component.html       |  0
 .../app/shared/loading/loading.component.scss       |  0
 .../custom/app/shared/loading/loading.component.ts  | 13 +++++++++++++
 src/themes/custom/theme.module.ts                   |  4 +++-
 7 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 src/themes/custom/app/shared/loading/loading.component.html
 create mode 100644 src/themes/custom/app/shared/loading/loading.component.scss
 create mode 100644 src/themes/custom/app/shared/loading/loading.component.ts

diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index fc5d1a2ef3..8531543361 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -6,10 +6,10 @@
             <div id="collapsingNav">
                 <ul class="navbar-nav mr-auto shadow-none">
                     <ng-container *ngFor="let section of (sections | async)">
-                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
                     </ng-container>
                 </ul>
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/app/shared/menu/menu-section.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index 9374ab3c0d..18eedd1cf4 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { MenuID } from './initial-menus-state';
-import { hasNoValue, hasValue } from '../empty.util';
+import { hasValue } from '../empty.util';
 
 const menuComponentMap = new Map();
 
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
index 2ff0713f46..79ed914c5d 100644
--- a/src/app/shared/theme-support/themed.component.ts
+++ b/src/app/shared/theme-support/themed.component.ts
@@ -70,6 +70,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
 
     this.lazyLoadSub = this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
       switchMap((themedFile: any) => {
+        console.log(themedFile);
         if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) {
           // if the file is not null, and exports a component with the specified name,
           // return that component
diff --git a/src/themes/custom/app/shared/loading/loading.component.html b/src/themes/custom/app/shared/loading/loading.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/loading/loading.component.scss b/src/themes/custom/app/shared/loading/loading.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
new file mode 100644
index 0000000000..43249a4624
--- /dev/null
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
+
+@Component({
+  selector: 'ds-loading',
+  styleUrls: ['../../../../../app/shared/loading/loading.component.scss'],
+  // styleUrls: ['./loading.component.scss'],
+  templateUrl: '../../../../app/shared/loading/loading.component.html'
+  // templateUrl: './loading.component.html'
+})
+export class LoadingComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index e2e97b9087..67ad6028ce 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -84,6 +84,7 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import { LoadingComponent } from './app/shared/loading/loading.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -126,7 +127,8 @@ const DECLARATIONS = [
   NavbarComponent,
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
-  FeedbackComponent
+  FeedbackComponent,
+  LoadingComponent
 ];
 
 @NgModule({