fix: missing qna recognizers when publishing

Composer/packages/server/src/models/bot/recognizer.ts

@@ -25,9 +25,9 @@ const LuisRecognizerTemplate = (target: string, fileName: string) => ({
   endpointKey: '=settings.luis.endpointKey',
 });
 
-const MultiLanguageRecognizerTemplate = (target: string) => ({
+const MultiLanguageRecognizerTemplate = (target: string, fileType: 'lu' | 'qna') => ({
   $kind: SDKKinds.MultiLanguageRecognizer,
-  id: `LUIS_${target}`,
+  id: `${fileType === 'lu' ? 'LUIS' : 'QnA'}_${target}`,
   recognizers: {},
 });
 
@@ -39,24 +39,39 @@ const CrossTrainedRecognizerTemplate = (): {
   recognizers: [],
 });
 
-//in composer the luFile name is a.local.lu
-const getLuFileLocal = (fileName: string) => {
+const QnAMakerRecognizerTemplate = (target: string, fileName: string) => ({
+  $kind: SDKKinds.QnAMakerRecognizer,
+  id: `QnA_${target}`,
+  knowledgeBaseId: `=settings.qna.${fileName.replace(/[.-]/g, '_')}`,
+  hostname: '=settings.qna.hostname',
+  endpointKey: '=settings.qna.endpointKey',
+});
+
+//in composer the luFile name is a.locale.lu
+const getLuFileLocale = (fileName: string) => {
   const items = fileName.split('.');
   return items[items.length - 2];
 };
 
-const getMultiLanguagueRecognizerDialog = (target: string, luFileNames: string[], defalutLanguage = 'en-us') => {
-  const multiLanguageRecognizer = MultiLanguageRecognizerTemplate(target);
-
-  luFileNames.forEach((item) => {
-    const local = getLuFileLocal(item);
-    multiLanguageRecognizer.recognizers[local] = item;
-    if (local === defalutLanguage) {
-      multiLanguageRecognizer.recognizers[''] = item;
+const getMultiLanguagueRecognizerDialog = (
+  target: string,
+  fileNames: string[],
+  fileType: 'lu' | 'qna',
+  defalutLanguage = 'en-us'
+) => {
+  const multiLanguageRecognizer = MultiLanguageRecognizerTemplate(target, fileType);
+
+  fileNames.forEach((name) => {
+    if (!name.startsWith(target)) return;
+    const locale = getLuFileLocale(name);
+    if (locale === 'source') return;
+    multiLanguageRecognizer.recognizers[locale] = name;
+    if (locale === defalutLanguage) {
+      multiLanguageRecognizer.recognizers[''] = name;
     }
   });
 
-  return { name: `${target}.lu.dialog`, content: JSON.stringify(multiLanguageRecognizer, null, 2) };
+  return { name: `${target}.${fileType}.dialog`, content: JSON.stringify(multiLanguageRecognizer, null, 2) };
 };
 
 const getCrossTrainedRecognizerDialog = (target: string, fileNames: string[]) => {
@@ -78,14 +93,24 @@ const getCrossTrainedRecognizerDialog = (target: string, fileNames: string[]) =>
 
 const getLuisRecognizerDialogs = (target: string, luFileNames: string[]) => {
   return luFileNames.map((item) => {
-    const local = getLuFileLocal(item);
+    const locale = getLuFileLocale(item);
     return {
-      name: `${target}.${local}.lu.dialog`,
+      name: `${target}.${locale}.lu.dialog`,
       content: JSON.stringify(LuisRecognizerTemplate(target, item), null, 2),
     };
   });
 };
 
+const getQnaMakerRecognizerDialogs = (target: string, qnaFileNames: string[]) => {
+  return qnaFileNames.map((item) => {
+    const locale = getLuFileLocale(item);
+    return {
+      name: `${target}.${locale}.qna.dialog`,
+      content: JSON.stringify(QnAMakerRecognizerTemplate(target, item), null, 2),
+    };
+  });
+};
+
 /**
  * DefaultRecognizer:
  *  luisRecoginzers: create and preserve(exists)
@@ -103,22 +128,34 @@ const updateRecognizers = (isCrosstrain: boolean): UpdateRecognizer => async (
   { defalutLanguage, folderPath }
 ) => {
   const luFileNames = fileNames.filter((item) => item.endsWith('.lu'));
-  const multiLanguageRecognizerDialog = getMultiLanguagueRecognizerDialog(target, luFileNames, defalutLanguage);
+  const qnaFileNames = fileNames.filter((item) => item.endsWith('.qna'));
+  const luMultiLanguageRecognizerDialog = getMultiLanguagueRecognizerDialog(target, luFileNames, 'lu', defalutLanguage);
+  const qnaMultiLanguageRecognizerDialog = getMultiLanguagueRecognizerDialog(
+    target,
+    qnaFileNames,
+    'qna',
+    defalutLanguage
+  );
   const luisRecognizersDialogs = getLuisRecognizerDialogs(target, luFileNames);
+  const qnaMakeRecognizersDialogs = getQnaMakerRecognizerDialogs(target, qnaFileNames);
   const needUpdateDialogs: GeneratedDialog[] = [];
-  const needPreserveDialogs: GeneratedDialog[] = [];
+  let needPreserveDialogs: GeneratedDialog[] = [];
 
   if (isCrosstrain) {
     const crossTrainedRecognizerDialog = getCrossTrainedRecognizerDialog(target, fileNames);
     needUpdateDialogs.push(crossTrainedRecognizerDialog);
+
+    if (qnaMakeRecognizersDialogs.length) {
+      needUpdateDialogs.push(qnaMultiLanguageRecognizerDialog);
+    }
+
+    needPreserveDialogs = [...needPreserveDialogs, ...qnaMakeRecognizersDialogs];
   }
 
-  luisRecognizersDialogs.forEach((item) => {
-    needPreserveDialogs.push(item);
-  });
+  needPreserveDialogs = [...needPreserveDialogs, ...luisRecognizersDialogs];
 
   if (luisRecognizersDialogs.length) {
-    needUpdateDialogs.push(multiLanguageRecognizerDialog);
+    needUpdateDialogs.push(luMultiLanguageRecognizerDialog);
   }
 
   const previousFilePaths = await storage.glob(`${target}.*`, folderPath ?? '');