From e4208f09ab2ab70d462f3c30c728b8865310857f Mon Sep 17 00:00:00 2001 From: Pooja Nagpal Date: Fri, 25 Jun 2021 17:56:58 -0700 Subject: [PATCH] Update recording labels per UX feedback --- .../Schemas/Microsoft.Telephony.PauseRecording.schema | 7 ++++++- .../Schemas/Microsoft.Telephony.PauseRecording.uischema | 6 +++--- .../Schemas/Microsoft.Telephony.ResumeRecording.schema | 7 ++++++- .../Schemas/Microsoft.Telephony.ResumeRecording.uischema | 6 +++--- .../Schemas/Microsoft.Telephony.StartRecording.schema | 7 ++++++- .../Schemas/Microsoft.Telephony.StartRecording.uischema | 6 +++--- ...ppyPath.test.dialog => Recording_HappyPath.test.dialog} | 0 ... => Recording_IgnoredInNonTelephonyChannel.test.dialog} | 0 .../Microsoft.Bot.Components.Telephony.Tests.csproj | 4 ++-- .../RecordingTests.cs | 4 ++-- 10 files changed, 31 insertions(+), 16 deletions(-) rename tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/{StartRecording_HappyPath.test.dialog => Recording_HappyPath.test.dialog} (100%) rename tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/{StartRecording_IgnoredInNonTelephonyChannel.test.dialog => Recording_IgnoredInNonTelephonyChannel.test.dialog} (100%) diff --git a/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.schema b/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.schema index a93c81aa9b..be93806974 100644 --- a/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.schema +++ b/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.schema @@ -1,10 +1,15 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": "implements(Microsoft.IDialog)", - "title": "Pause Recording", + "title": "Recording Pause", "description": "Pauses recording the current conversation.", "type": "object", "additionalProperties": false, "properties": { + "allowInterruptions": { + "$ref": "schema:#/definitions/booleanExpression", + "title": "Allow Interruptions", + "description": "Allow the dialog to continue when recording pause operation is in progress" + } } } diff --git a/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.uischema b/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.uischema index 6faeb3b7fc..c4d872b250 100644 --- a/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.uischema +++ b/packages/Telephony/Schemas/Microsoft.Telephony.PauseRecording.uischema @@ -1,8 +1,8 @@ { "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema", "form": { - "label": "Pause Recording", - "subtitle": "Pause Recording", + "label": "Recording Pause", + "subtitle": "Recording Pause", "order": [ "*" ], @@ -10,7 +10,7 @@ } }, "menu": { - "label": "Pause Recording", + "label": "Recording Pause", "submenu": [ "Telephony" ] } } \ No newline at end of file diff --git a/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.schema b/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.schema index 18000aa6ae..353070899f 100644 --- a/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.schema +++ b/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.schema @@ -1,10 +1,15 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": "implements(Microsoft.IDialog)", - "title": "Resume Recording", + "title": "Recording Resume", "description": "Resumes recording the current conversation.", "type": "object", "additionalProperties": false, "properties": { + "allowInterruptions": { + "$ref": "schema:#/definitions/booleanExpression", + "title": "Allow Interruptions", + "description": "Allow the dialog to continue when recording resume operation is in progress" + } } } diff --git a/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.uischema b/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.uischema index 4be04f0383..08b3c68cf1 100644 --- a/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.uischema +++ b/packages/Telephony/Schemas/Microsoft.Telephony.ResumeRecording.uischema @@ -1,8 +1,8 @@ { "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema", "form": { - "label": "Resume Recording", - "subtitle": "Resume Recording", + "label": "Recording Resume", + "subtitle": "Recording Resume", "order": [ "*" ], @@ -10,7 +10,7 @@ } }, "menu": { - "label": "Resume Recording", + "label": "Recording Resume", "submenu": [ "Telephony" ] } } \ No newline at end of file diff --git a/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.schema b/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.schema index 81c0a97547..bc1f0d2af9 100644 --- a/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.schema +++ b/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.schema @@ -1,10 +1,15 @@ { "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema", "$role": "implements(Microsoft.IDialog)", - "title": "Start Recording", + "title": "Recording Start", "description": "Starts recording the current conversation.", "type": "object", "additionalProperties": false, "properties": { + "allowInterruptions": { + "$ref": "schema:#/definitions/booleanExpression", + "title": "Allow Interruptions", + "description": "Allow the dialog to continue when recording start operation is in progress" + } } } diff --git a/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.uischema b/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.uischema index b945204c57..7b40c9fff0 100644 --- a/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.uischema +++ b/packages/Telephony/Schemas/Microsoft.Telephony.StartRecording.uischema @@ -1,8 +1,8 @@ { "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema", "form": { - "label": "Start Recording", - "subtitle": "Start Recording", + "label": "Recording Start", + "subtitle": "Recording Start", "order": [ "*" ], @@ -10,7 +10,7 @@ } }, "menu": { - "label": "Start Recording", + "label": "Recording Start", "submenu": [ "Telephony" ] } } \ No newline at end of file diff --git a/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/StartRecording_HappyPath.test.dialog b/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/Recording_HappyPath.test.dialog similarity index 100% rename from tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/StartRecording_HappyPath.test.dialog rename to tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/Recording_HappyPath.test.dialog diff --git a/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/StartRecording_IgnoredInNonTelephonyChannel.test.dialog b/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/Recording_IgnoredInNonTelephonyChannel.test.dialog similarity index 100% rename from tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/StartRecording_IgnoredInNonTelephonyChannel.test.dialog rename to tests/packages/Microsoft.Bot.Components.Telephony.Tests/Integration/RecordingTests/Recording_IgnoredInNonTelephonyChannel.test.dialog diff --git a/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Microsoft.Bot.Components.Telephony.Tests.csproj b/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Microsoft.Bot.Components.Telephony.Tests.csproj index 4b01335bc8..99493d43ed 100644 --- a/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Microsoft.Bot.Components.Telephony.Tests.csproj +++ b/tests/packages/Microsoft.Bot.Components.Telephony.Tests/Microsoft.Bot.Components.Telephony.Tests.csproj @@ -48,10 +48,10 @@ Always - + Always - + Always diff --git a/tests/packages/Microsoft.Bot.Components.Telephony.Tests/RecordingTests.cs b/tests/packages/Microsoft.Bot.Components.Telephony.Tests/RecordingTests.cs index 290035a0dd..ab3ebed612 100644 --- a/tests/packages/Microsoft.Bot.Components.Telephony.Tests/RecordingTests.cs +++ b/tests/packages/Microsoft.Bot.Components.Telephony.Tests/RecordingTests.cs @@ -17,7 +17,7 @@ public RecordingTests(ResourceExplorerFixture resourceExplorerFixture) : base(re } [Fact] - public async Task StartRecording_HappyPath() + public async Task Recording_HappyPath() { await TestUtils.RunTestScript(_resourceExplorerFixture.ResourceExplorer, adapterChannel: Channels.Telephony); } @@ -46,7 +46,7 @@ public async Task StartRecording_CommandResultWrongName() } [Fact] - public async Task StartRecording_IgnoredInNonTelephonyChannel() + public async Task Recording_IgnoredInNonTelephonyChannel() { await TestUtils.RunTestScript(_resourceExplorerFixture.ResourceExplorer, adapterChannel: Channels.Msteams); }