From a854e2c32de94d88bd1497844f377feb2433a8f6 Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Fri, 15 Jan 2021 13:40:57 -0800 Subject: [PATCH 1/3] merge root project settings into skill when adding skill --- .../client/src/recoilModel/dispatchers/project.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Composer/packages/client/src/recoilModel/dispatchers/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/project.ts index 2a4db0ec46..d8f428613d 100644 --- a/Composer/packages/client/src/recoilModel/dispatchers/project.ts +++ b/Composer/packages/client/src/recoilModel/dispatchers/project.ts @@ -48,6 +48,7 @@ import { handleProjectFailure, initBotState, loadProjectData, + mergePropertiesManagedByRootBot, navigateToBot, navigateToSkillBot, openLocalSkill, @@ -190,6 +191,13 @@ export const projectDispatcher = () => { isRootBot: false, }); set(botProjectIdsState, (current) => [...current, projectId]); + set(settingsState(projectId), (current) => { + return { + ...mergePropertiesManagedByRootBot(projectId, rootBotProjectId, current), + ...current, + }; + }); + await dispatcher.addLocalSkillToBotProjectFile(projectId); navigateToSkillBot(rootBotProjectId, projectId, mainDialog); return projectId; From 04927bcd59316d2b304877cadbc895e99e388435 Mon Sep 17 00:00:00 2001 From: Srinaath Ravichandran Date: Fri, 15 Jan 2021 15:06:37 -0800 Subject: [PATCH 2/3] Reverted Signed-off-by: Srinaath Ravichandran --- .../client/src/recoilModel/dispatchers/project.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Composer/packages/client/src/recoilModel/dispatchers/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/project.ts index d8f428613d..2a4db0ec46 100644 --- a/Composer/packages/client/src/recoilModel/dispatchers/project.ts +++ b/Composer/packages/client/src/recoilModel/dispatchers/project.ts @@ -48,7 +48,6 @@ import { handleProjectFailure, initBotState, loadProjectData, - mergePropertiesManagedByRootBot, navigateToBot, navigateToSkillBot, openLocalSkill, @@ -191,13 +190,6 @@ export const projectDispatcher = () => { isRootBot: false, }); set(botProjectIdsState, (current) => [...current, projectId]); - set(settingsState(projectId), (current) => { - return { - ...mergePropertiesManagedByRootBot(projectId, rootBotProjectId, current), - ...current, - }; - }); - await dispatcher.addLocalSkillToBotProjectFile(projectId); navigateToSkillBot(rootBotProjectId, projectId, mainDialog); return projectId; From 7f18a583c81181dffb3507a45247b0576f40dae6 Mon Sep 17 00:00:00 2001 From: Srinaath Ravichandran Date: Fri, 15 Jan 2021 15:43:22 -0800 Subject: [PATCH 3/3] LUIS settings Signed-off-by: Srinaath Ravichandran --- .../client/src/recoilModel/dispatchers/utils/project.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts index 1df6055f3d..93f621a33b 100644 --- a/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts +++ b/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts @@ -165,7 +165,9 @@ export const mergePropertiesManagedByRootBot = (projectId: string, rootBotProjec } if (projectId !== rootBotProjectId) { const skillValue = objectGet(localSetting, property, {})[projectId]; - objectSet(mergedSettings, property, skillValue ?? ''); + if (skillValue) { + objectSet(mergedSettings, property, skillValue); + } } } }