Update getCustomisations function

thoughtspot · Dec 17, 2022 · 2ebde73 · 2ebde73
1 parent 7593013
commit 2ebde73
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/embed/ts-embed.spec.ts b/src/embed/ts-embed.spec.ts
@@ -43,13 +43,15 @@ beforeAll(() => {
 
 const customisations = {
     style: {
+        customCSS: {},
         customCSSUrl: 'http://localhost:3000',
     },
     content: {},
 };
 
 const customisationsView = {
     style: {
+        customCSS: {},
         customCSSUrl: 'http://localhost:8000',
     },
     content: {},

diff --git a/src/utils.ts b/src/utils.ts
@@ -182,22 +182,30 @@ export const getCustomisations = (
     embedConfig: EmbedConfig,
     viewConfig: ViewConfig,
 ): CustomisationsInterface => {
-    const customCssFromEmbedConfig = embedConfig.customCssUrl;
-    const customizationsFromViewConfig =
-        viewConfig.customizations ||
-        ((viewConfig as any).customisations as CustomisationsInterface);
-    let customizations =
+    const customCssUrlFromEmbedConfig = embedConfig.customCssUrl;
+    const customizationsFromViewConfig = viewConfig.customizations;
+    const customizationsFromEmbedConfig =
         embedConfig.customizations ||
         ((embedConfig as any).customisations as CustomisationsInterface);
-    customizations = customizations || ({} as CustomisationsInterface);
-    customizations.style = customizations.style || {};
-    customizations.style.customCSSUrl =
-        customizationsFromViewConfig?.style.customCSSUrl ||
-        customizations.style.customCSSUrl ||
-        customCssFromEmbedConfig;
-    customizations.style.customCSS =
-        customizationsFromViewConfig?.style.customCSS ||
-        customizations.style.customCSS;
+
+    const customizations: CustomisationsInterface = {
+        style: {
+            ...customizationsFromEmbedConfig?.style,
+            ...customizationsFromViewConfig?.style,
+            customCSS: {
+                ...customizationsFromEmbedConfig?.style?.customCSS,
+                ...customizationsFromViewConfig?.style?.customCSS,
+            },
+            customCSSUrl:
+                customizationsFromViewConfig?.style?.customCSSUrl ||
+                customizationsFromEmbedConfig?.style?.customCSSUrl ||
+                customCssUrlFromEmbedConfig,
+        },
+        content: {
+            ...customizationsFromEmbedConfig?.content,
+            ...customizationsFromViewConfig?.content,
+        },
+    };
     return customizations;
 };