Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Composer/cypress/integration/Breadcrumb.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
});

Expand All @@ -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/);
});
});
2 changes: 1 addition & 1 deletion Composer/cypress/integration/VisualDesigner.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/shared/src/labelMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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. <a href="https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime" target="_blank">Learn more</a>',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down
11 changes: 5 additions & 6 deletions Composer/packages/server/schemas/editor.schema
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -261,4 +260,4 @@
"helpLinkText": "Learn more"
}
}
}
}
2 changes: 1 addition & 1 deletion docs/Create-Your-First-Bot.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

<img src = "Assets/OtherEventHandlers.png" alt = "Other event handler" width = 500></img>

Expand Down
2 changes: 1 addition & 1 deletion docs/CreateYourFirstBot.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

<img src = "Assets/OtherEventHandlers.png" alt = "Other event handler" width = 500></img>

Expand Down
4 changes: 2 additions & 2 deletions docs/howto-defining-triggers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down