diff --git a/Composer/cypress/integration/Breadcrumb.spec.js b/Composer/cypress/integration/Breadcrumb.spec.js index 82ef8fe672..3a00e21e28 100644 --- a/Composer/cypress/integration/Breadcrumb.spec.js +++ b/Composer/cypress/integration/Breadcrumb.spec.js @@ -6,7 +6,7 @@ context('breadcrumb', () => { cy.visit(Cypress.env('COMPOSER_URL')); cy.createBot('TodoSample'); cy.wait(100); - + // Return to Main.dialog cy.get('[data-testid="ProjectTree"]').within(() => { cy.wait(1000); @@ -56,7 +56,7 @@ context('breadcrumb', () => { it('can show action name in breadcrumb', () => { cy.wait(100); cy.get('[data-testid="ProjectTree"]').within(() => { - cy.getByText('Conversation started (ConversationUpdate)').click(); + cy.getByText('Greeting (ConversationUpdate)').click(); cy.wait(500); }); @@ -70,6 +70,6 @@ context('breadcrumb', () => { cy.getByTestId('Breadcrumb') .invoke('text') - .should('match', /__TestTodoSample.Main.*Conversation started \(ConversationUpdate\).*Send a response/); + .should('match', /__TestTodoSample.Main.*Greeting \(ConversationUpdate\).*Send a response/); }); }); diff --git a/Composer/cypress/integration/VisualDesigner.spec.js b/Composer/cypress/integration/VisualDesigner.spec.js index db7960ef46..06f2e5a759 100644 --- a/Composer/cypress/integration/VisualDesigner.spec.js +++ b/Composer/cypress/integration/VisualDesigner.spec.js @@ -17,7 +17,7 @@ context('Visual Designer', () => { it('can find Visual Designer default trigger in container', () => { cy.get('[data-testid="ProjectTree"]').within(() => { - cy.getByText('Conversation started (ConversationUpdate)').click(); + cy.getByText('Greeting (ConversationUpdate)').click(); cy.wait(500); }); diff --git a/Composer/packages/lib/shared/src/labelMap.ts b/Composer/packages/lib/shared/src/labelMap.ts index ff18b42aed..889fccdd8f 100644 --- a/Composer/packages/lib/shared/src/labelMap.ts +++ b/Composer/packages/lib/shared/src/labelMap.ts @@ -130,7 +130,7 @@ export const ConceptLabels: { [key in ConceptLabelKey]?: LabelOverride } = { title: formatMessage('Handle a Condition'), }, [SDKTypes.OnConversationUpdateActivity]: { - title: formatMessage('Conversation started (ConversationUpdate)'), + title: formatMessage('Greeting (ConversationUpdate)'), description: 'Handle the events fired when a user begins a new conversation with the bot. Learn more', }, diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog index e7fa21e676..145ccad546 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog @@ -270,7 +270,7 @@ { "$type": "Microsoft.OnConversationUpdateActivity", "$designer": { - "name": "Conversation started (ConversationUpdate)", + "name": "Greeting (ConversationUpdate)", "id": "954390" }, "constraint": "toLower(turn.Activity.membersAdded[0].name) != 'bot'", diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog index 36b21cc001..32a9a32fe8 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog @@ -170,7 +170,7 @@ { "$type": "Microsoft.OnConversationUpdateActivity", "$designer": { - "name": "Conversation started (ConversationUpdate)", + "name": "Greeting (ConversationUpdate)", "id": "791275" }, "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'", diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog index 75536d77d5..168538225d 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog @@ -24,7 +24,7 @@ { "$type": "Microsoft.OnConversationUpdateActivity", "$designer": { - "name": "Conversation started (ConversationUpdate)", + "name": "Greeting (ConversationUpdate)", "id": "452701" }, "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'", diff --git a/Composer/packages/server/schemas/editor.schema b/Composer/packages/server/schemas/editor.schema index 1f45208c75..c4fc174b0e 100644 --- a/Composer/packages/server/schemas/editor.schema +++ b/Composer/packages/server/schemas/editor.schema @@ -99,7 +99,7 @@ "Microsoft.HttpRequest": { "title": "HTTP Request", "helpLink": "https://aka.ms/bfc-using-http", - "helpLinkText": "Learn more" + "helpLinkText": "Learn more" }, "Microsoft.IfCondition": { "title": "Branch: If/Else", @@ -150,9 +150,8 @@ "title": "Dialog started (BeginDialog)" }, "Microsoft.OnConversationUpdateActivity": { - "title": "Conversation started (ConversationUpdate)", - "description": - "Handle the events fired when a user begins a new conversation with the bot.", + "title": "Greeting (ConversationUpdate)", + "description": "Handle the events fired when a user begins a new conversation with the bot.", "helpLink": "https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime", "helpLinkText": "Learn more" }, @@ -244,7 +243,7 @@ "Microsoft.TextInput": { "title": "Prompt for text", "helpLink": "https://aka.ms/bfc-ask-for-user-input", - "helpLinkText": "Learn more" + "helpLinkText": "Learn more" }, "Microsoft.TraceActivity": { "title": "Emit a trace event", @@ -261,4 +260,4 @@ "helpLinkText": "Learn more" } } -} +} \ No newline at end of file diff --git a/docs/Create-Your-First-Bot.md b/docs/Create-Your-First-Bot.md index e12cb45d10..996ccbb039 100644 --- a/docs/Create-Your-First-Bot.md +++ b/docs/Create-Your-First-Bot.md @@ -66,7 +66,7 @@ To add the newly created dialog to the event, first, go back to the root dialog, ## Step 5: (Optional) Creating handlers for other types of events -Besides recognized intents, you may want to handle other types of events, for example, when there are unrecognized intents or when a user joins the conversation. Creating handlers for these types of events is no different from creating intent handlers. You just need to select a different event type as shown below. For example, select **Conversation started (ConversationUpdate)** if you want to send a welcome message to the user when they first join the conversation (when a conversationUpdate event is trigged). +Besides recognized intents, you may want to handle other types of events, for example, when there are unrecognized intents or when a user joins the conversation. Creating handlers for these types of events is no different from creating intent handlers. You just need to select a different event type as shown below. For example, select **Greeting (ConversationUpdate)** if you want to send a welcome message to the user when they first join the conversation (when a conversationUpdate event is trigged). Other event handler diff --git a/docs/CreateYourFirstBot.md b/docs/CreateYourFirstBot.md index a29523d55c..3c526462b1 100644 --- a/docs/CreateYourFirstBot.md +++ b/docs/CreateYourFirstBot.md @@ -63,7 +63,7 @@ To add the newly created dialog to the event, first, go back to the root dialog, ## Step 5: (Optional) Creating handlers for other types of events -Besides recognized intents, you may want to handle other types of events, for example, when there are unrecognized intents or when a user joins the conversation. Creating handlers for these types of events is no different from creating intent handlers. You just need to select a different event type as shown below. For example, select **Conversation started (ConversationUpdate)** if you want to send a welcome message to the user when they first join the conversation (when a conversationUpdate event is trigged). +Besides recognized intents, you may want to handle other types of events, for example, when there are unrecognized intents or when a user joins the conversation. Creating handlers for these types of events is no different from creating intent handlers. You just need to select a different event type as shown below. For example, select **Greeting (ConversationUpdate)** if you want to send a welcome message to the user when they first join the conversation (when a conversationUpdate event is trigged). Other event handler diff --git a/docs/howto-defining-triggers.md b/docs/howto-defining-triggers.md index 3b5f9c76aa..5cfa1a92f5 100644 --- a/docs/howto-defining-triggers.md +++ b/docs/howto-defining-triggers.md @@ -53,10 +53,10 @@ Under this trigger, click the **+** sign and mouse over the action menu. Click * ![begin_new_dialog_configure](./media/events_triggers/begin_new_dialog_configure.gif) ## Activity trigger -This is a type of trigger used to handle activity events such as your bot receiving a **ConversationUpdate** Activity. This indicates a new conversation begins and you use a **Conversation started (ConversationUpdate)** trigger to handle it. Follow the steps below to define a **Conversation started (ConversationUpdate)** trigger and send a welcome message: +This is a type of trigger used to handle activity events such as your bot receiving a **ConversationUpdate** Activity. This indicates a new conversation begins and you use a **Greeting (ConversationUpdate)** trigger to handle it. Follow the steps below to define a **Greeting (ConversationUpdate)** trigger and send a welcome message: ### 1. Create a **ConversationUpdate** trigger -On the navigation pane on the left side, click **New Trigger** in your selected dialog and choose **Activity trigger** and then **Conversation started (ConversationUpdate)** from the drop-down menu. Click **submit**. +On the navigation pane on the left side, click **New Trigger** in your selected dialog and choose **Activity trigger** and then **Greeting (ConversationUpdate)** from the drop-down menu. Click **submit**. ![conversationupdate](./media/events_triggers/conversationupdate.png)