@hcl-software/dxclient 225.0.0 → 227.0.0

package/dist/packages/livesync/src/services/ongoingSyncServices.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteWCMFolderHandle = exports.deleteWCMHtmlFileHandler = exports.updateWCMFolderHandler = exports.updateWCMHtmlFileHandler = exports.addWCMHtmlFileHandler = exports.addWCMFolderHandler = exports.retryFileUpdate = exports.unlinkHandler = exports.changeFileHandler = exports.addDirHandler = exports.addFileHandler = exports.deleteFromWebDAV = exports.uploadFileToWebDAV = exports.getRelativePath = void 0;
+exports.deleteWCMFolderHandle = exports.deleteWCMHtmlFileHandler = exports.updateWCMFolderHandler = exports.updateWCMHtmlFileHandler = exports.deleteWCMCssFileHandler = exports.updateWCMCssFileHandler = exports.addWCMCssFileHandler = exports.addWCMHtmlFileHandler = exports.addWCMFolderHandler = exports.retryFileUpdate = exports.unlinkHandler = exports.changeFileHandler = exports.addDirHandler = exports.addFileHandler = exports.deleteFromWebDAV = exports.uploadFileToWebDAV = exports.getRelativePath = void 0;
 const path_1 = __importStar(require("path"));
 const form_data_1 = __importDefault(require("form-data"));
 const fs_extra_1 = __importStar(require("fs-extra"));
@@ -46,6 +46,7 @@ const metadataServices_1 = require("./metadataServices");
 const pushWcmDesignLibrary_1 = require("../commands/pushWcmDesignLibrary");
 const livesyncUtils_1 = require("./livesyncUtils");
 const presentationTemplateWcmServices_1 = require("./presentationTemplateWcmServices");
+const stylesheetComponent_1 = __importDefault(require("./wcmContext/stylesheetComponent"));
 const getRelativePath = (pathFrom, pathTo) => {
     let result = '';
     try {
@@ -291,6 +292,7 @@ exports.retryFileUpdate = retryFileUpdate;
 const addWCMFolderHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.logger.debug('Executing function addWCMFolderHandler');
     const { chokidarPath, cmdArgs, options } = eventQueueItem;
+    const relativeFilePath = path_1.default.relative(cmdArgs.wcmLibraryPath, chokidarPath);
     const libraryID = options.library.id;
     const directoryName = path_1.default.parse(chokidarPath).name;
     const parentDirectoryPath = path_1.default.parse(chokidarPath).dir;
@@ -316,30 +318,30 @@ const addWCMFolderHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0
         const response = yield foldersWcmServices_1.createFolder(apiOptions, libraryID, JSON.stringify(folderComponent));
         switch (response.status) {
             case constants_1.HttpStatus.CREATED: {
-                logger_1.logger.info(utils_1.message('LIVESYNC_PUSH_WCM_ONGOING_SYNC_CREATE_FOLDER', { 0: directoryName, 1: options.library.name }));
-                response.data.localPath = chokidarPath;
+                logger_1.logger.info(utils_1.message('LIVESYNC_PUSH_WCM_ONGOING_SYNC_CREATE_FOLDER', { 0: relativeFilePath, 1: options.library.name }));
+                response.data.localPath = relativeFilePath;
                 response.data.newFolder = true;
                 metadataServices_1.createMetadata(cmdArgs.wcmLibraryPath, response.data, parentID, libraryID);
                 pushWcmDesignLibrary_1.PushWcmDesignLibrary.updateCache(metadataServices_1.saveMetadata(cmdArgs.wcmLibraryPath, response.data, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache()));
                 break;
             }
             case constants_1.HttpStatus.UNAUTHORIZED: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_UNAUTHORIZED', { 0: directoryName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_UNAUTHORIZED', { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.CONFLICT: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_CONFLICT', { 0: directoryName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_CONFLICT', { 0: relativeFilePath }));
                 break;
             }
             default: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_DEFAULT', { 0: directoryName, 1: response.statusText }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_DEFAULT', { 0: relativeFilePath, 1: response.statusText }));
                 logger_1.logger.debug('Execution of createFolder request is unsuccessful: %O', response);
                 break;
             }
         }
     }
     catch (error) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_DEFAULT', { 0: directoryName, 1: error }));
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_FOLDER_DEFAULT', { 0: relativeFilePath, 1: error }));
         logger_1.logger.debug('Error creating folder: %O', error);
     }
 });
@@ -349,6 +351,7 @@ const addWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void
     const { chokidarPath, cmdArgs, options, } = eventQueueItem;
     const libraryID = options.library.id;
     const fileName = path_1.default.parse(chokidarPath).name;
+    const relativeFilePath = path_1.default.relative(cmdArgs.wcmLibraryPath, chokidarPath);
     const parentDirectoryPath = path_1.default.parse(chokidarPath).dir;
     const parentDirectoryFileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, parentDirectoryPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
     const parentID = parentDirectoryFileMeta.id;
@@ -356,12 +359,13 @@ const addWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void
     const checkFileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, chokidarPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
     const wcmType = livesyncUtils_1.getWCMType(chokidarPath, cmdArgs.wcmLibraryPath);
     let description;
+    let messageType;
     if (!livesyncUtils_1.isTypeEnabled(wcmType)) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: chokidarPath }));
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: relativeFilePath }));
         return;
     }
     if (checkFileMeta) {
-        logger_1.logger.debug('File "%O" is an restored file. ', fileName);
+        logger_1.logger.debug('File "%O" is an restored file. ', relativeFilePath);
         return;
     }
     const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = cmdArgs;
@@ -388,15 +392,17 @@ const addWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void
     logger_1.logger.debug('referenceUrl: %s', referenceUrl);
     switch (wcmType) {
         case 'LibraryHTMLComponent':
-            logger_1.logger.debug('File "%O" is a LibraryHTMLComponent', fileName);
+            logger_1.logger.debug('File "%O" is a LibraryHTMLComponent', relativeFilePath);
             description = 'HTML Component Description';
+            messageType = 'HTML_COMPONENT';
             break;
         case 'PresentationTemplate':
-            logger_1.logger.debug('File "%O" is a PresentationTemplate', fileName);
+            logger_1.logger.debug('File "%O" is a PresentationTemplate', relativeFilePath);
             description = 'Presentation Template Description';
+            messageType = 'PRESENTATION_TEMPLATE';
             break;
         default:
-            logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_DEFAULT', { 0: fileName }));
+            logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_COMPONENT_DEFAULT', { 0: relativeFilePath }));
             return;
     }
     const data = JSON.stringify({
@@ -432,88 +438,180 @@ const addWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void
         },
     });
     try {
-        let messageType;
         let response = { status: 999 };
         switch (wcmType) {
             case 'LibraryHTMLComponent':
-                logger_1.logger.debug('Creating "%O" LibraryHTMLComponent', fileName);
+                logger_1.logger.debug('Creating "%O" LibraryHTMLComponent', relativeFilePath);
                 response = yield htmlComponentWcmServices_1.createHtmlComponent(apiOptions, data);
                 messageType = 'HTML_COMPONENT';
                 break;
             case 'PresentationTemplate':
-                logger_1.logger.debug('Creating "%O" PresentationTemplate', fileName);
+                logger_1.logger.debug('Creating "%O" PresentationTemplate', relativeFilePath);
                 response = yield presentationTemplateWcmServices_1.createPresentationTemplate(apiOptions, data);
                 messageType = 'PRESENTATION_TEMPLATE';
                 break;
             default:
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_DEFAULT', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_COMPONENT_DEFAULT', { 0: relativeFilePath }));
                 return;
         }
         switch (response.status) {
             case constants_1.HttpStatus.CREATED: {
-                logger_1.logger.info(utils_1.message(`LIVESYNC_PUSH_WCM_ONGOING_SYNC_CREATE_${messageType}`, { 0: fileName, 1: options.library.name }));
+                logger_1.logger.info(utils_1.message(`LIVESYNC_PUSH_WCM_ONGOING_SYNC_CREATE_${messageType}`, { 0: relativeFilePath, 1: options.library.name }));
                 const fileMetadata = metadataServices_1.createMetadata(cmdArgs.wcmLibraryPath, response.data, parentID, libraryID);
-                if (chokidarPath !== fileMetadata.localPath) {
-                    fs_extra_1.moveSync(chokidarPath, fileMetadata.localPath);
+                if (relativeFilePath.toLowerCase() !== fileMetadata.localPath.toLowerCase()) {
+                    fs_extra_1.moveSync(chokidarPath, path_1.join(cmdArgs.wcmLibraryPath, fileMetadata.localPath));
                 }
                 pushWcmDesignLibrary_1.PushWcmDesignLibrary.updateCache(metadataServices_1.saveMetadata(cmdArgs.wcmLibraryPath, fileMetadata, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache()));
                 break;
             }
             case constants_1.HttpStatus.UNAUTHORIZED: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_UNAUTHORIZED', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_CREATE_${messageType}_UNAUTHORIZED`, { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.CONFLICT: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_CONFLICT', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_CREATE_${messageType}_CONFLICT`, { 0: relativeFilePath }));
                 break;
             }
             default: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_DEFAULT', { 0: fileName, 1: response.statusText }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_CREATE_${messageType}_DEFAULT`, { 0: relativeFilePath, 1: response.statusText }));
                 logger_1.logger.debug('Execution of createHtmlComponent request is unsuccessful: %O', response);
                 break;
             }
         }
     }
     catch (error) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_DEFAULT', { 0: fileName, 1: error }));
+        logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_CREATE_${messageType}_DEFAULT`, { 0: relativeFilePath, 1: error }));
         logger_1.logger.debug('Error creating html file: %O', error);
     }
 });
 exports.addWCMHtmlFileHandler = addWCMHtmlFileHandler;
+const addWCMCssFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.logger.debug('Executing function addWCMCssFileHandler');
+    const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = eventQueueItem.cmdArgs;
+    const apiOptions = {
+        dxProtocol,
+        hostname,
+        dxPort,
+        contenthandlerPath,
+        dxUsername,
+        dxPassword,
+        virtualPortalContext,
+        wcmProjectName,
+    };
+    try {
+        const stylesheetComponent = new stylesheetComponent_1.default(eventQueueItem.chokidarPath, undefined, {
+            apiOptions,
+            libraryId: eventQueueItem.options.library.id,
+            libraryPath: eventQueueItem.cmdArgs.wcmLibraryPath,
+            libraryMetaData: eventQueueItem.options.library,
+        });
+        stylesheetComponent.create();
+    }
+    catch (e) {
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_ADD_STYLESHEET_COMPONENT_GENERIC', { 0: eventQueueItem.chokidarPath, 1: e.message }));
+    }
+});
+exports.addWCMCssFileHandler = addWCMCssFileHandler;
+const updateWCMCssFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.logger.debug('Executing function updateWCMCssFileHandler');
+    const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = eventQueueItem.cmdArgs;
+    const apiOptions = {
+        dxProtocol,
+        hostname,
+        dxPort,
+        contenthandlerPath,
+        dxUsername,
+        dxPassword,
+        virtualPortalContext,
+        wcmProjectName,
+    };
+    const fileName = path_1.default.parse(eventQueueItem.chokidarPath).name;
+    try {
+        const fileMeta = metadataServices_1.getSavedMetadata(eventQueueItem.cmdArgs.wcmLibraryPath, eventQueueItem.chokidarPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
+        const stylesheetComponent = new stylesheetComponent_1.default(eventQueueItem.chokidarPath, fileMeta, {
+            apiOptions,
+            libraryId: eventQueueItem.options.library.id,
+            libraryPath: eventQueueItem.cmdArgs.wcmLibraryPath,
+            libraryMetaData: eventQueueItem.options.library,
+        });
+        stylesheetComponent.update();
+    }
+    catch (e) {
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_STYLESHEET_DEFAULT', { 0: fileName }));
+    }
+});
+exports.updateWCMCssFileHandler = updateWCMCssFileHandler;
+const deleteWCMCssFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.logger.debug('Executing function deleteWCMCssFileHandler');
+    const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = eventQueueItem.cmdArgs;
+    const apiOptions = {
+        dxProtocol,
+        hostname,
+        dxPort,
+        contenthandlerPath,
+        dxUsername,
+        dxPassword,
+        virtualPortalContext,
+        wcmProjectName,
+    };
+    try {
+        const stylesheetComponent = new stylesheetComponent_1.default(eventQueueItem.chokidarPath, eventQueueItem.options.fileMeta, {
+            apiOptions,
+            libraryId: eventQueueItem.options.library.id,
+            libraryPath: eventQueueItem.cmdArgs.wcmLibraryPath,
+            libraryMetaData: eventQueueItem.options.library,
+        });
+        stylesheetComponent.delete();
+    }
+    catch (e) {
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_CSS_GENERIC', { 0: eventQueueItem.chokidarPath, 1: e.message }));
+    }
+});
+exports.deleteWCMCssFileHandler = deleteWCMCssFileHandler;
 const updateWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.logger.debug('Executing function updateWCMHtmlFileHandler');
     const { chokidarPath, cmdArgs, options, } = eventQueueItem;
+    const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = cmdArgs;
+    const apiOptions = {
+        dxProtocol,
+        hostname,
+        dxPort,
+        contenthandlerPath,
+        dxUsername,
+        dxPassword,
+        virtualPortalContext,
+        wcmProjectName,
+    };
     const type = livesyncUtils_1.getWCMType(chokidarPath, cmdArgs.wcmLibraryPath);
     if (!type) {
         logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: chokidarPath }));
         return;
     }
     const libraryID = options.library.id;
-    const fileName = path_1.default.parse(chokidarPath).name;
+    const relativeFilePath = path_1.default.relative(cmdArgs.wcmLibraryPath, chokidarPath);
     const parentDirectoryPath = path_1.default.parse(chokidarPath).dir;
     const parentDirectoryFileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, parentDirectoryPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
     const parentID = parentDirectoryFileMeta.id;
     const fileContent = fs_extra_1.readFileSync(chokidarPath, 'utf8');
     const fileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, chokidarPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
+    let messageType = type === 'LibraryHTMLComponent' ? 'HTML_COMPONENT' : 'PRESENTATION_TEMPLATE';
+    if (fileMeta && fileMeta.type === 'LibraryStyleSheetComponent') {
+        const stylesheetComponent = new stylesheetComponent_1.default(eventQueueItem.chokidarPath, fileMeta, {
+            apiOptions,
+            libraryId: eventQueueItem.options.library.id,
+            libraryPath: eventQueueItem.cmdArgs.wcmLibraryPath,
+            libraryMetaData: eventQueueItem.options.library,
+        });
+        stylesheetComponent.update();
+    }
     if (!livesyncUtils_1.isTypeEnabled(fileMeta.type)) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: chokidarPath }));
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: relativeFilePath }));
         return;
     }
     if (fileContent === fileMeta.content.value) {
-        logger_1.logger.debug('Skipping file update because file content is the same. Path: %s', chokidarPath);
+        logger_1.logger.debug('Skipping file update because file content is the same. Path: %s', relativeFilePath);
         return;
     }
-    const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = cmdArgs;
-    const apiOptions = {
-        dxProtocol,
-        hostname,
-        dxPort,
-        contenthandlerPath,
-        dxUsername,
-        dxPassword,
-        virtualPortalContext,
-        wcmProjectName,
-    };
     let referenceUrl;
     if (apiOptions.virtualPortalContext) {
         referenceUrl = `${apiOptions.contenthandlerPath}/${apiOptions.virtualPortalContext}`;
@@ -526,10 +624,9 @@ const updateWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, v
     }
     logger_1.logger.debug('referenceUrl: %s', referenceUrl);
     fileMeta.content.value = fileContent.toString();
-    const data = JSON.stringify({ entry: { content: fileMeta.content } });
+    const data = JSON.stringify({ entry: { author: fileMeta.author, owner: fileMeta.owner, content: fileMeta.content } });
     try {
         let response = { status: 999 };
-        let messageType;
         switch (type) {
             case 'LibraryHTMLComponent':
                 response = yield htmlComponentWcmServices_1.updateHtmlComponent(apiOptions, fileMeta.id, data);
@@ -540,37 +637,37 @@ const updateWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, v
                 messageType = 'PRESENTATION_TEMPLATE';
                 break;
             default:
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: chokidarPath }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_INVALID_FILE_TYPE', { 0: relativeFilePath }));
                 break;
         }
         switch (response.status) {
             case constants_1.HttpStatus.SUCCESS: {
                 if (fileMeta.id !== response.data.id) {
-                    logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_HTML_HAS_DRAFT', { 0: fileName }));
+                    logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_HTML_COMPONENT_HAS_DRAFT', { 0: relativeFilePath }));
                     break;
                 }
-                logger_1.logger.info(utils_1.message(`LIVESYNC_PUSH_WCM_ONGOING_SYNC_UPDATE_${messageType}`, { 0: fileName, 1: options.library.name }));
+                logger_1.logger.info(utils_1.message(`LIVESYNC_PUSH_WCM_ONGOING_SYNC_UPDATE_${messageType}`, { 0: relativeFilePath, 1: options.library.name }));
                 const fileMetadata = metadataServices_1.createMetadata(cmdArgs.wcmLibraryPath, response.data, parentID, libraryID);
                 pushWcmDesignLibrary_1.PushWcmDesignLibrary.updateCache(metadataServices_1.saveMetadata(cmdArgs.wcmLibraryPath, fileMetadata, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache()));
                 break;
             }
             case constants_1.HttpStatus.UNAUTHORIZED: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_HTML_UNAUTHORIZED', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_UPDATE_${messageType}_UNAUTHORIZED`, { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.NOT_FOUND: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_HTML_NOTFOUND', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_UPDATE_${messageType}_NOTFOUND`, { 0: relativeFilePath }));
                 break;
             }
             default: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_HTML_DEFAULT', { 0: fileName, 1: response.statusText }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_UPDATE_${messageType}_DEFAULT`, { 0: relativeFilePath, 1: response.statusText }));
                 logger_1.logger.debug('Execution of UpdateWCMHtmlComponent request is unsuccessful: %O', response);
                 break;
             }
         }
     }
     catch (error) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_HTML_DEFAULT', { 0: fileName, 1: error }));
+        logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_UPDATE_${messageType}_DEFAULT`, { 0: relativeFilePath, 1: error }));
         logger_1.logger.debug('Error updating html file: %O', error);
     }
 });
@@ -579,6 +676,7 @@ const updateWCMFolderHandler = (eventQueueItem) => __awaiter(void 0, void 0, voi
     logger_1.logger.debug('Executing function updateWCMFolderHandler');
     const { chokidarPath, cmdArgs, options } = eventQueueItem;
     const directoryName = path_1.default.parse(chokidarPath).name;
+    const relativeFilePath = path_1.default.relative(cmdArgs.wcmLibraryPath, chokidarPath);
     const parentDirectoryPath = path_1.default.parse(chokidarPath).dir;
     const parentDirectoryFileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, parentDirectoryPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
     const parentID = parentDirectoryFileMeta.id;
@@ -614,29 +712,29 @@ const updateWCMFolderHandler = (eventQueueItem) => __awaiter(void 0, void 0, voi
         const response = yield foldersWcmServices_1.updateFolder(apiOptions, fileMeta.id, JSON.stringify(folderComponent));
         switch (response.status) {
             case constants_1.HttpStatus.SUCCESS: {
-                logger_1.logger.info(utils_1.message('LIVESYNC_PUSH_WCM_ONGOING_SYNC_UPDATE_FOLDER', { 0: directoryName, 1: options.library.name }));
-                response.data.localPath = chokidarPath;
+                logger_1.logger.info(utils_1.message('LIVESYNC_PUSH_WCM_ONGOING_SYNC_UPDATE_FOLDER', { 0: relativeFilePath, 1: options.library.name }));
+                response.data.localPath = relativeFilePath;
                 metadataServices_1.createMetadata(cmdArgs.wcmLibraryPath, response.data, parentID, options.library.id);
                 pushWcmDesignLibrary_1.PushWcmDesignLibrary.updateCache(metadataServices_1.saveMetadata(cmdArgs.wcmLibraryPath, response.data, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache()));
                 break;
             }
             case constants_1.HttpStatus.UNAUTHORIZED: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_UNAUTHORIZED', { 0: directoryName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_UNAUTHORIZED', { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.NOT_FOUND: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_NOTFOUND', { 0: directoryName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_NOTFOUND', { 0: relativeFilePath }));
                 break;
             }
             default: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_DEFAULT', { 0: directoryName, 1: response.statusText }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_DEFAULT', { 0: relativeFilePath, 1: response.statusText }));
                 logger_1.logger.debug('Execution of createFolder request is unsuccessful: %O', response);
                 break;
             }
         }
     }
     catch (error) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_DEFAULT', { 0: directoryName, 1: error }));
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_UPDATE_FOLDER_DEFAULT', { 0: relativeFilePath, 1: error }));
         logger_1.logger.debug('Error creating folder: %O', error);
     }
 });
@@ -644,10 +742,10 @@ exports.updateWCMFolderHandler = updateWCMFolderHandler;
 const deleteWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.logger.debug('Executing function deleteWCMHtmlComponentHandler');
     const { chokidarPath, cmdArgs, options, } = eventQueueItem;
-    const fileName = path_1.default.parse(chokidarPath).name;
+    const relativeFilePath = path_1.default.relative(cmdArgs.wcmLibraryPath, chokidarPath);
     const fileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, chokidarPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
     if (!fileMeta) {
-        logger_1.logger.debug('File "%O" is not found in cache', fileName);
+        logger_1.logger.debug('File "%O" is not found in cache', relativeFilePath);
         return;
     }
     const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = cmdArgs;
@@ -661,54 +759,54 @@ const deleteWCMHtmlFileHandler = (eventQueueItem) => __awaiter(void 0, void 0, v
         virtualPortalContext,
         wcmProjectName,
     };
+    const wcmType = livesyncUtils_1.getWCMType(chokidarPath, cmdArgs.wcmLibraryPath);
+    let messageType = wcmType === 'LibraryHTMLComponent' ? 'HTML_COMPONENT' : 'PRESENTATION_TEMPLATE';
     try {
-        const wcmType = livesyncUtils_1.getWCMType(chokidarPath, cmdArgs.wcmLibraryPath);
-        let messageType;
         let response;
         switch (wcmType) {
             case 'LibraryHTMLComponent':
-                logger_1.logger.debug('File "%O" is a LibraryHTMLComponent', fileName);
+                logger_1.logger.debug('File "%O" is a LibraryHTMLComponent', relativeFilePath);
                 response = yield htmlComponentWcmServices_1.deleteHtmlComponent(apiOptions, fileMeta.id);
                 messageType = 'HTML_COMPONENT';
                 break;
             case 'PresentationTemplate':
-                logger_1.logger.debug('File "%O" is a PresentationTemplate', fileName);
+                logger_1.logger.debug('File "%O" is a PresentationTemplate', relativeFilePath);
                 response = yield presentationTemplateWcmServices_1.deletePresentationTemplate(apiOptions, fileMeta.id);
                 messageType = 'PRESENTATION_TEMPLATE';
                 break;
             default:
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_DEFAULT', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_CREATE_HTML_COMPONENT_DEFAULT', { 0: relativeFilePath }));
                 return;
         }
         switch (response.status) {
             case constants_1.HttpStatus.NO_CONTENT: {
-                logger_1.logger.info(utils_1.message(`LIVESYNC_PUSH_WCM_ONGOING_SYNC_DELETE_${messageType}`, { 0: fileName, 1: options.library.name }));
+                logger_1.logger.info(utils_1.message(`LIVESYNC_PUSH_WCM_ONGOING_SYNC_DELETE_${messageType}`, { 0: relativeFilePath, 1: options.library.name }));
                 const metadataPath = path_1.join(cmdArgs.wcmLibraryPath, '.library', wcmType, `${fileMeta.id}.json`);
                 fs_extra_1.default.rmSync(metadataPath, { recursive: true, force: true });
                 pushWcmDesignLibrary_1.PushWcmDesignLibrary.updateCache(metadataServices_1.saveMetadata(cmdArgs.wcmLibraryPath, fileMeta, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache(), true));
                 break;
             }
             case constants_1.HttpStatus.UNAUTHORIZED: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_HTML_UNAUTHORIZED', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_DELETE_${messageType}_UNAUTHORIZED`, { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.NOT_FOUND: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_HTML_NOTFOUND', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_DELETE_${messageType}_NOTFOUND`, { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.CONFLICT: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_HTML_CONFLICT', { 0: fileName }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_${messageType}_CONFLICT`, { 0: relativeFilePath }));
                 break;
             }
             default: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_HTML_DEFAULT', { 0: fileName, 1: response.statusText }));
+                logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_DELETE_${messageType}_DEFAULT`, { 0: relativeFilePath, 1: response.statusText }));
                 logger_1.logger.debug('Execution of delete html component request is unsuccessful: %O', response);
                 break;
             }
         }
     }
     catch (error) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_HTML_DEFAULT', { 0: fileName, 1: error }));
+        logger_1.logger.error(utils_1.errorMessage(`ERROR_LIVESYNC_PUSH_WCM_DELETE_${messageType}_DEFAULT`, { 0: relativeFilePath, 1: error }));
         logger_1.logger.debug('Error delete html component: %O', error);
     }
 });
@@ -717,12 +815,13 @@ const deleteWCMFolderHandle = (eventQueueItem) => __awaiter(void 0, void 0, void
     logger_1.logger.debug('Executing function deleteWCMFolderHandle');
     const { chokidarPath, cmdArgs, options, } = eventQueueItem;
     const directoryName = path_1.default.parse(chokidarPath).name;
+    const relativeFilePath = path_1.default.relative(cmdArgs.wcmLibraryPath, chokidarPath);
     const fileMeta = metadataServices_1.getSavedMetadata(cmdArgs.wcmLibraryPath, chokidarPath, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache());
     const allowedFolderRegex = /^(New Folder|[Uu]ntitled folder)( \d+)?$/;
     if (!utils_1.isFeatureEnabled(constants_1.FeaturesEnum.LIVESYNC_WCM_DELETE_FOLDER)
         && !allowedFolderRegex.test(directoryName)
         && !(yield livesyncUtils_1.isRecentlyCreated(directoryName))) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_DISABLED', { 0: directoryName }));
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_DISABLED', { 0: relativeFilePath }));
         return;
     }
     const { dxProtocol, hostname, dxPort, contenthandlerPath, dxUsername, dxPassword, virtualPortalContext, wcmProjectName, } = cmdArgs;
@@ -740,29 +839,29 @@ const deleteWCMFolderHandle = (eventQueueItem) => __awaiter(void 0, void 0, void
         const response = yield foldersWcmServices_1.deleteFolder(apiOptions, fileMeta.id);
         switch (response.status) {
             case constants_1.HttpStatus.NO_CONTENT: {
-                logger_1.logger.info(utils_1.message('LIVESYNC_PUSH_WCM_ONGOING_SYNC_DELETE_FOLDER', { 0: directoryName, 1: options.library.name }));
+                logger_1.logger.info(utils_1.message('LIVESYNC_PUSH_WCM_ONGOING_SYNC_DELETE_FOLDER', { 0: relativeFilePath, 1: options.library.name }));
                 const metadataPath = path_1.join(cmdArgs.wcmLibraryPath, '.library', 'Folder', `${fileMeta.id}.json`);
                 fs_extra_1.default.rmSync(metadataPath, { recursive: true, force: true });
                 pushWcmDesignLibrary_1.PushWcmDesignLibrary.updateCache(metadataServices_1.saveMetadata(cmdArgs.wcmLibraryPath, fileMeta, pushWcmDesignLibrary_1.PushWcmDesignLibrary.getCache(), true));
                 break;
             }
             case constants_1.HttpStatus.UNAUTHORIZED: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_UNAUTHORIZED', { 0: directoryName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_UNAUTHORIZED', { 0: relativeFilePath }));
                 break;
             }
             case constants_1.HttpStatus.NOT_FOUND: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_NOTFOUND', { 0: directoryName }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_NOTFOUND', { 0: relativeFilePath }));
                 break;
             }
             default: {
-                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_DEFAULT', { 0: directoryName, 1: response.statusText }));
+                logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_DEFAULT', { 0: relativeFilePath, 1: response.statusText }));
                 logger_1.logger.debug('Execution of delete folder request is unsuccessful: %O', response);
                 break;
             }
         }
     }
     catch (error) {
-        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_DEFAULT', { 0: directoryName, 1: error }));
+        logger_1.logger.error(utils_1.errorMessage('ERROR_LIVESYNC_PUSH_WCM_DELETE_FOLDER_DEFAULT', { 0: relativeFilePath, 1: error }));
         logger_1.logger.debug('Error delete html component: %O', error);
     }
 });