From 893a306da066d18064fe9e9ae0b75d1454261d12 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Wed, 24 Nov 2021 12:18:45 +0100
Subject: [PATCH] 85123: Fallback to favicon of default theme and
 src/assets/images/favicon.ico

---
 src/app/app.component.ts      |  38 +++++++++++++++++++++++++++-------
 src/assets/images/favicon.ico | Bin 0 -> 15086 bytes
 2 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 src/assets/images/favicon.ico

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f138753596..9dc2b5a5ab 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -31,7 +31,7 @@ import { AuthService } from './core/auth/auth.service';
 import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
 import { MenuService } from './shared/menu/menu.service';
 import { HostWindowService } from './shared/host-window.service';
-import {HeadTagConfig, ThemeConfig} from '../config/theme.model';
+import { HeadTagConfig, ThemeConfig } from '../config/theme.model';
 import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 import { environment } from '../environments/environment';
 import { models } from './core/core.module';
@@ -292,20 +292,44 @@ export class AppComponent implements OnInit, AfterViewInit {
     const themeConfig = this.themeService.getThemeConfigFor(themeName);
     const headTagConfigs = themeConfig?.headTags;
 
-    // if the current theme does not have head tags, we inherit the head tags of the parent
     if (isEmpty(headTagConfigs)) {
       const parentThemeName = themeConfig.extends;
-      return isNotEmpty(parentThemeName) ? this.createHeadTags(parentThemeName) : [];
+      if (isNotEmpty(parentThemeName)) {
+        // inherit the head tags of the parent theme
+        return this.createHeadTags(parentThemeName);
+      }
+
+      const defaultThemeName = DEFAULT_THEME_CONFIG.name;
+      if (
+        isEmpty(defaultThemeName) ||
+        themeName === defaultThemeName ||
+        themeName === BASE_THEME_NAME
+      ) {
+        // last resort, use fallback favicon.ico
+        return [
+          this.createHeadTag({
+            'tagName': 'link',
+            'attributes': {
+              'rel': 'icon',
+              'href': 'assets/images/favicon.ico',
+              'sizes': 'any',
+            }
+          })
+        ];
+      }
+
+      // inherit the head tags of the default theme
+      return this.createHeadTags(DEFAULT_THEME_CONFIG.name);
     }
 
     return headTagConfigs.map(this.createHeadTag.bind(this));
   }
 
-  private createHeadTag(themeHeadTag: HeadTagConfig): HTMLElement {
-    const tag = this.document.createElement(themeHeadTag.tagName);
+  private createHeadTag(headTagConfig: HeadTagConfig): HTMLElement {
+    const tag = this.document.createElement(headTagConfig.tagName);
 
-    if (isNotEmpty(themeHeadTag.attributes)) {
-      Object.entries(themeHeadTag.attributes)
+    if (isNotEmpty(headTagConfig.attributes)) {
+      Object.entries(headTagConfig.attributes)
         .forEach(([key, value]) => tag.setAttribute(key, value));
     }
 
diff --git a/src/assets/images/favicon.ico b/src/assets/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a5dfd5e3226ca4dd5990a674f5b053afbe1f4d38
GIT binary patch
literal 15086
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

literal 0
HcmV?d00001