From e887bb5b78dd6d50ea43d6c8411ed514447462f7 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Tue, 26 Jan 2021 11:09:05 -0800 Subject: [PATCH 01/10] sync schemas --- .../schemas/Actions/Teams.GetMeetingParticipant.schema | 8 ++++---- .../TriggerConditions/Teams.OnAppBasedLinkQuery.schema | 5 +---- .../schemas/TriggerConditions/Teams.OnCardAction.schema | 2 +- .../TriggerConditions/Teams.OnChannelCreated.schema | 2 +- .../TriggerConditions/Teams.OnChannelDeleted.schema | 2 +- .../TriggerConditions/Teams.OnChannelRenamed.schema | 2 +- .../TriggerConditions/Teams.OnChannelRestored.schema | 2 +- .../schemas/TriggerConditions/Teams.OnFileConsent.schema | 2 +- .../Teams.OnMessagingExtensionCardButtonClicked.schema | 2 +- ...nMessagingExtensionConfigurationQuerySettingUrl.schema | 2 +- .../Teams.OnMessagingExtensionConfigurationSetting.schema | 2 +- .../Teams.OnMessagingExtensionFetchTask.schema | 2 +- .../Teams.OnMessagingExtensionQuery.schema | 2 +- .../Teams.OnMessagingExtensionSelectItem.schema | 2 +- .../Teams.OnMessagingExtensionSubmitAction.schema | 2 +- .../Teams.OnO365ConnectorCardAction.schema | 2 +- .../TriggerConditions/Teams.OnTaskModuleFetch.schema | 6 +++--- .../TriggerConditions/Teams.OnTaskModuleSubmit.schema | 2 +- .../schemas/TriggerConditions/Teams.OnTeamArchived.schema | 2 +- .../schemas/TriggerConditions/Teams.OnTeamDeleted.schema | 2 +- .../TriggerConditions/Teams.OnTeamHardDeleted.schema | 2 +- .../schemas/TriggerConditions/Teams.OnTeamRenamed.schema | 2 +- .../schemas/TriggerConditions/Teams.OnTeamRestored.schema | 2 +- .../TriggerConditions/Teams.OnTeamUnarchived.schema | 2 +- 24 files changed, 29 insertions(+), 32 deletions(-) diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/Actions/Teams.GetMeetingParticipant.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/Actions/Teams.GetMeetingParticipant.schema index 93e0cca74c..8c73312fad 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/Actions/Teams.GetMeetingParticipant.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/Actions/Teams.GetMeetingParticipant.schema @@ -15,12 +15,12 @@ "title": "Property", "description": "Property (named location to store information).", "examples": [ - "dialog.participantInfo" + "user.participantInfo" ] }, "meetingId": { "$ref": "schema:#/definitions/stringExpression", - "title": "Meeting id", + "title": "Meeting Id", "description": "Meeting Id or expression to a meetingId to use to get the participant information. Default value is the current turn.activity.channelData.meeting.id.", "examples": [ "=turn.activity.channelData.meeting.id" @@ -28,7 +28,7 @@ }, "participantId": { "$ref": "schema:#/definitions/stringExpression", - "title": "Participant id", + "title": "Participant Id", "description": "Participant Id or expression to a participantId to use to get the participant information. Default value is the current turn.activity.from.aadObjectId.", "examples": [ "=turn.activity.from.aadObjectId" @@ -36,7 +36,7 @@ }, "tenantId": { "$ref": "schema:#/definitions/stringExpression", - "title": "Tenant id", + "title": "Tenant Id", "description": "Tenant Id or expression to a tenantId to use to get the participant information. Default value is the current $turn.activity.channelData.tenant.id.", "examples": [ "=turn.activity.channelData.tenant.id" diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnAppBasedLinkQuery.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnAppBasedLinkQuery.schema index 81b38bf279..000495ff92 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnAppBasedLinkQuery.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnAppBasedLinkQuery.schema @@ -1,12 +1,9 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On app based link query", + "title": "OnTeamsAppBasedLinkQuery", "description": "Actions triggered when a Teams activity is received with activity.name == 'composeExtension/queryLink'.", "type": "object", - "hidden": [ - "actions" - ], "required": [ ] } diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnCardAction.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnCardAction.schema index 0a6418deec..d7a91fd784 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnCardAction.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnCardAction.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams card action", + "title": "OnTeamsCardAction", "description": "Actions triggered when a Teams InvokeActivity is received with no activity.name.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelCreated.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelCreated.schema index efafbb7ec8..b3b19c0372 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelCreated.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelCreated.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams channel created", + "title": "OnTeamsChannelCreated", "description": "Actions triggered when a Teams ConversationUpdateActivity with channelData.eventType == 'channelCreated'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelDeleted.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelDeleted.schema index df7d9a075d..727cb9e746 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelDeleted.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelDeleted.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams channel deleted", + "title": "OnTeamsChannelDeleted", "description": "Actions triggered when a Teams ConversationUpdateActivity with channelData.eventType == 'channelDeleted'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRenamed.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRenamed.schema index 2096cfadd1..459bb20618 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRenamed.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRenamed.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams channel renamed", + "title": "OnTeamsChannelRenamed", "description": "Actions triggered when a Teams ConversationUpdateActivity with channelData.eventType == 'channelRenamed'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRestored.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRestored.schema index 377afdb822..6d20edced7 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRestored.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnChannelRestored.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams channel restored", + "title": "OnTeamsChannelRestored", "description": "Actions triggered when a Teams ConversationUpdateActivity with channelData.eventType == 'channelRestored'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnFileConsent.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnFileConsent.schema index 1d94a1d78d..def3f02e4a 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnFileConsent.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnFileConsent.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams file consent", + "title": "OnTeamsFileConsent", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name == 'fileConsent/invoke'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionCardButtonClicked.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionCardButtonClicked.schema index 764246483a..d23b43318a 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionCardButtonClicked.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionCardButtonClicked.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams messaging extension card button clicked", + "title": "OnTeamsMessagingExtensionCardButtonClicked", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/onCardButtonClicked'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationQuerySettingUrl.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationQuerySettingUrl.schema index faca0dede1..b4a9272628 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationQuerySettingUrl.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationQuerySettingUrl.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams messaging extension configuration query setting url", + "title": "OnTeamsMessagingExtensionConfigurationQuerySettingUrl", "description": "Actions triggered when a Teams InvokeActivity is received with name='composeExtension/querySettingUrl'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationSetting.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationSetting.schema index 5d1b63c494..54fdd7f78d 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationSetting.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionConfigurationSetting.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams messaging extension configuration setting", + "title": "OnTeamsMessagingExtensionConfigurationSetting", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/setting'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionFetchTask.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionFetchTask.schema index 87ede1f5fb..8d21bde657 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionFetchTask.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionFetchTask.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams messaging extension fetch task", + "title": "OnTeamsMessagingExtensionFetchTask", "description": "Actions triggered when a Teams InvokeActivity is received when activity.name='composeExtension/fetchTask'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionQuery.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionQuery.schema index c8ef20c8e5..a97a14176d 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionQuery.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionQuery.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams messaging extension query", + "title": "OnTeamsMessagingExtensionQuery", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/query'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSelectItem.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSelectItem.schema index bb948da2a8..746ad8f5f8 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSelectItem.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSelectItem.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams messaging extension select item", + "title": "OnTeamsMessagingExtensionSelectItem", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/selectItem'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSubmitAction.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSubmitAction.schema index 4c0fdb88d0..28d74fd36f 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSubmitAction.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnMessagingExtensionSubmitAction.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On teams messaging extension submit action", + "title": "OnTeamsMessagingExtensionSubmitAction", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/submitAction'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnO365ConnectorCardAction.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnO365ConnectorCardAction.schema index 4fef140836..13cead7bb2 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnO365ConnectorCardAction.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnO365ConnectorCardAction.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams O365 connector card action", + "title": "OnTeamsO365ConnectorCardAction", "description": "Actions triggered when a Teams InvokeActivity is received for 'actionableMessage/executeAction'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleFetch.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleFetch.schema index e204d556d6..57848fb2a8 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleFetch.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleFetch.schema @@ -1,9 +1,9 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams task module fetch", - "description": "Actions triggered when a Teams Invoke Activity is received with activity.name='task/fetch'.", + "title": "OnTeamsTaskModuleFetch", + "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='task/fetch'.", "type": "object", "required": [ ] -} \ No newline at end of file +} diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleSubmit.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleSubmit.schema index 4efe4338a0..39ef8c3d1c 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleSubmit.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTaskModuleSubmit.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams task module submit", + "title": "OnTeamsTaskModuleSubmit", "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='task/submit'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamArchived.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamArchived.schema index b073e11ff5..f19b0fb9e4 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamArchived.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamArchived.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams team archived", + "title": "OnTeamsTeamArchived", "description": "Actions triggered when a Teams ConversationUpdate with channelData.eventType == 'teamArchived'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamDeleted.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamDeleted.schema index 0aebed0093..9f2775c55d 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamDeleted.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamDeleted.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams team deleted", + "title": "OnTeamsTeamDeleted", "description": "Actions triggered when a Teams ConversationUpdate with channelData.eventType == 'teamDeleted'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamHardDeleted.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamHardDeleted.schema index 9339ee41ce..2e34add9bd 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamHardDeleted.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamHardDeleted.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams team hard deleted", + "title": "OnTeamsTeamHardDeleted", "description": "Actions triggered when a Teams ConversationUpdate with channelData.eventType == 'teamHardDeleted'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRenamed.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRenamed.schema index edad64a901..639accc377 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRenamed.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRenamed.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams team renamed", + "title": "OnTeamsTeamRenamed", "description": "Actions triggered when a Teams ConversationUpdate with channelData.eventType == 'teamRenamed'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRestored.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRestored.schema index ddb0bd1f61..40c6199d10 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRestored.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamRestored.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams team restored", + "title": "OnTeamsTeamRestored", "description": "Actions triggered when a Teams ConversationUpdate with channelData.eventType == 'teamRestored'.", "type": "object", "required": [ diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamUnarchived.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamUnarchived.schema index 54f833a3a1..ab0a0e09ce 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamUnarchived.schema +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTeamUnarchived.schema @@ -1,7 +1,7 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], - "title": "On Teams team unarchived", + "title": "OnTeamsTeamUnarchived", "description": "Actions triggered when a Teams ConversationUpdate with channelData.eventType == 'teamUnarchived'.", "type": "object", "required": [ From 75628d9f46a96d3589db3162244a168201f6e096 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Tue, 26 Jan 2021 13:38:12 -0800 Subject: [PATCH 02/10] add onTeamsTabFetch adn onTeamsTabSubmit --- .../src/conditions/index.ts | 2 + .../src/conditions/onTeamsTabFetch.ts | 28 +++ .../src/conditions/onTeamsTabSubmit.ts | 28 +++ .../src/teamsComponentRegistration.ts | 4 + .../botbuilder/src/teamsActivityHandler.ts | 33 ++++ .../botframework-schema/src/teams/index.ts | 165 ++++++++++++++++++ 6 files changed, 260 insertions(+) create mode 100644 libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts create mode 100644 libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/index.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/index.ts index 2c44012ce6..29d6811e51 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/index.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/index.ts @@ -23,6 +23,8 @@ export * from './onTeamsMessagingExtensionQuery'; export * from './onTeamsMessagingExtensionSelectItem'; export * from './onTeamsMessagingExtensionSubmitAction'; export * from './onTeamsO365ConnectorCardAction'; +export * from './onTeamsTabFetch'; +export * from './onTeamsTabSubmit'; export * from './onTeamsTaskModuleFetch'; export * from './onTeamsTaskModuleSubmit'; export * from './onTeamsTeamArchived'; diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts new file mode 100644 index 0000000000..5a9b913575 --- /dev/null +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts @@ -0,0 +1,28 @@ +/** + * @module botbuilder-dialogs-adaptive-teams + */ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. + */ + +import { Expression, ExpressionParserInterface } from 'adaptive-expressions'; +import { Channels } from 'botbuilder'; +import { TurnPath } from 'botbuilder-dialogs'; +import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; + +/** + * Actions triggered when a Teams InvokeActivity is received with activity.name='tab/fetch'. + */ +export class OnTeamsTabFetch extends OnInvokeActivity { + public static $kind = 'Teams.OnTabFetch'; + + public getExpression(parser: ExpressionParserInterface): Expression { + return Expression.andExpression( + Expression.parse( + `${TurnPath.activity}.channelId == '${Channels.Msteams}' && ${TurnPath.activity}.name == 'tab/fetch'` + ), + super.getExpression(parser) + ); + } +} diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts new file mode 100644 index 0000000000..76cba007ff --- /dev/null +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts @@ -0,0 +1,28 @@ +/** + * @module botbuilder-dialogs-adaptive-teams + */ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. + */ + +import { Expression, ExpressionParserInterface } from 'adaptive-expressions'; +import { Channels } from 'botbuilder'; +import { TurnPath } from 'botbuilder-dialogs'; +import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; + +/** + * Actions triggered when a Teams InvokeActivity is received with activity.name='tab/submit'. + */ +export class OnTeamsTabSubmit extends OnInvokeActivity { + public static $kind = 'Teams.OnTabSubmit'; + + public getExpression(parser: ExpressionParserInterface): Expression { + return Expression.andExpression( + Expression.parse( + `${TurnPath.activity}.channelId == '${Channels.Msteams}' && ${TurnPath.activity}.name == 'tab/submit'` + ), + super.getExpression(parser) + ); + } +} diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/teamsComponentRegistration.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/teamsComponentRegistration.ts index 3b4b96462b..0147bcef66 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/teamsComponentRegistration.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/teamsComponentRegistration.ts @@ -31,6 +31,8 @@ import { OnTeamsMessagingExtensionSelectItem, OnTeamsMessagingExtensionSubmitAction, OnTeamsO365ConnectorCardAction, + OnTeamsTabFetch, + OnTeamsTabSubmit, OnTeamsTaskModuleFetch, OnTeamsTaskModuleSubmit, OnTeamsTeamArchived, @@ -147,6 +149,8 @@ export class TeamsComponentRegistration extends ComponentRegistration implements this._addDeclarativeType(OnTeamsMessagingExtensionConfigurationSetting); this._addDeclarativeType(OnTeamsMessagingExtensionSubmitAction); this._addDeclarativeType(OnTeamsO365ConnectorCardAction); + this._addDeclarativeType(OnTeamsTabFetch); + this._addDeclarativeType(OnTeamsTabSubmit); this._addDeclarativeType(OnTeamsTaskModuleFetch); this._addDeclarativeType(OnTeamsTaskModuleSubmit); this._addDeclarativeType(OnTeamsTeamArchived); diff --git a/libraries/botbuilder/src/teamsActivityHandler.ts b/libraries/botbuilder/src/teamsActivityHandler.ts index defcf8cd42..4a0e6009d3 100644 --- a/libraries/botbuilder/src/teamsActivityHandler.ts +++ b/libraries/botbuilder/src/teamsActivityHandler.ts @@ -18,6 +18,9 @@ import { MessagingExtensionResponse, O365ConnectorCardActionQuery, SigninStateVerificationQuery, + TabRequest, + TabResponse, + TabSubmit, TaskModuleRequest, TaskModuleResponse, TeamsChannelData, @@ -119,6 +122,16 @@ export class TeamsActivityHandler extends ActivityHandler { await this.handleTeamsTaskModuleSubmit(context, context.activity.value) ); + case 'tab/fetch': + return ActivityHandler.createInvokeResponse( + await this.handleTeamsTabFetch(context, context.activity.value) + ); + + case 'tab/submit': + return ActivityHandler.createInvokeResponse( + await this.handleTeamsTabSubmit(context, context.activity.value) + ); + default: runEvents = false; return super.onInvokeActivity(context); @@ -289,6 +302,26 @@ export class TeamsActivityHandler extends ActivityHandler { throw new Error('NotImplemented'); } + /** + * Receives invoke activities with Activity name of 'tab/fetch' + * @param context A context object for this turn. + * @param tabRequest The tab invoke request value payload. + * @returns A Tab Response for the request. + */ + protected async handleTeamsTabFetch(context: TurnContext, tabRequest: TabRequest): Promise { + throw new Error('NotImplemented'); + } + + /** + * Receives invoke activities with Activity name of 'tab/submit' + * @param context A context object for this turn. + * @param tabSubmit The tab submit invoke request value payload. + * @returns A Tab Response for the request. + */ + protected async handleTeamsTabSubmit(context: TurnContext, tabSubmit: TabSubmit): Promise { + throw new Error('NotImplemented'); + } + /** * Receives invoke activities with Activity name of 'composeExtension/queryLink' * @remarks diff --git a/libraries/botframework-schema/src/teams/index.ts b/libraries/botframework-schema/src/teams/index.ts index f2d0d3d194..6f1b80503c 100644 --- a/libraries/botframework-schema/src/teams/index.ts +++ b/libraries/botframework-schema/src/teams/index.ts @@ -928,6 +928,10 @@ export interface TaskModuleRequest { * the current theme */ context?: TaskModuleRequestContext; + /** + * @member {TabEntityContext} [tabContext] Tab request context. + */ + tabContext?: TabEntityContext; } /** @@ -1225,6 +1229,167 @@ export interface FileConsentCardResponse { uploadInfo?: FileUploadInfo; } +/** + * @interface + * Current tab request context, i.e., the current theme. + */ +export interface TabContext { + /** + * @member {theme} [string] The current user's theme. + */ + theme?: string; +} + +/** + * @interface + * Current TabRequest entity context, or 'tabEntityId'. + * + */ +export interface TabEntityContext { + /** + * @member {string} [tabEntityId] The entity id of the tab. + */ + tabEntityId?: string; +} + +/** + * @interface + * Invoke ('tab/fetch') request value payload. + * + */ +export interface TabRequest { + /** + * @member {TabEntityContext} [tabContext] The current tab entity request context. + */ + tabContext?: TabEntityContext; + /** + * @member {TabContext} [context] The current user context, i.e., the current theme. + */ + context?: TabContext; + /** + * @member {string} [state] The magic code for OAuth flow. + */ + state?: string; +} + +/** + * @interface + * Envelope for Card Tab Response Payload. + * + */ +export interface TabResponse { + /** + * @member {TabResponsePayload} [tab] The response to the tab/fetch message. + */ + tab?: TabResponsePayload; +} + +/** + * @interface + * Envelope for cards for a Tab request. + * + */ +export interface TabResponseCard { + /** + * @member {Record} [card] The adaptive card for this card tab response. + */ + card?: Record; +} + +/** + * @interface + * Envelope for cards for a TabResponse. + * + */ +export interface TabResponseCards { + /** + * @member {Record[]} [cards] Adaptive cards for this card tab response. + */ + cards?: Record[]; +} + +/** + * @interface + * Payload for Tab Response. + * + */ +export interface TabResponsePayload { + /** + * @member {'continue' | 'auth' | 'silentAuth'} [type] Choice of action options when responding to the tab/fetch message. + */ + type?: 'continue' | 'auth' | 'silentAuth'; + /** + * @member {TabResponseCards} [value] The TabResponseCards to send when responding to + * tab/fetch activity with type of 'continue'. + */ + value?: TabResponseCards; + /** + * @member {TabSuggestedActions} [suggestedActions] The Suggested Actions for this card tab. + */ + suggestedActions?: TabSuggestedActions; +} + +/** + * @interface + * Invoke ('tab/submit') request value payload. + * + */ +export interface TabSubmit { + /** + * @member {TabEntityContext} [tabContext] The current tab's entity request context. + */ + tabContext?: TabEntityContext; + /** + * @member {TabContext} [context] The current user context, i.e., the current theme. + */ + context?: TabContext; + /** + * @member {TabSubmitData} [data] User input. Free payload containing properties of key-value pairs. + */ + data?: TabSubmitData; +} + +/** + * @interface + * Invoke ('tab/submit') request value payload data. + * + */ +export interface TabSubmitData { + /** + * @member {string} [type] Should currently be 'tab/submit'. + */ + type?: string; + /** + * @member {any} [any] Additional properties not otherwise defined in TabSubmit. + */ + [properties: string]: any; +} + +/** + * @interface + * Tab SuggestedActions (Only when type is 'auth' or 'silentAuth'). + * + */ +export interface TabSuggestedActions { + /** + * @member {Record[]} [actions] Actions to show in the card response. + */ + actions?: Record[]; +} + +/** + * @interface + * Tab response to 'task/submit'. + * + * @extends TaskModuleResponseBase + */ +export interface TaskModuleCardResponse extends TaskModuleResponseBase { + /** + * @member {string} [value] JSON for Adaptive cards to appear in the tab. + */ + value?: string; +} + /** * @interface * An interface representing TaskModuleTaskInfo. From 4e78d3c4b4776b6065454620535fd7564b919bea Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Tue, 26 Jan 2021 14:51:00 -0800 Subject: [PATCH 03/10] test sync --- ...nalsTests_OnTeamsActivityTypes.test.dialog | 46 +++++++ .../tests/teamsActivityHandler.test.js | 120 ++++++++++++++++-- 2 files changed, 158 insertions(+), 8 deletions(-) diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog index 0941c90e95..9a60fc7e3d 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog +++ b/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog @@ -182,6 +182,16 @@ "activity": "OnTaskModuleFetch" } ] + }, + { + "$kind": "Teams.OnTabFetch", + "condition": "turn.activity.text == 'OnTabFetch'", + "actions": [ + { + "$kind": "Microsoft.SendActivity", + "activity": "OnTabFetch" + } + ] }, { "$kind": "Teams.OnTaskModuleSubmit", @@ -193,6 +203,16 @@ } ] }, + { + "$kind": "Teams.OnTabSubmit", + "condition": "turn.activity.text == 'OnTabSubmit'", + "actions": [ + { + "$kind": "Microsoft.SendActivity", + "activity": "OnTabSubmit" + } + ] + }, { "$kind": "Teams.OnTeamArchived", "condition": "turn.activity.text == 'OnTeamArchived'", @@ -456,6 +476,19 @@ "$kind": "Microsoft.Test.AssertReply", "text": "OnO365ConnectorCardAction" }, + { + "$kind": "Microsoft.Test.UserActivity", + "activity": { + "type": "invoke", + "text": "OnTabFetch", + "value": {}, + "name": "tab/fetch" + } + }, + { + "$kind": "Microsoft.Test.AssertReply", + "text": "OnTabFetch" + }, { "$kind": "Microsoft.Test.UserActivity", "activity": { @@ -469,6 +502,19 @@ "$kind": "Microsoft.Test.AssertReply", "text": "OnTaskModuleFetch" }, + { + "$kind": "Microsoft.Test.UserActivity", + "activity": { + "type": "invoke", + "text": "OnTabSubmit", + "value": {}, + "name": "tab/submit" + } + }, + { + "$kind": "Microsoft.Test.AssertReply", + "text": "OnTabSubmit" + }, { "$kind": "Microsoft.Test.UserActivity", "activity": { diff --git a/libraries/botbuilder/tests/teamsActivityHandler.test.js b/libraries/botbuilder/tests/teamsActivityHandler.test.js index c24e209d85..f3fe5659d4 100644 --- a/libraries/botbuilder/tests/teamsActivityHandler.test.js +++ b/libraries/botbuilder/tests/teamsActivityHandler.test.js @@ -508,6 +508,42 @@ describe('TeamsActivityHandler', () => { .catch(err => done(err)); }); + it('handleTeamsTabFetch is not overridden', done => { + const bot = new TeamsActivityHandler(); + + const adapter = new TestAdapter(async context => { + await bot.run(context); + }); + + const taskFetchActivity = createInvokeActivity('tab/fetch'); + adapter.send(taskFetchActivity) + .assertReply(activity => { + assert.strictEqual(activity.type, 'invokeResponse'); + assert.strictEqual(activity.value.status, 501); + assert.strictEqual(activity.value.body, undefined); + done(); + }) + .catch(err => done(err)); + }); + + it('handleTeamsTabSubmit is not overridden', done => { + const bot = new TeamsActivityHandler(); + + const adapter = new TestAdapter(async context => { + await bot.run(context); + }); + + const taskSubmitActivity = createInvokeActivity('tab/submit'); + adapter.send(taskSubmitActivity) + .assertReply(activity => { + assert.strictEqual(activity.type, 'invokeResponse'); + assert.strictEqual(activity.value.status, 501); + assert.strictEqual(activity.value.body, undefined); + done(); + }) + .catch(err => done(err)); + }); + it('handleTeamsAppBasedLinkQuery is not overridden', done => { const bot = new TeamsActivityHandler(); @@ -717,24 +753,38 @@ describe('TeamsActivityHandler', () => { constructor() { super(); // TaskModuleResponses with inner types of 'continue' and 'message'. - this.fetchReturn = { task: { type: 'continue', value: { title: 'test' } } }; - this.submitReturn = { task: { type: 'message', value: 'test' } }; + this.taskFetchReturn = { task: { type: 'continue', value: { title: 'test' } } }; + this.taskSubmitReturn = { task: { type: 'message', value: 'test' } }; + this.tabFetchReturn = { tab: { type: 'continue', value: { title: 'test' } } }; + this.tabSubmitReturn = { task: { type: 'message', value: 'test' } }; } async handleTeamsTaskModuleFetch(context, taskModuleRequest) { assert(context, 'context not found'); assert(taskModuleRequest, 'taskModuleRequest not found'); - return this.fetchReturn; + return this.taskFetchReturn; } async handleTeamsTaskModuleSubmit(context, taskModuleRequest) { assert(context, 'context not found'); assert(taskModuleRequest, 'taskModuleRequest not found'); - return this.submitReturn; + return this.taskSubmitReturn; + } + + async handleTeamsTabFetch(context, tabRequest) { + assert(context, 'context not found'); + assert(tabRequest, 'tabRequest not found'); + return this.tabFetchReturn; + } + + async handleTeamsTabSubmit(context, tabRequest) { + assert(context, 'context not found'); + assert(tabRequest, 'tabRequest not found'); + return this.tabSubmitReturn; } } - it('an overriden handleTeamsTaskModuleFetch()', done => { + it('an overridden handleTeamsTaskModuleFetch()', done => { const bot = new TaskHandler(); const adapter = new TestAdapter(async context => { @@ -747,13 +797,13 @@ describe('TeamsActivityHandler', () => { assert.strictEqual(activity.type, 'invokeResponse'); assert(activity.value, 'activity.value not found'); assert.strictEqual(activity.value.status, 200); - assert.strictEqual(activity.value.body, bot.fetchReturn); + assert.strictEqual(activity.value.body, bot.taskFetchReturn); done(); }) .catch(err => done(err)); }); - it('an overriden handleTeamsTaskModuleSubmit()', done => { + it('an overridden handleTeamsTaskModuleSubmit()', done => { const bot = new TaskHandler(); const adapter = new TestAdapter(async context => { @@ -766,7 +816,61 @@ describe('TeamsActivityHandler', () => { assert.strictEqual(activity.type, 'invokeResponse'); assert(activity.value, 'activity.value not found'); assert.strictEqual(activity.value.status, 200); - assert.strictEqual(activity.value.body, bot.submitReturn); + assert.strictEqual(activity.value.body, bot.taskSubmitReturn); + done(); + }) + .catch(err => done(err)); + }); + + it('an overridden handleTeamsTabFetch()', done => { + const bot = new TaskHandler(); + + const adapter = new TestAdapter(async context => { + await bot.run(context); + }); + + const tabFetchActivity = createInvokeActivity('tab/fetch', { + data: { + key: 'value', + type: 'tab /fetch', + }, + context: { + theme: 'default', + }, + }); + adapter.send(tabFetchActivity) + .assertReply(activity => { + assert.strictEqual(activity.type, 'invokeResponse'); + assert(activity.value, 'activity.value not found'); + assert.strictEqual(activity.value.status, 200); + assert.strictEqual(activity.value.body, bot.tabFetchReturn); + done(); + }) + .catch(err => done(err)); + }); + + it('an overridden handleTeamsTabSubmit()', done => { + const bot = new TaskHandler(); + + const adapter = new TestAdapter(async context => { + await bot.run(context); + }); + + const tabSubmitActivity = createInvokeActivity('tab/submit', { + data: { + key: 'value', + type: 'tab / submit', + }, + context: { + theme: 'default', + }, + }); + adapter.send(tabSubmitActivity) + .assertReply(activity => { + assert.strictEqual(activity.type, 'invokeResponse'); + assert(activity.value, 'activity.value not found'); + assert.strictEqual(activity.value.status, 200); + assert.strictEqual(activity.value.body, bot.tabSubmitReturn); done(); }) .catch(err => done(err)); From 4a5963dd1c1dbca6aed792f015f833142abf70fd Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Tue, 26 Jan 2021 15:02:26 -0800 Subject: [PATCH 04/10] minor changes --- .../schemas/TriggerConditions/Teams.OnTabFetch.schema | 9 +++++++++ .../schemas/TriggerConditions/Teams.OnTabSubmit.schema | 9 +++++++++ libraries/botframework-schema/src/teams/index.ts | 6 +++--- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabFetch.schema create mode 100644 libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabSubmit.schema diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabFetch.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabFetch.schema new file mode 100644 index 0000000000..e2b5381df1 --- /dev/null +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabFetch.schema @@ -0,0 +1,9 @@ +{ + "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", + "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], + "title": "On Teams Tab Fetch", + "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='tab/fetch'.", + "type": "object", + "required": [ + ] +} diff --git a/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabSubmit.schema b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabSubmit.schema new file mode 100644 index 0000000000..0e0efde1aa --- /dev/null +++ b/libraries/botbuilder-dialogs-adaptive-teams/schemas/TriggerConditions/Teams.OnTabSubmit.schema @@ -0,0 +1,9 @@ +{ + "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", + "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ], + "title": "On Teams Tab Submit", + "description": "Actions triggered when a Teams InvokeActivity is received with activity.name='tab/submit'.", + "type": "object", + "required": [ + ] +} diff --git a/libraries/botframework-schema/src/teams/index.ts b/libraries/botframework-schema/src/teams/index.ts index 6f1b80503c..cc157d97eb 100644 --- a/libraries/botframework-schema/src/teams/index.ts +++ b/libraries/botframework-schema/src/teams/index.ts @@ -1291,7 +1291,7 @@ export interface TabResponse { */ export interface TabResponseCard { /** - * @member {Record} [card] The adaptive card for this card tab response. + * @member {object} [card] The adaptive card for this card tab response. */ card?: Record; } @@ -1303,7 +1303,7 @@ export interface TabResponseCard { */ export interface TabResponseCards { /** - * @member {Record[]} [cards] Adaptive cards for this card tab response. + * @member {object[]} [cards] Adaptive cards for this card tab response. */ cards?: Record[]; } @@ -1372,7 +1372,7 @@ export interface TabSubmitData { */ export interface TabSuggestedActions { /** - * @member {Record[]} [actions] Actions to show in the card response. + * @member {object[]} [actions] Actions to show in the card response. */ actions?: Record[]; } From d72e46934e67d679d6ead342d9cf3a858ab3ccf4 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Tue, 26 Jan 2021 15:02:47 -0800 Subject: [PATCH 05/10] back out of nested tests folder --- .../tests/{tests => }/actionTests.test.ts | 0 .../actionTests/Action_GetMeetingParticipant.test.dialog | 0 .../Action_GetMeetingParticipantError.test.dialog} | 0 .../Action_GetMeetingParticipantErrorWithAdapter.test.dialog | 0 .../tests/{tests => }/actionTests/Action_GetMember.test.dialog | 0 .../{tests => }/actionTests/Action_GetMemberError.test.dialog | 0 .../actionTests/Action_GetMemberErrorWithAdapter.test.dialog | 0 .../{tests => }/actionTests/Action_GetPagedMembers.test.dialog | 0 .../actionTests/Action_GetPagedMembersError.test.dialog | 0 .../actionTests/Action_GetPagedTeamMembers.test.dialog | 0 .../actionTests/Action_GetPagedTeamMembersError.test.dialog | 0 .../{tests => }/actionTests/Action_GetTeamChannels.test.dialog | 0 .../actionTests/Action_GetTeamChannelsError.test.dialog | 0 .../{tests => }/actionTests/Action_GetTeamDetails.test.dialog | 0 .../actionTests/Action_GetTeamDetailsError.test.dialog | 0 .../{tests => }/actionTests/Action_GetTeamMember.test.dialog | 0 .../{tests => }/actionTests/Action_GetTeamMemberError.test.dialog | 0 .../actionTests/Action_GetTeamMemberErrorWithAdapter.test.dialog | 0 .../actionTests/Action_SendAppBasedLinkQueryResponse.test.dialog | 0 .../Action_SendAppBasedLinkQueryResponseError.test.dialog | 0 .../actionTests/Action_SendMessageToTeamsChannel.test.dialog | 0 .../actionTests/Action_SendMessageToTeamsChannelError.test.dialog | 0 .../Action_SendMessagingExtensionActionResponse.test.dialog | 0 .../Action_SendMessagingExtensionActionResponseError.test.dialog | 0 .../Action_SendMessagingExtensionAttachmentsResponse.test.dialog | 0 ...ion_SendMessagingExtensionAttachmentsResponseError.test.dialog | 0 .../Action_SendMessagingExtensionAuthResponse.test.dialog | 0 .../Action_SendMessagingExtensionAuthResponseError.test.dialog | 0 ...SendMessagingExtensionAuthResponseErrorWithAdapter.test.dialog | 0 ...on_SendMessagingExtensionBotMessagePreviewResponse.test.dialog | 0 ...ndMessagingExtensionBotMessagePreviewResponseError.test.dialog | 0 ...endMessagingExtensionConfigQuerySettingUrlResponse.test.dialog | 0 ...ssagingExtensionConfigQuerySettingUrlResponseError.test.dialog | 0 .../Action_SendMessagingExtensionMessageResponse.test.dialog | 0 .../Action_SendMessagingExtensionMessageResponseError.test.dialog | 0 .../Action_SendMessagingExtensionSelectItemResponse.test.dialog | 0 ...tion_SendMessagingExtensionSelectItemResponseError.test.dialog | 0 .../actionTests/Action_SendTaskModuleCardResponse.test.dialog | 0 .../Action_SendTaskModuleCardResponseError.test.dialog | 0 .../actionTests/Action_SendTaskModuleMessageResponse.test.dialog | 0 .../actionTests/Action_SendTaskModuleUrlResponse.test.dialog | 0 .../actionTests/Action_SendTaskModuleUrlResponseError.test.dialog | 0 .../tests/{tests => }/conditionalTests.test.ts | 0 .../ConditionalsTests_OnTeamsActivityTypes.test.dialog | 0 44 files changed, 0 insertions(+), 0 deletions(-) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests.test.ts (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetMeetingParticipant.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests/actionTests/Action_GetMeetingParticipanterror.test.dialog => actionTests/Action_GetMeetingParticipantError.test.dialog} (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetMeetingParticipantErrorWithAdapter.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetMember.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetMemberError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetMemberErrorWithAdapter.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetPagedMembers.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetPagedMembersError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetPagedTeamMembers.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetPagedTeamMembersError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamChannels.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamChannelsError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamDetails.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamDetailsError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamMember.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamMemberError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_GetTeamMemberErrorWithAdapter.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendAppBasedLinkQueryResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendAppBasedLinkQueryResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessageToTeamsChannel.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessageToTeamsChannelError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionActionResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionActionResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionAttachmentsResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionAttachmentsResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionAuthResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionAuthResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionAuthResponseErrorWithAdapter.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionMessageResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionMessageResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionSelectItemResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendMessagingExtensionSelectItemResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendTaskModuleCardResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendTaskModuleCardResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendTaskModuleMessageResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendTaskModuleUrlResponse.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/actionTests/Action_SendTaskModuleUrlResponseError.test.dialog (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/conditionalTests.test.ts (100%) rename libraries/botbuilder-dialogs-adaptive-teams/tests/{tests => }/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog (100%) diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests.test.ts b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests.test.ts rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMeetingParticipant.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMeetingParticipant.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMeetingParticipant.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMeetingParticipant.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMeetingParticipanterror.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMeetingParticipantError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMeetingParticipanterror.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMeetingParticipantError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMeetingParticipantErrorWithAdapter.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMeetingParticipantErrorWithAdapter.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMeetingParticipantErrorWithAdapter.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMeetingParticipantErrorWithAdapter.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMember.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMember.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMember.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMember.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMemberError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMemberError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMemberError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMemberError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMemberErrorWithAdapter.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMemberErrorWithAdapter.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetMemberErrorWithAdapter.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetMemberErrorWithAdapter.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedMembers.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedMembers.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedMembers.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedMembers.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedMembersError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedMembersError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedMembersError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedMembersError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedTeamMembers.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedTeamMembers.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedTeamMembers.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedTeamMembers.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedTeamMembersError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedTeamMembersError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetPagedTeamMembersError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetPagedTeamMembersError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamChannels.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamChannels.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamChannels.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamChannels.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamChannelsError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamChannelsError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamChannelsError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamChannelsError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamDetails.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamDetails.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamDetails.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamDetails.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamDetailsError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamDetailsError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamDetailsError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamDetailsError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamMember.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamMember.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamMember.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamMember.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamMemberError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamMemberError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamMemberError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamMemberError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamMemberErrorWithAdapter.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamMemberErrorWithAdapter.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_GetTeamMemberErrorWithAdapter.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_GetTeamMemberErrorWithAdapter.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendAppBasedLinkQueryResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendAppBasedLinkQueryResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendAppBasedLinkQueryResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendAppBasedLinkQueryResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendAppBasedLinkQueryResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendAppBasedLinkQueryResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendAppBasedLinkQueryResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendAppBasedLinkQueryResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessageToTeamsChannel.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessageToTeamsChannel.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessageToTeamsChannel.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessageToTeamsChannel.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessageToTeamsChannelError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessageToTeamsChannelError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessageToTeamsChannelError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessageToTeamsChannelError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionActionResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionActionResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionActionResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionActionResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionActionResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionActionResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionActionResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionActionResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAttachmentsResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAuthResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAuthResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAuthResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAuthResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAuthResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAuthResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAuthResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAuthResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAuthResponseErrorWithAdapter.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAuthResponseErrorWithAdapter.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionAuthResponseErrorWithAdapter.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionAuthResponseErrorWithAdapter.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionBotMessagePreviewResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionConfigQuerySettingUrlResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionMessageResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionMessageResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionMessageResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionMessageResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionMessageResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionMessageResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionMessageResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionMessageResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionSelectItemResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionSelectItemResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionSelectItemResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionSelectItemResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionSelectItemResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionSelectItemResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendMessagingExtensionSelectItemResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendMessagingExtensionSelectItemResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleCardResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleCardResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleCardResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleCardResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleCardResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleCardResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleCardResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleCardResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleMessageResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleMessageResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleMessageResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleMessageResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleUrlResponse.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleUrlResponse.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleUrlResponse.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleUrlResponse.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleUrlResponseError.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleUrlResponseError.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/actionTests/Action_SendTaskModuleUrlResponseError.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests/Action_SendTaskModuleUrlResponseError.test.dialog diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests.test.ts b/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests.test.ts rename to libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog b/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog similarity index 100% rename from libraries/botbuilder-dialogs-adaptive-teams/tests/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog rename to libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog From 07ba1ea22cdb949e0230102bcdc6441871d7fed5 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Tue, 26 Jan 2021 15:31:29 -0800 Subject: [PATCH 06/10] adjust JSDoc comments and typings --- libraries/botframework-schema/src/teams/index.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/botframework-schema/src/teams/index.ts b/libraries/botframework-schema/src/teams/index.ts index cc157d97eb..d59b624856 100644 --- a/libraries/botframework-schema/src/teams/index.ts +++ b/libraries/botframework-schema/src/teams/index.ts @@ -1291,7 +1291,7 @@ export interface TabResponse { */ export interface TabResponseCard { /** - * @member {object} [card] The adaptive card for this card tab response. + * @member {Record} [card] The adaptive card for this card tab response. */ card?: Record; } @@ -1303,7 +1303,7 @@ export interface TabResponseCard { */ export interface TabResponseCards { /** - * @member {object[]} [cards] Adaptive cards for this card tab response. + * @member {Record[]} [cards] Adaptive cards for this card tab response. */ cards?: Record[]; } @@ -1362,7 +1362,7 @@ export interface TabSubmitData { /** * @member {any} [any] Additional properties not otherwise defined in TabSubmit. */ - [properties: string]: any; + [properties: string]: unknown; } /** @@ -1372,7 +1372,7 @@ export interface TabSubmitData { */ export interface TabSuggestedActions { /** - * @member {object[]} [actions] Actions to show in the card response. + * @member {Record[]} [actions] Actions to show in the card response. */ actions?: Record[]; } @@ -1406,12 +1406,12 @@ export interface TaskModuleTaskInfo { * @member {any} [height] This can be a number, representing the task * module's height in pixels, or a string, one of: small, medium, large. */ - height?: any; + height?: unknown; /** * @member {any} [width] This can be a number, representing the task module's * width in pixels, or a string, one of: small, medium, large. */ - width?: any; + width?: unknown; /** * @member {string} [url] The URL of what is loaded as an iframe inside the * task module. One of url or card is required. From 657f02b8ccd0ef098d309a9f242354011bbe30ed Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Wed, 27 Jan 2021 09:48:03 -0800 Subject: [PATCH 07/10] PR review 1st pass changes --- .../src/actions/getMeetingParticipant.ts | 2 +- .../src/actions/getMember.ts | 2 +- .../src/actions/getPagedMembers.ts | 2 +- .../src/actions/getPagedTeamMembers.ts | 2 +- .../src/actions/getTeamChannels.ts | 2 +- .../src/actions/getTeamDetails.ts | 2 +- .../src/actions/getTeamMember.ts | 2 +- .../actions/sendAppBasedLinkQueryResponse.ts | 2 +- .../src/actions/sendMessageToTeamsChannel.ts | 2 +- .../sendMessagingExtensionActionResponse.ts | 2 +- ...ndMessagingExtensionAttachmentsResponse.ts | 2 +- .../sendMessagingExtensionAuthResponse.ts | 2 +- ...agingExtensionBotMessagePreviewResponse.ts | 2 +- ...gExtensionConfigQuerySettingUrlResponse.ts | 2 +- .../sendMessagingExtensionMessageResponse.ts | 2 +- ...endMessagingExtensionSelectItemResponse.ts | 2 +- .../src/actions/sendTaskModuleCardResponse.ts | 2 +- .../actions/sendTaskModuleMessageResponse.ts | 2 +- .../src/actions/sendTaskModuleUrlResponse.ts | 2 +- .../conditions/onTeamsAppBasedLinkQuery.ts | 2 +- .../src/conditions/onTeamsCardAction.ts | 2 +- .../src/conditions/onTeamsChannelCreated.ts | 2 +- .../src/conditions/onTeamsChannelDeleted.ts | 2 +- .../src/conditions/onTeamsChannelRenamed.ts | 2 +- .../src/conditions/onTeamsChannelRestored.ts | 2 +- .../src/conditions/onTeamsFileConsent.ts | 2 +- ...MessagingExtensionBotMessagePreviewEdit.ts | 2 +- ...MessagingExtensionBotMessagePreviewSend.ts | 2 +- ...eamsMessagingExtensionCardButtonClicked.ts | 2 +- ...ngExtensionConfigurationQuerySettingUrl.ts | 2 +- ...sMessagingExtensionConfigurationSetting.ts | 2 +- .../onTeamsMessagingExtensionFetchTask.ts | 2 +- .../onTeamsMessagingExtensionQuery.ts | 2 +- .../onTeamsMessagingExtensionSelectItem.ts | 2 +- .../onTeamsMessagingExtensionSubmitAction.ts | 2 +- .../onTeamsO365ConnectorCardAction.ts | 2 +- .../src/conditions/onTeamsTabFetch.ts | 2 +- .../src/conditions/onTeamsTabSubmit.ts | 2 +- .../src/conditions/onTeamsTaskModuleFetch.ts | 2 +- .../src/conditions/onTeamsTaskModuleSubmit.ts | 2 +- .../src/conditions/onTeamsTeamArchived.ts | 2 +- .../src/conditions/onTeamsTeamDeleted.ts | 2 +- .../src/conditions/onTeamsTeamHardDeleted.ts | 2 +- .../src/conditions/onTeamsTeamRenamed.ts | 2 +- .../src/conditions/onTeamsTeamRestored.ts | 2 +- .../src/conditions/onTeamsTeamUnarchived.ts | 2 +- .../tests/actionTests.test.ts | 8 +-- .../tests/conditionalTests.test.ts | 8 +-- .../tests/teamsActivityHandler.test.js | 50 ++++++++----------- .../botframework-schema/src/teams/index.ts | 16 ++++-- package.json | 7 +-- 51 files changed, 87 insertions(+), 94 deletions(-) diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMeetingParticipant.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMeetingParticipant.ts index 32ff916878..3e9f8c7c4b 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMeetingParticipant.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMeetingParticipant.ts @@ -39,7 +39,7 @@ export class GetMeetingParticipant extends Dialog implements GetMeetingParticipa /** * Class identifier. */ - public static $kind = 'Teams.GetMeetingParticipant'; + public static readonly $kind = 'Teams.GetMeetingParticipant'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMember.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMember.ts index 73506a5038..c7872a49fa 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMember.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getMember.ts @@ -37,7 +37,7 @@ export class GetMember extends Dialog implements GetMemberConfiguration { /** * Class identifier. */ - public static $kind = 'Teams.GetMember'; + public static readonly $kind = 'Teams.GetMember'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedMembers.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedMembers.ts index c0d2de12ef..35731eab15 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedMembers.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedMembers.ts @@ -41,7 +41,7 @@ export class GetPagedMembers extends Dialog implements GetPagedMembersConfigurat /** * Class identifier. */ - public static $kind = 'Teams.GetPagedMembers'; + public static readonly $kind = 'Teams.GetPagedMembers'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedTeamMembers.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedTeamMembers.ts index e5e22ff044..6f6e875e33 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedTeamMembers.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getPagedTeamMembers.ts @@ -42,7 +42,7 @@ export class GetPagedTeamMembers extends Dialog implements GetPagedTeamMembersCo /** * Class identifier. */ - public static $kind = 'Teams.GetPagedTeamMembers'; + public static readonly $kind = 'Teams.GetPagedTeamMembers'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamChannels.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamChannels.ts index cd63750bde..1b8836836b 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamChannels.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamChannels.ts @@ -39,7 +39,7 @@ export class GetTeamChannels extends Dialog implements GetTeamChannelsConfigurat /** * Class identifier. */ - public static $kind = 'Teams.GetTeamChannels'; + public static readonly $kind = 'Teams.GetTeamChannels'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamDetails.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamDetails.ts index 74ecca6e7e..e04af18ebb 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamDetails.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamDetails.ts @@ -37,7 +37,7 @@ export class GetTeamDetails extends Dialog implements GetTeamDetailsConfiguratio /** * Class identifier. */ - public static $kind = 'Teams.GetTeamDetails'; + public static readonly $kind = 'Teams.GetTeamDetails'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamMember.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamMember.ts index 4ad5a6c7d3..e646803177 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamMember.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/getTeamMember.ts @@ -39,7 +39,7 @@ export class GetTeamMember extends Dialog implements GetTeamMemberConfiguration /** * Class identifier. */ - public static $kind = 'Teams.GetTeamMember'; + public static readonly $kind = 'Teams.GetTeamMember'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendAppBasedLinkQueryResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendAppBasedLinkQueryResponse.ts index 7ddde0393b..9caddf63ba 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendAppBasedLinkQueryResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendAppBasedLinkQueryResponse.ts @@ -41,7 +41,7 @@ export class SendAppBasedLinkQueryResponse /** * Class identifier. */ - public static $kind = 'Teams.SendAppBasedLinkQueryResponse'; + public static readonly $kind = 'Teams.SendAppBasedLinkQueryResponse'; /** * Gets or sets template for the attachment template of a Thumbnail or Hero Card to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessageToTeamsChannel.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessageToTeamsChannel.ts index 5bd81e0cf9..9b320aae5f 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessageToTeamsChannel.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessageToTeamsChannel.ts @@ -43,7 +43,7 @@ export class SendMessageToTeamsChannel extends Dialog implements SendMessageToTe /** * Class identifier. */ - public static $kind = 'Teams.SendMessageToTeamsChannel'; + public static readonly $kind = 'Teams.SendMessageToTeamsChannel'; /** * Gets or sets an optional expression which if is true will disable this action. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionActionResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionActionResponse.ts index a2d9f5e228..8053af637a 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionActionResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionActionResponse.ts @@ -36,7 +36,7 @@ export class SendMessagingExtensionActionResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionActionResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionActionResponse'; /** * Gets or sets template for the attachment template of a Thumbnail or Hero Card to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAttachmentsResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAttachmentsResponse.ts index 46dce7f0c7..54d9db3296 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAttachmentsResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAttachmentsResponse.ts @@ -43,7 +43,7 @@ export class SendMessagingExtensionAttachmentsResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionAttachmentsResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionAttachmentsResponse'; /** * Gets or sets the Activity containing the Attachments to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAuthResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAuthResponse.ts index 03be9fcbd8..278cf64e53 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAuthResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionAuthResponse.ts @@ -64,7 +64,7 @@ export class SendMessagingExtensionAuthResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionAuthResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionAuthResponse'; /** * Gets or sets property path to put the value in. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionBotMessagePreviewResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionBotMessagePreviewResponse.ts index 4d208f2793..ecbbd01da3 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionBotMessagePreviewResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionBotMessagePreviewResponse.ts @@ -35,7 +35,7 @@ export class SendMessagingExtensionBotMessagePreviewResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionBotMessagePreviewResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionBotMessagePreviewResponse'; /** * Gets or sets template for the attachment template of a Thumbnail or Hero Card to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionConfigQuerySettingUrlResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionConfigQuerySettingUrlResponse.ts index 85f2ebc535..22bbe3edd1 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionConfigQuerySettingUrlResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionConfigQuerySettingUrlResponse.ts @@ -31,7 +31,7 @@ export class SendMessagingExtensionConfigQuerySettingUrlResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionConfigQuerySettingUrlResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionConfigQuerySettingUrlResponse'; /** * Gets or sets config url response to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionMessageResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionMessageResponse.ts index 656d5e09d4..4f348e3ea4 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionMessageResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionMessageResponse.ts @@ -31,7 +31,7 @@ export class SendMessagingExtensionMessageResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionMessageResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionMessageResponse'; /** * Gets or sets the template or text to use to generate the response message to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionSelectItemResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionSelectItemResponse.ts index e47f969bc2..5147f3b73c 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionSelectItemResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendMessagingExtensionSelectItemResponse.ts @@ -34,7 +34,7 @@ export class SendMessagingExtensionSelectItemResponse /** * Class identifier. */ - public static $kind = 'Teams.SendMessagingExtensionSelectItemResponse'; + public static readonly $kind = 'Teams.SendMessagingExtensionSelectItemResponse'; /** * Gets or sets template for the attachment template of a Thumbnail or Hero Card to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleCardResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleCardResponse.ts index 651573a19f..c34f66aad8 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleCardResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleCardResponse.ts @@ -35,7 +35,7 @@ export class SendTaskModuleCardResponse /** * Class identifier. */ - public static $kind = 'Teams.SendTaskModuleCardResponse'; + public static readonly $kind = 'Teams.SendTaskModuleCardResponse'; /** * Gets or sets template for the attachment template of a Thumbnail or Hero Card to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleMessageResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleMessageResponse.ts index c21a008ef1..c32e23c5f1 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleMessageResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleMessageResponse.ts @@ -33,7 +33,7 @@ export class SendTaskModuleMessageResponse /** * Class identifier. */ - public static $kind = 'Teams.SendTaskModuleMessageResponse'; + public static readonly $kind = 'Teams.SendTaskModuleMessageResponse'; /** * Gets or sets the template or text to use to generate the response message to send. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleUrlResponse.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleUrlResponse.ts index 179c35ebeb..face9ed9be 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleUrlResponse.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/actions/sendTaskModuleUrlResponse.ts @@ -33,7 +33,7 @@ export class SendTaskModuleUrlResponse /** * Class identifier. */ - public static $kind = 'Teams.SendTaskModuleUrlResponse'; + public static readonly $kind = 'Teams.SendTaskModuleUrlResponse'; /** * Gets or sets an optional expression for the Url of the Task Module response. diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsAppBasedLinkQuery.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsAppBasedLinkQuery.ts index 01431345a4..b5c8282ce3 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsAppBasedLinkQuery.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsAppBasedLinkQuery.ts @@ -14,7 +14,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name == 'composeExtension/queryLink'. */ export class OnTeamsAppBasedLinkQuery extends OnInvokeActivity { - public static $kind = 'Teams.OnAppBasedLinkQuery'; + public static readonly $kind = 'Teams.OnAppBasedLinkQuery'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsCardAction.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsCardAction.ts index 6b6c18f67b..5bc24b2405 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsCardAction.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsCardAction.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with no activity.name. */ export class OnTeamsCardAction extends OnInvokeActivity { - public static $kind = 'Teams.OnCardAction'; + public static readonly $kind = 'Teams.OnCardAction'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelCreated.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelCreated.ts index a83851db09..ddfa8208e2 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelCreated.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelCreated.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsChannelCreated extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnChannelCreated'; + public static readonly $kind = 'Teams.OnChannelCreated'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelDeleted.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelDeleted.ts index 30918b01d5..f48678e4e9 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelDeleted.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelDeleted.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsChannelDeleted extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnChannelDeleted'; + public static readonly $kind = 'Teams.OnChannelDeleted'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRenamed.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRenamed.ts index d396316ba9..2c77b9aafb 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRenamed.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRenamed.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsChannelRenamed extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnChannelRenamed'; + public static readonly $kind = 'Teams.OnChannelRenamed'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRestored.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRestored.ts index 09fa507bd0..603db65b4a 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRestored.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsChannelRestored.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsChannelRestored extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnChannelRestored'; + public static readonly $kind = 'Teams.OnChannelRestored'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsFileConsent.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsFileConsent.ts index 2dbc63d80e..a332bbba65 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsFileConsent.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsFileConsent.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name == 'fileConsent/invoke'. */ export class OnTeamsFileConsent extends OnInvokeActivity { - public static $kind = 'Teams.OnFileConsent'; + public static readonly $kind = 'Teams.OnFileConsent'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewEdit.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewEdit.ts index 83d928f9a4..bce0de069d 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewEdit.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewEdit.ts @@ -16,7 +16,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * and activity.value.botMessagePreviewAction == 'edit'. */ export class OnTeamsMessagingExtensionBotMessagePreviewEdit extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionBotMessagePreviewEdit'; + public static readonly $kind = 'Teams.OnMessagingExtensionBotMessagePreviewEdit'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewSend.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewSend.ts index 90f5c4a061..c254e09518 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewSend.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionBotMessagePreviewSend.ts @@ -16,7 +16,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * and activity.value.botMessagePreviewAction == 'send'. */ export class OnTeamsMessagingExtensionBotMessagePreviewSend extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionBotMessagePreviewEdit'; + public static readonly $kind = 'Teams.OnMessagingExtensionBotMessagePreviewEdit'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionCardButtonClicked.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionCardButtonClicked.ts index 80b398b67f..962c8839e4 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionCardButtonClicked.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionCardButtonClicked.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/onCardButtonClicked'. */ export class OnTeamsMessagingExtensionCardButtonClicked extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionCardButtonClicked'; + public static readonly $kind = 'Teams.OnMessagingExtensionCardButtonClicked'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationQuerySettingUrl.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationQuerySettingUrl.ts index 1f091f574c..1ac3547648 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationQuerySettingUrl.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationQuerySettingUrl.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/querySettingUrl'. */ export class OnTeamsMessagingExtensionConfigurationQuerySettingUrl extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionConfigurationQuerySettingUrl'; + public static readonly $kind = 'Teams.OnMessagingExtensionConfigurationQuerySettingUrl'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationSetting.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationSetting.ts index ac1e8e0b1b..3f17c20e09 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationSetting.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionConfigurationSetting.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/setting'. */ export class OnTeamsMessagingExtensionConfigurationSetting extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionConfigurationSetting'; + public static readonly $kind = 'Teams.OnMessagingExtensionConfigurationSetting'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionFetchTask.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionFetchTask.ts index ef9b3fd1ea..a5b667a7b4 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionFetchTask.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionFetchTask.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received when activity.name='composeExtension/fetchTask'. */ export class OnTeamsMessagingExtensionFetchTask extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionFetchTask'; + public static readonly $kind = 'Teams.OnMessagingExtensionFetchTask'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionQuery.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionQuery.ts index a08f5d0604..e2e2fead2e 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionQuery.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionQuery.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/query'. */ export class OnTeamsMessagingExtensionQuery extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionQuery'; + public static readonly $kind = 'Teams.OnMessagingExtensionQuery'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSelectItem.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSelectItem.ts index d936685ac0..9d0f808083 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSelectItem.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSelectItem.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/selectItem'. */ export class OnTeamsMessagingExtensionSelectItem extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionSelectItem'; + public static readonly $kind = 'Teams.OnMessagingExtensionSelectItem'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSubmitAction.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSubmitAction.ts index 9209dd0ffc..6e6ff9a1af 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSubmitAction.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsMessagingExtensionSubmitAction.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/submitAction'. */ export class OnTeamsMessagingExtensionSubmitAction extends OnInvokeActivity { - public static $kind = 'Teams.OnMessagingExtensionSubmitAction'; + public static readonly $kind = 'Teams.OnMessagingExtensionSubmitAction'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsO365ConnectorCardAction.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsO365ConnectorCardAction.ts index 34203d675d..03bdfc6799 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsO365ConnectorCardAction.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsO365ConnectorCardAction.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received for 'actionableMessage/executeAction'. */ export class OnTeamsO365ConnectorCardAction extends OnInvokeActivity { - public static $kind = 'Teams.OnO365ConnectorCardAction'; + public static readonly $kind = 'Teams.OnO365ConnectorCardAction'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts index 5a9b913575..ebe53dbd92 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabFetch.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='tab/fetch'. */ export class OnTeamsTabFetch extends OnInvokeActivity { - public static $kind = 'Teams.OnTabFetch'; + public static readonly $kind = 'Teams.OnTabFetch'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts index 76cba007ff..c0409c7418 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTabSubmit.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='tab/submit'. */ export class OnTeamsTabSubmit extends OnInvokeActivity { - public static $kind = 'Teams.OnTabSubmit'; + public static readonly $kind = 'Teams.OnTabSubmit'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleFetch.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleFetch.ts index b8fe441774..9a1f2456a7 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleFetch.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleFetch.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='task/fetch'. */ export class OnTeamsTaskModuleFetch extends OnInvokeActivity { - public static $kind = 'Teams.OnTaskModuleFetch'; + public static readonly $kind = 'Teams.OnTaskModuleFetch'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleSubmit.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleSubmit.ts index 0c61bc3d98..e3b2bf00c1 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleSubmit.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTaskModuleSubmit.ts @@ -15,7 +15,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive'; * Actions triggered when a Teams InvokeActivity is received with activity.name='task/submit'. */ export class OnTeamsTaskModuleSubmit extends OnInvokeActivity { - public static $kind = 'Teams.OnTaskModuleSubmit'; + public static readonly $kind = 'Teams.OnTaskModuleSubmit'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamArchived.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamArchived.ts index 6c973b6e09..8afc052934 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamArchived.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamArchived.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsTeamArchived extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnTeamArchived'; + public static readonly $kind = 'Teams.OnTeamArchived'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamDeleted.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamDeleted.ts index d151b6ac43..e3b3bdb882 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamDeleted.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamDeleted.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsTeamDeleted extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnTeamDeleted'; + public static readonly $kind = 'Teams.OnTeamDeleted'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamHardDeleted.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamHardDeleted.ts index 848901a73d..eaa31cd915 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamHardDeleted.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamHardDeleted.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsTeamHardDeleted extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnTeamHardDeleted'; + public static readonly $kind = 'Teams.OnTeamHardDeleted'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRenamed.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRenamed.ts index 5bb75587b8..e4ad16bafa 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRenamed.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRenamed.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsTeamRenamed extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnTeamRenamed'; + public static readonly $kind = 'Teams.OnTeamRenamed'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRestored.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRestored.ts index 5d0bab5b90..0f6adab040 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRestored.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamRestored.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsTeamRestored extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnTeamRestored'; + public static readonly $kind = 'Teams.OnTeamRestored'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamUnarchived.ts b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamUnarchived.ts index e7985accd8..907e60c499 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamUnarchived.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/src/conditions/onTeamsTeamUnarchived.ts @@ -16,7 +16,7 @@ import { OnConversationUpdateActivity } from 'botbuilder-dialogs-adaptive'; * Note: turn.activity.channelData.Teams has team data. */ export class OnTeamsTeamUnarchived extends OnConversationUpdateActivity { - public static $kind = 'Teams.OnTeamUnarchived'; + public static readonly $kind = 'Teams.OnTeamUnarchived'; public getExpression(parser: ExpressionParserInterface): Expression { return Expression.andExpression( diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts index a8ed1414ac..0e698da7a9 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts @@ -14,7 +14,7 @@ import { ConversationAccount, } from 'botbuilder'; import { ResourceExplorer } from 'botbuilder-dialogs-declarative'; -import { TeamsComponentRegistration } from '../../lib'; +import { TeamsComponentRegistration } from '../lib'; import { AdaptiveTestComponentRegistration, TestUtils } from 'botbuilder-dialogs-adaptive-testing'; import { AdaptiveComponentRegistration } from 'botbuilder-dialogs-adaptive'; import { ConnectorClient, MicrosoftAppCredentials } from 'botframework-connector'; @@ -122,11 +122,7 @@ describe('Actions', function () { ComponentRegistration.add(new AdaptiveComponentRegistration()); ComponentRegistration.add(new TeamsComponentRegistration()); - const resourceExplorer = new ResourceExplorer().addFolder( - path.join(__dirname, '../../tests/tests/actionTests'), - true, - false - ); + const resourceExplorer = new ResourceExplorer().addFolder(path.join(__dirname, './actionTests'), true, false); /** * Note: With mocha, `this.test?.title` refers to the test's name, so runTestScript diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts b/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts index 4dcbe93910..3cd67879ec 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts @@ -4,7 +4,7 @@ import 'mocha'; import { ComponentRegistration } from 'botbuilder'; import { ResourceExplorer } from 'botbuilder-dialogs-declarative'; -import { TeamsComponentRegistration } from '../../lib'; +import { TeamsComponentRegistration } from '../lib'; import path = require('path'); import { AdaptiveTestComponentRegistration, TestUtils } from 'botbuilder-dialogs-adaptive-testing'; import { AdaptiveComponentRegistration } from 'botbuilder-dialogs-adaptive'; @@ -14,11 +14,7 @@ describe('Conditional Tests', function () { ComponentRegistration.add(new AdaptiveComponentRegistration()); ComponentRegistration.add(new TeamsComponentRegistration()); - const resourceExplorer = new ResourceExplorer().addFolder( - path.join(__dirname, '../../tests/tests/conditionalTests'), - true, - false - ); + const resourceExplorer = new ResourceExplorer().addFolder(path.join(__dirname, './conditionalTests'), true, false); it('OnTeamsActivityTypes', async () => { await TestUtils.runTestScript(resourceExplorer, 'ConditionalsTests_OnTeamsActivityTypes'); diff --git a/libraries/botbuilder/tests/teamsActivityHandler.test.js b/libraries/botbuilder/tests/teamsActivityHandler.test.js index f3fe5659d4..22080bf93d 100644 --- a/libraries/botbuilder/tests/teamsActivityHandler.test.js +++ b/libraries/botbuilder/tests/teamsActivityHandler.test.js @@ -508,40 +508,36 @@ describe('TeamsActivityHandler', () => { .catch(err => done(err)); }); - it('handleTeamsTabFetch is not overridden', done => { + it('handleTeamsTabFetch is not overridden', async () => { const bot = new TeamsActivityHandler(); - const adapter = new TestAdapter(async context => { + const adapter = new TestAdapter(async (context) => { await bot.run(context); }); const taskFetchActivity = createInvokeActivity('tab/fetch'); - adapter.send(taskFetchActivity) - .assertReply(activity => { + await adapter.send(taskFetchActivity) + .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); assert.strictEqual(activity.value.status, 501); assert.strictEqual(activity.value.body, undefined); - done(); - }) - .catch(err => done(err)); + }); }); - it('handleTeamsTabSubmit is not overridden', done => { + it('handleTeamsTabSubmit is not overridden', async () => { const bot = new TeamsActivityHandler(); - const adapter = new TestAdapter(async context => { + const adapter = new TestAdapter(async (context) => { await bot.run(context); }); const taskSubmitActivity = createInvokeActivity('tab/submit'); - adapter.send(taskSubmitActivity) - .assertReply(activity => { + await adapter.send(taskSubmitActivity) + .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); assert.strictEqual(activity.value.status, 501); assert.strictEqual(activity.value.body, undefined); - done(); - }) - .catch(err => done(err)); + }); }); it('handleTeamsAppBasedLinkQuery is not overridden', done => { @@ -822,37 +818,35 @@ describe('TeamsActivityHandler', () => { .catch(err => done(err)); }); - it('an overridden handleTeamsTabFetch()', done => { + it('an overridden handleTeamsTabFetch()', async () => { const bot = new TaskHandler(); - const adapter = new TestAdapter(async context => { + const adapter = new TestAdapter(async (context) => { await bot.run(context); }); const tabFetchActivity = createInvokeActivity('tab/fetch', { data: { key: 'value', - type: 'tab /fetch', + type: 'tab / fetch', }, context: { theme: 'default', }, }); - adapter.send(tabFetchActivity) - .assertReply(activity => { + await adapter.send(tabFetchActivity) + .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); assert(activity.value, 'activity.value not found'); assert.strictEqual(activity.value.status, 200); assert.strictEqual(activity.value.body, bot.tabFetchReturn); - done(); - }) - .catch(err => done(err)); + }); }); - it('an overridden handleTeamsTabSubmit()', done => { + it('an overridden handleTeamsTabSubmit()', async () => { const bot = new TaskHandler(); - const adapter = new TestAdapter(async context => { + const adapter = new TestAdapter(async (context) => { await bot.run(context); }); @@ -865,15 +859,13 @@ describe('TeamsActivityHandler', () => { theme: 'default', }, }); - adapter.send(tabSubmitActivity) - .assertReply(activity => { + await adapter.send(tabSubmitActivity) + .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); assert(activity.value, 'activity.value not found'); assert.strictEqual(activity.value.status, 200); assert.strictEqual(activity.value.body, bot.tabSubmitReturn); - done(); - }) - .catch(err => done(err)); + }); }); }); }); diff --git a/libraries/botframework-schema/src/teams/index.ts b/libraries/botframework-schema/src/teams/index.ts index d59b624856..91f8df66fd 100644 --- a/libraries/botframework-schema/src/teams/index.ts +++ b/libraries/botframework-schema/src/teams/index.ts @@ -1390,6 +1390,14 @@ export interface TaskModuleCardResponse extends TaskModuleResponseBase { value?: string; } +/** + * A string, representing the task module's height in pixels, one of: small, medium, large. + * + * @readonly + * @enum {string} + */ +export type TeamsTaskModuleSize = 'small' | 'medium' | 'large'; + /** * @interface * An interface representing TaskModuleTaskInfo. @@ -1403,15 +1411,15 @@ export interface TaskModuleTaskInfo { */ title?: string; /** - * @member {any} [height] This can be a number, representing the task + * @member {number | TeamsTaskModuleSize} [height] This can be a number, representing the task * module's height in pixels, or a string, one of: small, medium, large. */ - height?: unknown; + height?: number | TeamsTaskModuleSize; /** - * @member {any} [width] This can be a number, representing the task module's + * @member {number | TeamsTaskModuleSize} [width] This can be a number, representing the task module's * width in pixels, or a string, one of: small, medium, large. */ - width?: unknown; + width?: number | TeamsTaskModuleSize; /** * @member {string} [url] The URL of what is loaded as an iframe inside the * task module. One of url or card is required. diff --git a/package.json b/package.json index 40d0ba17de..d1dffdea83 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,12 @@ "lint": "yarn execute --parallel --script lint --scriptArgs=--quiet", "lint:fix": "yarn lint --scriptArgs=--fix", "package": "yarn execute --coordinated --no-private yarn pack", - "test": "npm-run-all build test:mocha", + "test": "npm-run-all build test:mocha test:temp:teams", "test:compat": "yarn execute --coordinated --script test:compat", "test:consumer": "yarn workspace consumer-test test", - "test:devops": "npm-run-all test:mocha:junit test:nyc:cobertura", - "test:github": "npm-run-all test:mocha test:nyc:lcov", + "test:devops": "npm-run-all test:mocha:junit test:nyc:cobertura test:temp:teams", + "test:github": "npm-run-all test:mocha test:nyc:lcov test:temp:teams", + "test:temp:teams": "yarn workspace botbuilder-dialogs-adaptive-teams test", "test:mocha": "nyc mocha \"libraries/@(adaptive*|bot*)/tests/**/*.test.js\" --exit --check-leaks", "test:mocha:junit": "yarn test:mocha --reporter mocha-junit-reporter --reporter-options includePending=true", "test:nyc:cobertura": "nyc report --reporter=cobertura", From 7dc42caec98d07e91043c688d782658ef81f204c Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Wed, 27 Jan 2021 10:37:56 -0800 Subject: [PATCH 08/10] minor test adjustments --- .../tests/actionTests.test.ts | 2 +- .../tests/conditionalTests.test.ts | 2 +- .../tests/teamsActivityHandler.test.js | 48 ++++++++++++------- package.json | 4 +- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts index 0e698da7a9..821b52f4e4 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/tests/actionTests.test.ts @@ -122,7 +122,7 @@ describe('Actions', function () { ComponentRegistration.add(new AdaptiveComponentRegistration()); ComponentRegistration.add(new TeamsComponentRegistration()); - const resourceExplorer = new ResourceExplorer().addFolder(path.join(__dirname, './actionTests'), true, false); + const resourceExplorer = new ResourceExplorer().addFolder(path.join(__dirname, 'actionTests'), true, false); /** * Note: With mocha, `this.test?.title` refers to the test's name, so runTestScript diff --git a/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts b/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts index 3cd67879ec..a569afb339 100644 --- a/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts +++ b/libraries/botbuilder-dialogs-adaptive-teams/tests/conditionalTests.test.ts @@ -14,7 +14,7 @@ describe('Conditional Tests', function () { ComponentRegistration.add(new AdaptiveComponentRegistration()); ComponentRegistration.add(new TeamsComponentRegistration()); - const resourceExplorer = new ResourceExplorer().addFolder(path.join(__dirname, './conditionalTests'), true, false); + const resourceExplorer = new ResourceExplorer().addFolder(path.join(__dirname, 'conditionalTests'), true, false); it('OnTeamsActivityTypes', async () => { await TestUtils.runTestScript(resourceExplorer, 'ConditionalsTests_OnTeamsActivityTypes'); diff --git a/libraries/botbuilder/tests/teamsActivityHandler.test.js b/libraries/botbuilder/tests/teamsActivityHandler.test.js index 22080bf93d..52f4681582 100644 --- a/libraries/botbuilder/tests/teamsActivityHandler.test.js +++ b/libraries/botbuilder/tests/teamsActivityHandler.test.js @@ -516,12 +516,15 @@ describe('TeamsActivityHandler', () => { }); const taskFetchActivity = createInvokeActivity('tab/fetch'); - await adapter.send(taskFetchActivity) + await adapter + .send(taskFetchActivity) .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); - assert.strictEqual(activity.value.status, 501); - assert.strictEqual(activity.value.body, undefined); - }); + assert.deepStrictEqual(activity.value, { + status: 501, + }); + }) + .startTest(); }); it('handleTeamsTabSubmit is not overridden', async () => { @@ -532,12 +535,15 @@ describe('TeamsActivityHandler', () => { }); const taskSubmitActivity = createInvokeActivity('tab/submit'); - await adapter.send(taskSubmitActivity) + await adapter + .send(taskSubmitActivity) .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); - assert.strictEqual(activity.value.status, 501); - assert.strictEqual(activity.value.body, undefined); - }); + assert.deepStrictEqual(activity.value, { + status: 501, + }); + }) + .startTest(); }); it('handleTeamsAppBasedLinkQuery is not overridden', done => { @@ -834,13 +840,16 @@ describe('TeamsActivityHandler', () => { theme: 'default', }, }); - await adapter.send(tabFetchActivity) + await adapter + .send(tabFetchActivity) .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); - assert(activity.value, 'activity.value not found'); - assert.strictEqual(activity.value.status, 200); - assert.strictEqual(activity.value.body, bot.tabFetchReturn); - }); + assert.deepStrictEqual(activity.value, { + status: 200, + body: bot.tabFetchReturn, + }); + }) + .startTest(); }); it('an overridden handleTeamsTabSubmit()', async () => { @@ -859,13 +868,16 @@ describe('TeamsActivityHandler', () => { theme: 'default', }, }); - await adapter.send(tabSubmitActivity) + await adapter + .send(tabSubmitActivity) .assertReply((activity) => { assert.strictEqual(activity.type, 'invokeResponse'); - assert(activity.value, 'activity.value not found'); - assert.strictEqual(activity.value.status, 200); - assert.strictEqual(activity.value.body, bot.tabSubmitReturn); - }); + assert.deepStrictEqual(activity.value, { + status: 200, + body: bot.tabSubmitReturn, + }); + }) + .startTest(); }); }); }); diff --git a/package.json b/package.json index 1d39c81d5d..1adee30923 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "test": "npm-run-all build test:mocha test:temp:teams", "test:compat": "yarn execute --coordinated --script test:compat", "test:consumer": "yarn workspace consumer-test test", - "test:devops": "npm-run-all test:mocha:junit test:nyc:cobertura test:temp:teams", - "test:github": "npm-run-all test:mocha test:nyc:lcov test:temp:teams", + "test:devops": "npm-run-all test:temp:teams test:mocha:junit test:nyc:cobertura", + "test:github": "npm-run-all test:mocha test:temp:teams test:nyc:lcov", "test:temp:teams": "yarn workspace botbuilder-dialogs-adaptive-teams test", "test:mocha": "nyc mocha \"libraries/@(adaptive*|bot*)/tests/**/*.test.js\" --exit --check-leaks", "test:mocha:junit": "yarn test:mocha --reporter mocha-junit-reporter --reporter-options includePending=true", From c5e1c68ebf2ed7ef34ae6396ed28f7aa5abf6246 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Wed, 27 Jan 2021 13:39:06 -0800 Subject: [PATCH 09/10] interface adjustments --- libraries/botframework-schema/src/teams/index.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/botframework-schema/src/teams/index.ts b/libraries/botframework-schema/src/teams/index.ts index 91f8df66fd..357dfbfefe 100644 --- a/libraries/botframework-schema/src/teams/index.ts +++ b/libraries/botframework-schema/src/teams/index.ts @@ -1281,7 +1281,7 @@ export interface TabResponse { /** * @member {TabResponsePayload} [tab] The response to the tab/fetch message. */ - tab?: TabResponsePayload; + tab: TabResponsePayload; } /** @@ -1293,7 +1293,7 @@ export interface TabResponseCard { /** * @member {Record} [card] The adaptive card for this card tab response. */ - card?: Record; + card: Record; } /** @@ -1303,9 +1303,9 @@ export interface TabResponseCard { */ export interface TabResponseCards { /** - * @member {Record[]} [cards] Adaptive cards for this card tab response. + * @member {TabResponseCard[]} [cards] Adaptive cards for this card tab response. */ - cards?: Record[]; + cards: TabResponseCard[]; } /** @@ -1372,9 +1372,9 @@ export interface TabSubmitData { */ export interface TabSuggestedActions { /** - * @member {Record[]} [actions] Actions to show in the card response. + * @member {CardAction[]} [actions] Actions to show in the card response. */ - actions?: Record[]; + actions: CardAction[]; } /** From a5253a1df07893643c842fc3388f46a76837b6c1 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Fri, 29 Jan 2021 12:33:05 -0800 Subject: [PATCH 10/10] revert additional interface --- libraries/botframework-schema/src/teams/index.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libraries/botframework-schema/src/teams/index.ts b/libraries/botframework-schema/src/teams/index.ts index 357dfbfefe..29447a6c2b 100644 --- a/libraries/botframework-schema/src/teams/index.ts +++ b/libraries/botframework-schema/src/teams/index.ts @@ -1390,14 +1390,6 @@ export interface TaskModuleCardResponse extends TaskModuleResponseBase { value?: string; } -/** - * A string, representing the task module's height in pixels, one of: small, medium, large. - * - * @readonly - * @enum {string} - */ -export type TeamsTaskModuleSize = 'small' | 'medium' | 'large'; - /** * @interface * An interface representing TaskModuleTaskInfo. @@ -1411,15 +1403,15 @@ export interface TaskModuleTaskInfo { */ title?: string; /** - * @member {number | TeamsTaskModuleSize} [height] This can be a number, representing the task + * @member {number | 'small' | 'medium' | 'large'} [height] This can be a number, representing the task * module's height in pixels, or a string, one of: small, medium, large. */ - height?: number | TeamsTaskModuleSize; + height?: number | 'small' | 'medium' | 'large'; /** * @member {number | TeamsTaskModuleSize} [width] This can be a number, representing the task module's * width in pixels, or a string, one of: small, medium, large. */ - width?: number | TeamsTaskModuleSize; + width?: number | 'small' | 'medium' | 'large'; /** * @member {string} [url] The URL of what is loaded as an iframe inside the * task module. One of url or card is required.