From f2a934dc3a42c85235b1c37c38377ad375d8b7e8 Mon Sep 17 00:00:00 2001
From: kushalshit27 <43465488+kushalshit27@users.noreply.github.com>
Date: Thu, 15 Aug 2024 08:39:12 +0530
Subject: [PATCH] DXCDT-689: Fix branding directory handler

---
 src/context/directory/handlers/branding.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/context/directory/handlers/branding.ts b/src/context/directory/handlers/branding.ts
index 35e4148d7..aca4408f9 100644
--- a/src/context/directory/handlers/branding.ts
+++ b/src/context/directory/handlers/branding.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 import { constants, loadFileAndReplaceKeywords } from '../../../tools';
-import { dumpJSON, existsMustBeDir, getFiles, isFile, loadJSON } from '../../../utils';
+import { dumpJSON, existsMustBeDir, getFiles, isFile, loadJSON, nomalizedYAMLPath } from '../../../utils';
 import { DirectoryHandler } from '.';
 import DirectoryContext from '..';
 import { Asset, ParsedAsset } from '../../../types';
@@ -38,8 +38,10 @@ function parse(context: DirectoryContext): ParsedBranding {
       mappings: context.mappings,
       disableKeywordReplacement: context.disableKeywordReplacement,
     });
+
+    const normalizedPathArray = nomalizedYAMLPath(definition.body);
     definition.body = loadFileAndReplaceKeywords(
-      path.join(brandingTemplatesFolder, definition.body),
+      path.join(brandingTemplatesFolder, ...normalizedPathArray),
       {
         mappings: context.mappings,
         disableKeywordReplacement: context.disableKeywordReplacement,
@@ -94,7 +96,7 @@ const dumpBrandingTemplates = ({ filePath, assets }: DirectoryContext): void =>
     }
 
     // save the location as relative file.
-    templateDefinition.body = `.${path.sep}${templateDefinition.template}.html`;
+    templateDefinition.body = `./${templateDefinition.template}.html`;
     dumpJSON(
       path.join(brandingTemplatesFolder, `${templateDefinition.template}.json`),
       templateDefinition