From a2058bbfbc9ed313b949484502f99bc6a0dd553e Mon Sep 17 00:00:00 2001 From: Long Alan Date: Mon, 8 Feb 2021 17:39:19 +0800 Subject: [PATCH 1/3] fix css err when clicking node (#5713) Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com> --- .../src/adaptive-flow-editor/renderers/NodeWrapper.tsx | 3 +++ 1 file changed, 3 insertions(+) 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 index 081e0a36c1..e57555236e 100644 --- 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 = ({ id, tab, data, onEvent &:hover { ${!nodeFocused && nodeBorderHoveredStyle} } + &:focus { + outline: 0; + } `} data-testid="ActionNodeWrapper" id={nodeId} From fcad8c631280f741d3ee980785b8303df90d756e Mon Sep 17 00:00:00 2001 From: Qi Kang Date: Mon, 8 Feb 2021 18:36:23 +0800 Subject: [PATCH 2/3] add subscription id (#5711) Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com> --- extensions/azurePublish/src/node/index.ts | 2 +- extensions/samples/assets/shared/scripts/provisionComposer.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/azurePublish/src/node/index.ts b/extensions/azurePublish/src/node/index.ts index b4a4d26afd..8a75e4173e 100644 --- a/extensions/azurePublish/src/node/index.ts +++ b/extensions/azurePublish/src/node/index.ts @@ -401,6 +401,7 @@ export default async (composer: IExtensionRegistration): Promise => { MicrosoftAppId: provisionResults.appId, MicrosoftAppPassword: provisionResults.appPassword, }, + subscriptionId: config.subscription.subscriptionId }; this.logger(publishProfile); @@ -523,7 +524,6 @@ export default async (composer: IExtensionRegistration): Promise => { *************************************************************************************************/ provision = async (config: any, project: IBotProject, user, getAccessToken): Promise => { 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 index 245df72dcf..2248cc405d 100644 --- 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))); From fef792908912e6f6d1e0a795e45d406026f270b2 Mon Sep 17 00:00:00 2001 From: zeye Date: Tue, 9 Feb 2021 12:26:12 +0800 Subject: [PATCH 3/3] fix: add 100px marign right for branching nodes (SwitchConditon, IfCondition) (#5693) * add 100px marign right for branching nodes * fix UT * UT: switch node size Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com> --- .../layouters/calculateNodeBoundary.test.ts | 3 ++- .../src/adaptive-flow-renderer/constants/ElementSizes.ts | 2 ++ .../adaptive-flow-renderer/layouters/calculateNodeBoundary.ts | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts b/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts index af7ffd49b8..d352d50559 100644 --- a/Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/layouters/calculateNodeBoundary.test.ts +++ b/Composer/packages/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-renderer/constants/ElementSizes.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/constants/ElementSizes.ts index 737adc60d0..46f8f0452d 100644 --- 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/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts b/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts index 7e57c935f4..33ff65fa7b 100644 --- a/Composer/packages/adaptive-flow/src/adaptive-flow-renderer/layouters/calculateNodeBoundary.ts +++ b/Composer/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;