From bab3b1bb94294332ac721e5dd1e48b368b3600be Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Fri, 16 Apr 2021 18:14:55 -0400 Subject: [PATCH 1/5] Make create from qna url modal blocking --- .../client/src/components/QnA/CreateQnAFromUrlModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx index d2a0a6f055..20c9cf7992 100644 --- a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx +++ b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx @@ -177,7 +177,7 @@ export const CreateQnAFromUrlModal: React.FC = (prop }} hidden={false} modalProps={{ - isBlocking: false, + isBlocking: true, styles: styles.modalCreateFromUrl, }} onDismiss={handleDismiss} From b26d896aa96ffc9ec05305810a3c24fbb10aeef2 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Fri, 16 Apr 2021 18:56:32 -0400 Subject: [PATCH 2/5] fix for bug in new tab view: add botProjectData as dep to regenerate botStatusList --- Composer/packages/client/src/pages/publish/Publish.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/publish/Publish.tsx b/Composer/packages/client/src/pages/publish/Publish.tsx index f54da64590..94721245b3 100644 --- a/Composer/packages/client/src/pages/publish/Publish.tsx +++ b/Composer/packages/client/src/pages/publish/Publish.tsx @@ -82,7 +82,7 @@ const Publish: React.FC { return generateBotStatusList(currentBotList, botPropertyData, publishHistoryList); - }, [currentBotList, botPropertyData, publishHistoryList]); + }, [currentBotList, botPropertyData, publishHistoryList, botProjectData]); const isPublishPending = useMemo(() => { return Object.values(updaterStatus).some(Boolean); From 67abcd9e85e552fa2c4d91cb951acad9c7a8ae27 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Fri, 16 Apr 2021 18:59:18 -0400 Subject: [PATCH 3/5] Adding prevew tag to node tab in template selection view --- .../client/src/components/CreationFlow/v2/CreateBot.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx b/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx index b8d7bb8b71..0395145f05 100644 --- a/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx +++ b/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx @@ -239,7 +239,11 @@ export function CreateBotV2(props: CreateBotProps) { }} > - +
From efd50ef9ef8458b1fd83126b8895ccd0f17be48c Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Fri, 16 Apr 2021 19:01:14 -0400 Subject: [PATCH 4/5] Fix error message for bot name --- .../src/components/CreationFlow/v2/DefineConversation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx index 115f3adf9e..32a0847aee 100644 --- a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx +++ b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx @@ -154,7 +154,7 @@ const DefineConversationV2: React.FC = (props) => { if (!value || !nameRegexV2.test(`${value}`)) { // botName is used as used when generating runtime namespaces which cannot start with a number if (value && !isNaN(+value.toString().charAt(0))) { - return formatMessage('Bot name cannot not start with a number'); + return formatMessage('Bot name cannot not start with a number or space'); } else { return formatMessage('Spaces and special characters are not allowed. Use letters, numbers, or _.'); } From dd5d92abf52488e6e630cf77b1351d7635f5bfc1 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Mon, 19 Apr 2021 13:35:31 -0400 Subject: [PATCH 5/5] fixing typo --- .../src/components/CreationFlow/v2/DefineConversation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx index 32a0847aee..e3e77625db 100644 --- a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx +++ b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx @@ -154,7 +154,7 @@ const DefineConversationV2: React.FC = (props) => { if (!value || !nameRegexV2.test(`${value}`)) { // botName is used as used when generating runtime namespaces which cannot start with a number if (value && !isNaN(+value.toString().charAt(0))) { - return formatMessage('Bot name cannot not start with a number or space'); + return formatMessage('Bot name cannot start with a number or space'); } else { return formatMessage('Spaces and special characters are not allowed. Use letters, numbers, or _.'); }