Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fixing deep link for QNA and Luis #6743

Merged
pavolum merged 13 commits into from
Apr 8, 2021
Merged

fix: Fixing deep link for QNA and Luis #6743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
56d6b74
Fixing deep link for QNA and Luis
pavolumMsft Apr 7, 2021
b4a97fb
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 7, 2021
c6ce865
updaing empty bot package name to latest
pavolumMsft Apr 7, 2021
243d4f9
surfacing useful error info to client error modal and removing generi…
pavolumMsft Apr 7, 2021
584dfc6
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 7, 2021
1023020
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 7, 2021
a906d91
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 7, 2021
31dbd5f
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 7, 2021
72736c4
Merge branch 'main' into pavolum/fixQnaDeepLink
beyackle Apr 8, 2021
3f664f5
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 8, 2021
fd2156b
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 8, 2021
2a28713
Merge branch 'main' into pavolum/fixQnaDeepLink
pavolum Apr 8, 2021
5740676
merging conflicts
pavolumMsft Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const container = css`
const idsInTab: Record<PivotItemKey, string[]> = {
Basics: ['runtimeSettings'],
LuisQna: ['luisKey', 'qnaKey'],
Connections: ['connections'],
Connections: ['connections', 'addNewPublishProfile'],
SkillConfig: [],
Language: [],
};
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/shared/src/constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

export const QnABotTemplateId = 'QnASample';

export const emptyBotNpmTemplateName = '@microsoft/generator-microsoft-bot-empty';
export const emptyBotNpmTemplateName = '@microsoft/generator-bot-empty';

export const SensitiveProperties = [
'MicrosoftAppPassword',
Expand Down
27 changes: 7 additions & 20 deletions Composer/packages/server-workers/src/workers/templateInstallation.worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ const installRemoteTemplate = async (
log('Installing generator', npmPackageName);
templateVersion = templateVersion ? templateVersion : '*';
await yeomanEnv.installLocalGenerators({ [npmPackageName]: templateVersion });

// log('Looking up local packages');
// await yeomanEnv.lookupLocalPackages();
return true;
} catch {
return false;
} catch (err) {
log('Template failed to install', npmPackageName, templateVersion, templateGeneratorPath);
throw err;
}
};

Expand Down Expand Up @@ -75,21 +72,11 @@ const yeomanWork = async (
log('Installing Yeoman template');
parentPort?.postMessage({ status: 'Installing Yeoman template' });

const remoteTemplateAvailable = await installRemoteTemplate(
yeomanEnv,
templateGeneratorPath,
npmPackageName,
templateVersion
);
if (remoteTemplateAvailable) {
log('Instantiating Yeoman template');
parentPort?.postMessage({ status: 'Instantiating Yeoman template' });
await installRemoteTemplate(yeomanEnv, templateGeneratorPath, npmPackageName, templateVersion);
log('Instantiating Yeoman template');
parentPort?.postMessage({ status: 'Instantiating Yeoman template' });

await instantiateRemoteTemplate(yeomanEnv, generatorName, dstDir, projectName, runtimeType, runtimeLanguage);
} else {
// handle error
throw new Error(`error hit when installing remote template`);
}
await instantiateRemoteTemplate(yeomanEnv, generatorName, dstDir, projectName, runtimeType, runtimeLanguage);
};

export type TemplateInstallationArgs = {
Expand Down