From 0c3c06b94e090908d3ac6daed7647e8faa022ead Mon Sep 17 00:00:00 2001 From: Zhixiang Zhan Date: Tue, 11 Aug 2020 00:56:17 +0800 Subject: [PATCH] do not force dialog name to lowercase (#3817) --- .../lib/indexers/src/utils/dialogCheckUtil.ts | 24 +++---------------- .../server/src/models/bot/botStructure.ts | 4 ++-- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Composer/packages/lib/indexers/src/utils/dialogCheckUtil.ts b/Composer/packages/lib/indexers/src/utils/dialogCheckUtil.ts index 41b4f63524..2e1c3ea213 100644 --- a/Composer/packages/lib/indexers/src/utils/dialogCheckUtil.ts +++ b/Composer/packages/lib/indexers/src/utils/dialogCheckUtil.ts @@ -1,37 +1,19 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import has from 'lodash/has'; -import { SDKKinds } from '@bfc/shared'; - -import { VisitorFunc, JsonWalk } from './jsonWalk'; - /** - * fix dialog referrence. - * - "dialog": 'AddTodos' - * + "dialog": 'addtodos' + * fix dialog's lg/lu referrence, use dialog's lg/lu file */ export function autofixReferInDialog(dialogId: string, content: string): string { try { const dialogJson = JSON.parse(content); - // fix dialog referrence - const visitor: VisitorFunc = (_path: string, value: any) => { - if (has(value, '$type') && value.$type === SDKKinds.BeginDialog) { - const dialogName = value.dialog; - value.dialog = dialogName.toLowerCase(); - } - return false; - }; - - JsonWalk('/', dialogJson, visitor); - // fix lg referrence - dialogJson.generator = `${dialogId.toLowerCase()}.lg`; + dialogJson.generator = `${dialogId}.lg`; // fix lu referrence if (typeof dialogJson.recognizer === 'string') { - dialogJson.recognizer = `${dialogId.toLowerCase()}.lu`; + dialogJson.recognizer = `${dialogId}.lu`; } return JSON.stringify(dialogJson, null, 2); } catch (_error) { diff --git a/Composer/packages/server/src/models/bot/botStructure.ts b/Composer/packages/server/src/models/bot/botStructure.ts index 22bb291920..2f460ec3b6 100644 --- a/Composer/packages/server/src/models/bot/botStructure.ts +++ b/Composer/packages/server/src/models/bot/botStructure.ts @@ -64,8 +64,8 @@ export const defaultFilePath = (botName: string, defaultLocale: string, filename }); } - const DIALOGNAME = fileId.toLowerCase(); - const isRootFile = BOTNAME === DIALOGNAME; + const DIALOGNAME = fileId; + const isRootFile = BOTNAME === DIALOGNAME.toLowerCase(); let TemplatePath = ''; if (fileType === FileExtensions.Dialog) {