Merge branch 'main' into wenyluo/fix5414

microsoft · Feb 9, 2021 · 92ab38e · 92ab38e
2 parents 7738ed0 + fef7929
commit 92ab38e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/...es/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts b/...es/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts
@@ -13,6 +13,7 @@ import {
   BranchIntervalX,
   BranchIntervalY,
   LoopEdgeMarginLeft,
+  BranchingNodeMarginRight,
 } from '../../../src/adaptive-flow-renderer/constants/ElementSizes';
 
 const boundary = new Boundary();
@@ -77,7 +78,7 @@ describe('calculateSwitchCaseBoundary', () => {
   });
   it('should return a box whose property be calcalated by conditionBoundary, choiceBoundary, branchBoundaries', () => {
     const returnBoundary = {
-      width: 580 + BranchIntervalX,
+      width: 580 + BranchIntervalX + BranchingNodeMarginRight,
       height: 180 + BranchIntervalY * 3,
       axisX: 140,
       axisY: 0,

diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/renderers/NodeWrapper.tsx
@@ -81,6 +81,9 @@ export const ActionNodeWrapper: FC<NodeWrapperProps> = ({ id, tab, data, onEvent
         &:hover {
           ${!nodeFocused && nodeBorderHoveredStyle}
         }
+        &:focus {
+          outline: 0;
+        }
       `}
       data-testid="ActionNodeWrapper"
       id={nodeId}

diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts
@@ -59,6 +59,8 @@ export const BranchIntervalY = ElementInterval.y / 2;
 // Preserve enough space for condition label text on edges.
 export const BranchAxisXIntervalMin = 150;
 
+export const BranchingNodeMarginRight = 100;
+
 export const EdgeAddButtonSize = {
   width: 16,
   height: 16,

diff --git a/...oser/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts b/...oser/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts
@@ -6,6 +6,7 @@ import {
   ElementInterval,
   BranchIntervalX,
   BranchIntervalY,
+  BranchingNodeMarginRight,
   LoopEdgeMarginLeft,
   DiamondSize,
   IconBrickSize,
@@ -113,7 +114,8 @@ function measureBranchingContainerBoundary(
       conditionBoundary.width - conditionBoundary.axisX,
       choiceBoundary.width - choiceBoundary.axisX,
       branchGroupBoundary.width - branchGroupBoundary.axisX
-    );
+    ) +
+    BranchingNodeMarginRight;
 
   const containerBoundary = new Boundary();
   containerBoundary.width = containerWidth;

diff --git a/extensions/azurePublish/src/node/index.ts b/extensions/azurePublish/src/node/index.ts
@@ -401,6 +401,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
             MicrosoftAppId: provisionResults.appId,
             MicrosoftAppPassword: provisionResults.appPassword,
           },
+          subscriptionId: config.subscription.subscriptionId
         };
 
         this.logger(publishProfile);
@@ -523,7 +524,6 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
      *************************************************************************************************/
     provision = async (config: any, project: IBotProject, user, getAccessToken): Promise<ProcessStatus> => {
       const jobId = BackgroundProcessManager.startProcess(202, project.id, config.name, 'Creating Azure resources...');
-
       this.asyncProvision(jobId, config, project, user);
       return BackgroundProcessManager.getStatus(jobId);
     };

diff --git a/extensions/samples/assets/shared/scripts/provisionComposer.js b/extensions/samples/assets/shared/scripts/provisionComposer.js
@@ -800,6 +800,7 @@ msRestNodeAuth
         luisResource: `${name}-${environment}-luis`,
         settings: createResult,
         runtimeIdentifier: 'win-x64',
+        subscriptionId: subId
       };
 
       console.log(chalk.white(JSON.stringify(profile, null, 2)));