From 200c6fd5170ca389f64c15387c0438feddeb8f77 Mon Sep 17 00:00:00 2001 From: Steven Ickman Date: Fri, 8 May 2020 11:53:41 -0700 Subject: [PATCH] Renamed AdaptiveSkillDialog to BeginSkillDialog (#2212) --- .../beginSkillDialog.ts} | 4 ++-- .../botbuilder-dialogs-adaptive/src/actions/index.ts | 1 + .../src/adaptiveDialogComponentRegistration.ts | 5 ++--- libraries/botbuilder-dialogs-adaptive/src/index.ts | 1 - .../botbuilder-dialogs-adaptive/src/skills/index.ts | 8 -------- ...iveSkillDialog.test.js => beginSkillDialog.test.js} | 10 +++++----- 6 files changed, 10 insertions(+), 19 deletions(-) rename libraries/botbuilder-dialogs-adaptive/src/{skills/adaptiveSkillDialog.ts => actions/beginSkillDialog.ts} (98%) delete mode 100644 libraries/botbuilder-dialogs-adaptive/src/skills/index.ts rename libraries/botbuilder-dialogs-adaptive/tests/{adaptiveSkillDialog.test.js => beginSkillDialog.test.js} (95%) diff --git a/libraries/botbuilder-dialogs-adaptive/src/skills/adaptiveSkillDialog.ts b/libraries/botbuilder-dialogs-adaptive/src/actions/beginSkillDialog.ts similarity index 98% rename from libraries/botbuilder-dialogs-adaptive/src/skills/adaptiveSkillDialog.ts rename to libraries/botbuilder-dialogs-adaptive/src/actions/beginSkillDialog.ts index 605e0ae75c..1d44729afc 100644 --- a/libraries/botbuilder-dialogs-adaptive/src/skills/adaptiveSkillDialog.ts +++ b/libraries/botbuilder-dialogs-adaptive/src/actions/beginSkillDialog.ts @@ -13,7 +13,7 @@ import { Activity, ActivityTypes, BotFrameworkClient, SkillConversationIdFactory const SKILL_CLIENT = Symbol('skillClient'); const CONVERSATION_ID_FACTORY = Symbol('conversationIdFactory'); -export class AdaptiveSkillDialog extends SkillDialog { +export class BeginSkillDialog extends SkillDialog { /** * Optional expression which if is true will disable this action. @@ -71,7 +71,7 @@ export class AdaptiveSkillDialog extends SkillDialog { public connectionName: StringExpression; /** - * Creates a new `AdaptiveSkillDialog instance. + * Creates a new `BeginSkillDialog instance. * @param options Optional options used to configure the skill dialog. */ constructor(options?: SkillDialogOptions) { diff --git a/libraries/botbuilder-dialogs-adaptive/src/actions/index.ts b/libraries/botbuilder-dialogs-adaptive/src/actions/index.ts index 49779097e3..5a3e09b658 100644 --- a/libraries/botbuilder-dialogs-adaptive/src/actions/index.ts +++ b/libraries/botbuilder-dialogs-adaptive/src/actions/index.ts @@ -8,6 +8,7 @@ export * from './actionScope'; export * from './baseInvokeDialog'; export * from './beginDialog'; +export * from './beginSkillDialog'; export * from './breakLoop'; export * from './cancelAllDialogs'; export * from './case'; diff --git a/libraries/botbuilder-dialogs-adaptive/src/adaptiveDialogComponentRegistration.ts b/libraries/botbuilder-dialogs-adaptive/src/adaptiveDialogComponentRegistration.ts index a4b4454f7d..eecbe0f048 100644 --- a/libraries/botbuilder-dialogs-adaptive/src/adaptiveDialogComponentRegistration.ts +++ b/libraries/botbuilder-dialogs-adaptive/src/adaptiveDialogComponentRegistration.ts @@ -10,7 +10,7 @@ import { ComponentRegistration, ResourceExplorer, TypeBuilder, BuilderRegistrati import { Choice, ListStyle, ChoiceFactoryOptions, FindChoicesOptions } from 'botbuilder-dialogs'; import { AdaptiveTypeBuilder } from './adaptiveTypeBuilder'; import { AdaptiveDialog } from './adaptiveDialog'; -import { BeginDialog, BreakLoop, CancelAllDialogs, ContinueLoop, DeleteActivity, DeleteProperties, DeleteProperty, EditActions, EditArray, EmitEvent, EndDialog, EndTurn, ForEach, ForEachPage, GetActivityMembers, GetConversationMembers, GotoAction, IfCondition, LogAction, RepeatDialog, ReplaceDialog, SendActivity, SetProperties, SetProperty, SignOutUser, SwitchCondition, TraceActivity, UpdateActivity, ArrayChangeType, PropertyAssignmentConverter } from './actions'; +import { BeginDialog, BeginSkillDialog, BreakLoop, CancelAllDialogs, ContinueLoop, DeleteActivity, DeleteProperties, DeleteProperty, EditActions, EditArray, EmitEvent, EndDialog, EndTurn, ForEach, ForEachPage, GetActivityMembers, GetConversationMembers, GotoAction, IfCondition, LogAction, RepeatDialog, ReplaceDialog, SendActivity, SetProperties, SetProperty, SignOutUser, SwitchCondition, TraceActivity, UpdateActivity, ArrayChangeType, PropertyAssignmentConverter } from './actions'; import { AttachmentInput, ChoiceInput, ConfirmInput, DateTimeInput, NumberInput, OAuthInput, TextInput, AttachmentOutputFormat, ChoiceOutputFormat } from './input'; import { OnActivity, OnAssignEntity, OnBeginDialog, OnCancelDialog, OnChooseEntity, OnChooseIntent, OnChooseProperty, OnClearProperty, OnCondition, OnConversationUpdateActivity, OnCustomEvent, OnDialogEvent, OnEndOfActions, OnEndOfConversationActivity, OnError, OnEventActivity, OnHandoffActivity, OnIntent, OnInvokeActivity, OnMessageActivity, OnMessageDeleteActivity, OnMessageReactionActivity, OnMessageUpdateActivity, OnQnAMatch, OnRepromptDialog, OnTypingActivity, OnUnknownIntent } from './conditions'; import { CrossTrainedRecognizerSet, MultiLanguageRecognizer, RecognizerSet, ValueRecognizer, RegexRecognizer, IntentPatternConverter } from './recognizers'; @@ -24,7 +24,6 @@ import { TemplateEngineLanguageGenerator, ResourceMultiLanguageGenerator } from import { ConditionalSelector, FirstSelector, RandomSelector, TrueSelector } from './selectors'; import { LanguageGeneratorConverter } from './converters/languageGeneratorConverter'; import { LuisAdaptiveRecognizer } from './luis'; -import { AdaptiveSkillDialog } from './skills/adaptiveSkillDialog'; export class AdaptiveDialogComponentRegistration implements ComponentRegistration { private _resourceExplorer: ResourceExplorer; @@ -36,7 +35,7 @@ export class AdaptiveDialogComponentRegistration implements ComponentRegistratio this.registerBuilder('Microsoft.AdaptiveDialog', new AdaptiveTypeBuilder(AdaptiveDialog, this._resourceExplorer, { 'generator': new LanguageGeneratorConverter() })); - this.registerBuilder('Microsoft.AdaptiveSkillDialog', new AdaptiveTypeBuilder(AdaptiveSkillDialog, this._resourceExplorer, { + this.registerBuilder('Microsoft.BeginSkillDialog', new AdaptiveTypeBuilder(BeginSkillDialog, this._resourceExplorer, { 'disabled': new BoolExpressionConverter(), 'activityProcessed': new BoolExpressionConverter(), 'resultProperty': new StringExpressionConverter(), diff --git a/libraries/botbuilder-dialogs-adaptive/src/index.ts b/libraries/botbuilder-dialogs-adaptive/src/index.ts index 9b15ec34ff..ef138e1b41 100644 --- a/libraries/botbuilder-dialogs-adaptive/src/index.ts +++ b/libraries/botbuilder-dialogs-adaptive/src/index.ts @@ -18,7 +18,6 @@ export * from './input'; export * from './luis'; export * from './recognizers'; export * from './selectors'; -export * from './skills'; export * from './templates'; export * from './adaptiveDialog'; export * from './languageGenerationMiddleware'; diff --git a/libraries/botbuilder-dialogs-adaptive/src/skills/index.ts b/libraries/botbuilder-dialogs-adaptive/src/skills/index.ts deleted file mode 100644 index 30041674e7..0000000000 --- a/libraries/botbuilder-dialogs-adaptive/src/skills/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @module botbuilder-dialogs-adaptive - */ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. - */ -export * from './adaptiveSkillDialog'; \ No newline at end of file diff --git a/libraries/botbuilder-dialogs-adaptive/tests/adaptiveSkillDialog.test.js b/libraries/botbuilder-dialogs-adaptive/tests/beginSkillDialog.test.js similarity index 95% rename from libraries/botbuilder-dialogs-adaptive/tests/adaptiveSkillDialog.test.js rename to libraries/botbuilder-dialogs-adaptive/tests/beginSkillDialog.test.js index b7a86db742..f9cbf5a3df 100644 --- a/libraries/botbuilder-dialogs-adaptive/tests/adaptiveSkillDialog.test.js +++ b/libraries/botbuilder-dialogs-adaptive/tests/beginSkillDialog.test.js @@ -12,7 +12,7 @@ const { } = require('botbuilder-core'); const { BoolExpression, StringExpression } = require('adaptive-expressions'); const { DialogManager, DialogTurnStatus } = require('botbuilder-dialogs'); -const { AdaptiveSkillDialog } = require('../') +const { BeginSkillDialog } = require('../lib') class SimpleConversationIdFactory extends SkillConversationIdFactoryBase { @@ -55,7 +55,7 @@ class SimpleConversationIdFactory extends SkillConversationIdFactoryBase { } } -describe('SkillDialog', function() { +describe('BeginSkillDialog', function() { this.timeout(3000); let activitySent; // Activity @@ -79,10 +79,10 @@ describe('SkillDialog', function() { const conversationState = new ConversationState(new MemoryStorage()); const dm = new DialogManager(); dm.conversationState = conversationState; - AdaptiveSkillDialog.setSkillHostOptions(dm, skillClient, new SimpleConversationIdFactory()); + BeginSkillDialog.setSkillHostOptions(dm, skillClient, new SimpleConversationIdFactory()); // Setup skill dialog - const dialog = new AdaptiveSkillDialog(); + const dialog = new BeginSkillDialog(); setSkillDialogOptions(dialog); dm.rootDialog = dialog; @@ -122,7 +122,7 @@ function setSkillDialogOptions(dialog) { */ function createSkillClientAndStub(captureAction, returnStatusCode = StatusCodes.OK) { // This require should not fail as this method should only be called after verifying that botbuilder is resolvable. - const { BotFrameworkHttpClient } = require('../../botbuilder'); + const { BotFrameworkHttpClient } = require('../../botbuilder/lib'); if (captureAction && typeof captureAction !== 'function') { throw new TypeError(`Failed test arrangement - createSkillClientAndStub() received ${typeof captureAction} instead of undefined or a function.`);