Skip to content

Commit

Permalink
addressing comments/error handling/stylecop issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanshika Sinha committed Apr 22, 2021
1 parent 0b9b6d2 commit 410c06f
Show file tree
Hide file tree
Showing 7 changed files with 1,128 additions and 95 deletions.
1,021 changes: 1,021 additions & 0 deletions packages/.vs/Microsoft.Bot.Components/config/applicationhost.config

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

namespace Microsoft.Bot.Components.Telephony.Actions
{
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using AdaptiveExpressions.Properties;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs;
using Newtonsoft.Json;

/// <summary>
/// Transfers call to given phone number.
/// </summary>
public class CallTransfer : Dialog
{
/// <summary>
/// Class identifier.
/// </summary>
[JsonProperty("$kind")]
public const string Kind = "Microsoft.Telephony.CallTransfer";

/// <summary>
/// Initializes a new instance of the <see cref="CallTransfer"/> class.
/// </summary>
/// <param name="sourceFilePath">Optional, source file full path.</param>
/// <param name="sourceLineNumber">Optional, line number in source file.</param>
[JsonConstructor]
public CallTransfer([CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
: base()
{
// enable instances of this command as debug break point
this.RegisterSourceLocation(sourceFilePath, sourceLineNumber);
}

/// <summary>
/// Gets or sets the phone number to be included when sending the handoff activity.
/// </summary>
/// <value>
/// <see cref="StringExpression"/>.
/// </value>
[JsonProperty("phoneNumber")]
public StringExpression PhoneNumber { get; set; }

/// <summary>
/// Called when the dialog is started and pushed onto the dialog stack.
/// </summary>
/// <param name="dc">The <see cref="DialogContext"/> for the current turn of conversation.</param>
/// <param name="options">Optional, initial information to pass to the dialog.</param>
/// <param name="cancellationToken">A cancellation token that can be used by other objects
/// or threads to receive notice of cancellation.</param>
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public async override Task<DialogTurnResult> BeginDialogAsync(DialogContext dc, object options = null, CancellationToken cancellationToken = default(CancellationToken))
{
var phoneNumber = this.PhoneNumber?.GetValue(dc.State);

// Create handoff event, passing the phone number to transfer to as context.
var context = new { TargetPhoneNumber = phoneNumber };
var handoffEvent = EventFactory.CreateHandoffInitiation(dc.Context, context);
await dc.Context.SendActivityAsync(handoffEvent, cancellationToken).ConfigureAwait(false);
return await dc.EndDialogAsync(result: null, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version Condition=" '$(PreviewPackageVersion)' == '' ">$(LocalPackageVersion)</Version>
<Version Condition=" '$(PreviewPackageVersion)' != '' ">$(PreviewPackageVersion)</Version>
<PackageVersion Condition=" '$(PreviewPackageVersion)' == '' ">$(LocalPackageVersion)</PackageVersion>
<PackageVersion Condition=" '$(PreviewPackageVersion)' != '' ">$(PreviewPackageVersion)</PackageVersion>
<Configurations>Debug;Release</Configurations>
<DocumentationFile>bin\$(Configuration)\netstandard2.0\Microsoft.Bot.Builder.Dialogs.Adaptive.xml</DocumentationFile>
<OutputType>Library</OutputType>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Microsoft.Bot.Components.Telephony</PackageId>
<Description>This library implements .NET support for adaptive dialogs with Telephony</Description>
<Summary>This library implements .NET support for adaptive dialogs with Microsoft Telephony</Summary>
<VersionPrefix>1.0.0-preview</VersionPrefix>
<Description>This library implements .NET support for adaptive dialogs with Telephony.</Description>
<Summary>This library implements .NET support for adaptive dialogs with Telephony.</Summary>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<DelaySign>true</DelaySign>
<ContentTargetFolders>content</ContentTargetFolders>
<PackageTags>msbot-action;msbot-trigger;msbot-component</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>Full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.13.0" />

<PropertyGroup>
<!-- These documentation warnings excludes should be removed as part of https:/microsoft/botbuilder-dotnet/issues/4052 -->
<NoWarn>$(NoWarn);CS1591</NoWarn>
<Version>1.0.0-preview</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Content Include="**/*.dialog" />
Expand All @@ -39,12 +34,10 @@
<Content Include="**/*.qna" />
</ItemGroup>

<ItemGroup>
<None Remove="Schemas\CallTransferDialog.schema" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.13.0-rc4" />
</ItemGroup>

<PropertyGroup>
<!-- Disable warning for SA0001 "XML comment analysis is disabled due to project configuration" which is not true -->
<!-- Disable warning for SA1649 "file name should match first type name" due to use of generics -->
<NoWarn>$(NoWarn),SA0001,SA1649</NoWarn>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
"title": "Call Transfer",
"description": "Phone number to transfer the call to (in E.164 format such as +1425123456)",
"type": "object",
"required": [
"phoneNumber"
],
"additionalProperties": false,
"properties": {
"targetPhoneNumber": {
"phoneNumber": {
"$ref": "schema:#/definitions/stringExpression",
"title": "Target Phone Number",
"description": "Phone number to transfer the call to",
"title": "Phone Number",
"description": "Phone number to transfer the call to.",
"examples": [
"in E.164 format such as +1425123456"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"label": "Transfer a call",
"subtitle": "Call Transfer",
"order": [
"targetPhoneNumber",
"phoneNumber",
"*"
],
"properties": {
"targetPhoneNumber": {
"phoneNumber": {
"intellisenseScopes": [
"variable-scopes"
]
Expand All @@ -21,6 +21,6 @@
},
"flow": {
"widget": "ActionCard",
"body": "=action.targetPhoneNumber"
"body": "=action.phoneNumber"
}
}
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Bot.Components.Telephony.Actions;
using Microsoft.Bot.Builder.Dialogs.Declarative;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Bot.Builder;

namespace Microsoft.Bot.Components.Telephony
{
public class TeamsBotComponent : BotComponent
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs.Declarative;
using Microsoft.Bot.Components.Telephony.Actions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

/// <summary>
/// Telephony actions registration.
/// </summary>
public class TelephonyBotComponent : BotComponent
{
/// <inheritdoc/>
public override void ConfigureServices(IServiceCollection services, IConfiguration configuration)
{
// Conditionals
services.AddSingleton<DeclarativeType>(sp => new DeclarativeType<CallTransferDialog>(CallTransferDialog.Kind));
services.AddSingleton<DeclarativeType>(sp => new DeclarativeType<CallTransfer>(CallTransfer.Kind));
}
}
}

0 comments on commit 410c06f

Please sign in to comment.