Merge branch 'main' into zeye/formint

microsoft · Dec 2, 2020 · c170c4e · c170c4e
2 parents c435cd2 + cf6e47a
commit c170c4e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts b/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts
@@ -23,6 +23,8 @@ export const formDialogsDispatcher = () => {
     });
 
     set(formDialogSchemaState({ projectId, schemaId: id }), { id, content: JSON.stringify({}, null, 4) });
+
+    navigate(`/bot/${projectId}/forms/${id}`);
   });
 
   const updateFormDialogSchema = useRecoilCallback(({ set }: CallbackInterface) => ({ id, content, projectId }) =>

diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
@@ -65,7 +65,7 @@
     "@botframework-composer/types": "*",
     "@microsoft/bf-dialog": "4.11.0-dev.20201025.69cf2b9",
     "@microsoft/bf-dispatcher": "^4.11.0-beta.20201016.393c6b2",
-    "@microsoft/bf-generate-library": "^4.10.0-daily.20201123.188303",
+    "@microsoft/bf-generate-library": "^4.10.0-daily.20201202.190604",
     "@microsoft/bf-lu": "^4.11.0-rc.20201030.a9f9b96",
     "@microsoft/bf-orchestrator": "^4.11.0-beta.20201111.10062c1",
     "archiver": "^5.0.2",

diff --git a/Composer/yarn.lock b/Composer/yarn.lock
@@ -3111,12 +3111,12 @@
     ts-md5 "^1.2.6"
     tslib "^1.10.0"
 
-"@microsoft/bf-generate-library@^4.10.0-daily.20201123.188303":
-  version "4.10.0-daily.20201123.188303"
-  resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-generate-library/-/@microsoft/bf-generate-library-4.10.0-daily.20201123.188303.tgz#92e763d4a1bab1657f84fc67a49d4b0ae02c178b"
-  integrity sha1-kudj1KG6sWV/hPxnpJ1LCuAsF4s=
+"@microsoft/bf-generate-library@^4.10.0-daily.20201202.190604":
+  version "4.10.0-daily.20201202.190604"
+  resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-generate-library/-/@microsoft/bf-generate-library-4.10.0-daily.20201202.190604.tgz#92bf560aeb4e9a22332965738fed229b881b2b81"
+  integrity sha1-kr9WCutOmiIzKWVzj+0im4gbK4E=
   dependencies:
-    "@microsoft/bf-lu" "^4.11.0"
+    "@microsoft/bf-lu" rc
     adaptive-expressions "^4.11.0"
     ajv "^6.9.1"
     botbuilder-lg "^4.11.0-rc0"
@@ -3129,10 +3129,10 @@
     seedrandom "~3.0.5"
     swagger-parser "^8.0.4"
 
-"@microsoft/bf-lu@^4.11.0":
-  version "4.11.0"
-  resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.11.0.tgz#23ffd0f5b53456da675bd0dd9b210c3a3b6c818e"
-  integrity sha1-I//Q9bU0VtpnW9DdmyEMOjtsgY4=
+"@microsoft/bf-lu@^4.11.0-rc.20201030.a9f9b96":
+  version "4.11.0-rc.20201030.a9f9b96"
+  resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.11.0-rc.20201030.a9f9b96.tgz#9fcb2a18d66bcef74eabc98f06df4574215c402f"
+  integrity sha512-+VFZUGQdH+1lwuSxE9G2lOqO6KPevvhijKyX8N93/I+VxwfHuCF/BZ439MseT3+vJ9OzATfkeccqgOuI/kNBlQ==
   dependencies:
     "@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
     "@azure/ms-rest-azure-js" "2.0.1"
@@ -3151,10 +3151,10 @@
     semver "^5.5.1"
     tslib "^2.0.3"
 
-"@microsoft/bf-lu@^4.11.0-rc.20201030.a9f9b96":
-  version "4.11.0-rc.20201030.a9f9b96"
-  resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.11.0-rc.20201030.a9f9b96.tgz#9fcb2a18d66bcef74eabc98f06df4574215c402f"
-  integrity sha512-+VFZUGQdH+1lwuSxE9G2lOqO6KPevvhijKyX8N93/I+VxwfHuCF/BZ439MseT3+vJ9OzATfkeccqgOuI/kNBlQ==
+"@microsoft/bf-lu@next":
+  version "4.12.0-dev.20201028.999bc32"
+  resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.12.0-dev.20201028.999bc32.tgz#be2d651dd0932d3d77c7fbca959837e61b4d5a92"
+  integrity sha512-GQWaH6IXNOC2qAFmURAT3sl5YD1MaBgpLAy4nS3r5zUcLPNJjE8taksueqtQwltvCWJGbZdPLgPVTdwI+iBR3g==
   dependencies:
     "@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
     "@azure/ms-rest-azure-js" "2.0.1"
@@ -3173,15 +3173,15 @@
     semver "^5.5.1"
     tslib "^2.0.3"
 
-"@microsoft/bf-lu@next":
-  version "4.12.0-dev.20201028.999bc32"
-  resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.12.0-dev.20201028.999bc32.tgz#be2d651dd0932d3d77c7fbca959837e61b4d5a92"
-  integrity sha512-GQWaH6IXNOC2qAFmURAT3sl5YD1MaBgpLAy4nS3r5zUcLPNJjE8taksueqtQwltvCWJGbZdPLgPVTdwI+iBR3g==
+"@microsoft/bf-lu@rc":
+  version "4.11.1"
+  resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.11.1.tgz#b5e65d519b4e801c7254ff2df0dac4b74b80b7db"
+  integrity sha1-teZdUZtOgBxyVP8t8NrEt0uAt9s=
   dependencies:
     "@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
     "@azure/ms-rest-azure-js" "2.0.1"
     "@types/node-fetch" "~2.5.5"
-    antlr4 "^4.7.2"
+    antlr4 "~4.8.0"
     chalk "2.4.1"
     console-stream "^0.1.1"
     deep-equal "^1.0.1"
@@ -5031,6 +5031,11 @@ antlr4@^4.7.2:
   resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/antlr4/-/antlr4-4.7.2.tgz#9d0b5987bb63660de658055ee9149141b4d9b462"
   integrity sha1-nQtZh7tjZg3mWAVe6RSRQbTZtGI=
 
+antlr4@~4.8.0:
+  version "4.8.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/antlr4/-/antlr4-4.8.0.tgz#f938ec171be7fc2855cd3a533e87647185b32b6a"
+  integrity sha1-+TjsFxvn/ChVzTpTPodkcYWzK2o=
+
 antlr4ts@0.5.0-alpha.3:
   version "0.5.0-alpha.3"
   resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/antlr4ts/-/antlr4ts-0.5.0-alpha.3.tgz#fa6d39d88d6b96341a8afef45867af9abcb38766"
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ export const formDialogsDispatcher = () => { @@
         });
         set(formDialogSchemaState({ projectId, schemaId: id }), { id, content: JSON.stringify({}, null, 4) });
+        navigate(`/bot/${projectId}/forms/${id}`);
       });
       const updateFormDialogSchema = useRecoilCallback(({ set }: CallbackInterface) => ({ id, content, projectId }) =>
@@ Expand Down @@