Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Teams Types #1789

Merged
merged 7 commits into from
Feb 27, 2020
Merged

Updating Teams Types #1789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9998a71
fixes #1398
Virtual-Josh Feb 25, 2020
1d551ef
Merge branch 'master' into josh/typeUpdate
Virtual-Josh Feb 25, 2020
1fb0a12
adding type
Virtual-Josh Feb 25, 2020
aa4703d
Merge branch 'josh/typeUpdate' of https://github.com/microsoft/botbui…
Virtual-Josh Feb 25, 2020
284fb4a
updating documentation
Virtual-Josh Feb 25, 2020
01bf29b
updating typing references
Virtual-Josh Feb 25, 2020
32b6275
Merge branch 'master' into josh/typeUpdate
Stevenic Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/botframework-schema/src/teams/extension/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export interface O365ConnectorCardActionBase {
}

/**
* Defines values for Type1.
* Defines values for O365ConnectorCardInputType.
* Possible values include: 'textInput', 'dateInput', 'multichoiceInput'
* @readonly
* @enum {string}
Expand All @@ -71,7 +71,7 @@ export type O365ConnectorCardInputType = 'textInput' | 'dateInput' | 'multichoic
*/
export interface O365ConnectorCardInputBase {
/**
* @member {Type1} [type] Input type name. Possible values include:
* @member {O365ConnectorCardInputBaseType} [type] Input type name. Possible values include:
* 'textInput', 'dateInput', 'multichoiceInput'
*/
'@type'?: O365ConnectorCardInputType;
Expand Down
42 changes: 29 additions & 13 deletions libraries/botframework-schema/src/teams/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ export interface MessagingExtensionAction extends TaskModuleRequest {
* @member {BotMessagePreviewAction} [botMessagePreviewAction] Bot message
* preview action taken by user. Possible values include: 'edit', 'send'
*/
botMessagePreviewAction?: BotMessagePreviewAction;
botMessagePreviewAction?: BotMessagePreviewActionType;
/**
* @member {Activity[]} [botActivityPreview]
*/
Expand All @@ -872,10 +872,10 @@ export interface MessagingExtensionAction extends TaskModuleRequest {
*/
export interface TaskModuleResponseBase {
/**
* @member {Type2} [type] Choice of action options when responding to the
* @member {BotMessagePreviewActionType} [type] Choice of action options when responding to the
* task/submit message. Possible values include: 'message', 'continue'
*/
type?: Type2;
type?: BotMessagePreviewActionType;
}

/**
Expand Down Expand Up @@ -918,10 +918,10 @@ export interface MessagingExtensionResult {
*/
attachmentLayout?: AttachmentLayout;
/**
* @member {Type3} [type] The type of the result. Possible values include:
* @member {MessagingExtensionResultType} [type] The type of the result. Possible values include:
* 'result', 'auth', 'config', 'message', 'botMessagePreview'
*/
type?: Type3;
type?: MessagingExtensionResultType;
/**
* @member {MessagingExtensionAttachment[]} [attachments] (Only when type is
* result) Attachments
Expand Down Expand Up @@ -1241,12 +1241,17 @@ export type ActivityImageType = 'avatar' | 'article';
export type Os = 'default' | 'iOS' | 'android' | 'windows';

/**
* Defines values for Type1.
* Defines values for O365ConnectorCardInputBaseType.
* Possible values include: 'textInput', 'dateInput', 'multichoiceInput'
* @readonly
* @enum {string}
*/
export type Type1 = 'textInput' | 'dateInput' | 'multichoiceInput';
export type O365ConnectorCardInputBaseType = 'textInput' | 'dateInput' | 'multichoiceInput';

/**
* @deprecated Use O365ConnectorCardInputBaseType instead.
*/
export type Type1 = O365ConnectorCardInputBaseType;

/**
* Defines values for Style.
Expand Down Expand Up @@ -1321,20 +1326,26 @@ export type Importance = 'normal' | 'high' | 'urgent';
export type CommandContext = 'message' | 'compose' | 'commandbox';

/**
* Defines values for BotMessagePreviewAction.
* Defines values for BotMessagePreviewActionType.
* Possible values include: 'edit', 'send'
* @readonly
* @enum {string}
*/
export type BotMessagePreviewAction = 'edit' | 'send';
export type BotMessagePreviewActionType = 'edit' | 'send';

/**
* Defines values for Type2.
* Defines values for BotMessagePreviewType.
* Possible values include: 'message', 'continue'
* @readonly
* @enum {string}
*/
export type Type2 = 'message' | 'continue';
export type BotMessagePreviewType = 'message' | 'continue';


/**
* @deprecated Use BotMessagePreviewType
*/
export type Type2 = BotMessagePreviewActionType

/**
* Defines values for AttachmentLayout.
Expand All @@ -1345,13 +1356,18 @@ export type Type2 = 'message' | 'continue';
export type AttachmentLayout = 'list' | 'grid';

/**
* Defines values for Type3.
* Defines values for MessagingExtensionResultType.
* Possible values include: 'result', 'auth', 'config', 'message', 'botMessagePreview'
* @readonly
* @enum {string}
*/
export type Type3 = 'result' | 'auth' | 'config' | 'message' | 'botMessagePreview';
export type MessagingExtensionResultType = 'result' | 'auth' | 'config' | 'message' | 'botMessagePreview';


/**
* @deprecated Use MessagingExtensionResultType instead
*/
export type Type3 = MessagingExtensionResultType
/**
* Defines values for Action.
* Possible values include: 'accept', 'decline'
Expand Down