Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
2ba9e39
decompose shell and api into smaller types
a-b-r-o-w-n Oct 8, 2020
89eb970
nest plugin pages under bot scope
a-b-r-o-w-n Oct 9, 2020
827a071
simplify webpack config
a-b-r-o-w-n Oct 9, 2020
25cce5d
make extension client external
a-b-r-o-w-n Oct 9, 2020
215405f
add mechanism to sync client shell to iframe plugin host
a-b-r-o-w-n Oct 12, 2020
edb859e
only fetch extensions when app mounts
a-b-r-o-w-n Oct 12, 2020
43feb20
add plugin pages selector
a-b-r-o-w-n Oct 12, 2020
1f162a8
output source maps with extension bundles
a-b-r-o-w-n Oct 12, 2020
2b497b8
rename file
a-b-r-o-w-n Oct 12, 2020
3550723
clean up manifest after loading extensions
a-b-r-o-w-n Oct 12, 2020
2b0ab78
add project api hook
a-b-r-o-w-n Oct 12, 2020
ed28e6d
update sample plugin to use project api
a-b-r-o-w-n Oct 12, 2020
0fd405d
Merge branch 'main' into abrown/extensions/page-api
a-b-r-o-w-n Oct 12, 2020
3840930
Merge branch 'main' into abrown/extensions/page-api
a-b-r-o-w-n Oct 13, 2020
7df7985
disable sample-ui-plugin
a-b-r-o-w-n Oct 13, 2020
96f8138
do not sync store to window
a-b-r-o-w-n Oct 13, 2020
6adfabb
Merge branch 'main' into abrown/extensions/page-api
a-b-r-o-w-n Oct 14, 2020
9d11484
prepare test-utils and types for publishing
a-b-r-o-w-n Oct 14, 2020
3239a94
update package references to published pacakges
a-b-r-o-w-n Oct 14, 2020
90fbbb4
add types package
a-b-r-o-w-n Oct 14, 2020
caceb06
remove shared dependency from extension-client
a-b-r-o-w-n Oct 13, 2020
cb10bd4
remove data from shell
a-b-r-o-w-n Oct 13, 2020
b2e7bf1
more types updates
a-b-r-o-w-n Oct 14, 2020
5d19a6d
add useFormHook to expose current form data
a-b-r-o-w-n Oct 14, 2020
09235d7
Merge branch 'main' into abrown/extensions/page-api
a-b-r-o-w-n Oct 14, 2020
5b928c6
Merge branch 'abrown/extensions/page-api' into abrown/extensions/hook…
a-b-r-o-w-n Oct 14, 2020
7ca96a6
re-order useEffects
a-b-r-o-w-n Oct 14, 2020
6320acc
Merge branch 'abrown/extensions/page-api' into abrown/extensions/hook…
a-b-r-o-w-n Oct 14, 2020
e35cc61
Merge branch 'main' into abrown/extensions/page-api
a-b-r-o-w-n Oct 14, 2020
eccd4f1
Merge branch 'abrown/extensions/page-api' into abrown/extensions/hook…
a-b-r-o-w-n Oct 14, 2020
067e798
Merge branch 'main' into abrown/extensions/page-api
a-b-r-o-w-n Oct 14, 2020
36aec9b
Merge branch 'abrown/extensions/page-api' into abrown/extensions/hook…
a-b-r-o-w-n Oct 14, 2020
10d62cb
add missing import
a-b-r-o-w-n Oct 14, 2020
a787063
move types to dependencies
a-b-r-o-w-n Oct 14, 2020
c1cd2a0
fix type errors
a-b-r-o-w-n Oct 14, 2020
c7365d1
add missing dependency
a-b-r-o-w-n Oct 14, 2020
96db656
Merge branch 'main' into abrown/extensions/hooks-refactor
a-b-r-o-w-n Oct 14, 2020
9f01bfe
fix tests
a-b-r-o-w-n Oct 14, 2020
a9109af
remove old comments
a-b-r-o-w-n Oct 14, 2020
e111ad3
update lockfile
a-b-r-o-w-n Oct 14, 2020
2c64035
Merge branch 'main' into abrown/extensions/hooks-refactor
a-b-r-o-w-n Oct 15, 2020
db18ee1
use stub currentDialog when none found
a-b-r-o-w-n Oct 15, 2020
d209284
fix build:dev
a-b-r-o-w-n Oct 15, 2020
7b7e820
Merge branch 'main' into abrown/extensions/hooks-refactor
a-b-r-o-w-n Oct 15, 2020
6b8dbaf
fix merge conflict
a-b-r-o-w-n Oct 15, 2020
0f9bb4d
add @botframework-composer/types to client
a-b-r-o-w-n Oct 15, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .vscode/snippets.json.code-snippets
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
// Place your BotFramework-Composer workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
// Placeholders with the same ids are connected.
"React component test scaffolding": {
"prefix": "rct",
"body": [
"import React from 'react';",
"import { render } from '@bfc/test-utils';",
// Place your BotFramework-Composer workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
// Placeholders with the same ids are connected.
"React component test scaffolding": {
"prefix": "rct",
"body": [
"import React from 'react';",
"import { render } from '@botframework-composer/test-utils';",
"import assign from 'lodash/assign';\n",
"import { $1 } from '$2';\n",
"const defaultProps = {\n $3\n};\n",
"function renderSubject(overrides = {}) {",
" const props = assign({}, defaultProps, overrides);",
" return render(<$1 {...props} />);",
"}\n",
"describe('<$1 />', () => {",
" it.todo('$0');",
"});\n"
],
"description": "React component test scaffolding"
}
"describe('<$1 />', () => {",
" it.todo('$0');",
"});\n"
],
"description": "React component test scaffolding"
}
}
1 change: 0 additions & 1 deletion Composer/.npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@bfcomposer:registry=https://botbuilder.myget.org/F/botbuilder-declarative/npm/
scripts-prepend-node-path=true
4 changes: 2 additions & 2 deletions Composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
"scripts": {
"build": "node scripts/begin.js && yarn build:prod && yarn l10n",
"build:prod": "yarn build:dev && yarn build:client && yarn build:server && yarn build:electron",
"build:dev": "wsrun -ltm -x @bfc/electron-server -x @bfc/client -x @bfc/server -p @bfc/* -c build && yarn build:plugins",
"build:dev": "wsrun -ltm -x @bfc/electron-server -x @bfc/client -x @bfc/server -p @botframework-composer/* -p @bfc/* -c build && yarn build:plugins",
"build:electron": "yarn workspace @bfc/electron-server build && yarn workspace @bfc/electron-server l10n",
"build:server": "yarn workspace @bfc/server build",
"build:client": "yarn workspace @bfc/client build",
"build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples && yarn build:plugins:azurePublish && yarn build:plugins:runtimes & yarn build:plugins:vacore",
"build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples && yarn build:plugins:azurePublish && yarn build:plugins:runtimes && yarn build:plugins:vacore",
"build:plugins:localpublish": "cd plugins/localPublish && yarn install && yarn build",
"build:plugins:samples": "cd plugins/samples && yarn install && yarn build",
"build:plugins:azurePublish": "cd plugins/azurePublish && yarn install && yarn build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';
import { EditorExtensionContext } from '@bfc/extension-client';

import AdaptiveFlowEditor from '../../src/adaptive-flow-editor/AdaptiveFlowEditor';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render, fireEvent, findByText } from '@bfc/test-utils';
import { render, fireEvent, findByText } from '@botframework-composer/test-utils';

import { IconMenu } from '../../../src/adaptive-flow-editor/components/IconMenu';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render, fireEvent } from '@bfc/test-utils';
import { render, fireEvent } from '@botframework-composer/test-utils';

import { enableKeyboardCommandAttributes } from '../../../src/adaptive-flow-editor/components/KeyboardZone';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React, { useContext } from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';
import { DialogFactory } from '@bfc/shared';

import { NodeRendererContext } from '../../../src/adaptive-flow-editor/contexts/NodeRendererContext';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React, { useContext } from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { SelectionContext } from '../../../src/adaptive-flow-editor/contexts/SelectionContext';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import { renderHook } from '@bfc/test-utils/lib/hooks';
import { renderHook } from '@botframework-composer/test-utils/lib/hooks';

import { useEditorEventApi } from '../../../src/adaptive-flow-editor/hooks/useEditorEventApi';
import { ShellApiStub } from '../stubs/ShellApiStub';
import { defaultRendererContextValue } from '../../../src/adaptive-flow-editor/contexts/NodeRendererContext';
import { defaultSelectionContextValue } from '../../../src/adaptive-flow-editor/contexts/SelectionContext';
import { NodeEventTypes } from '../../../src/adaptive-flow-renderer/constants/NodeEventTypes';

describe('useSelectionEffect', () => {
describe('useEditorEventApi', () => {
const hook = renderHook(() =>
useEditorEventApi(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';
import { DialogGroup } from '@bfc/shared';

import { EdgeMenu } from '../../../src/adaptive-flow-editor/renderers/EdgeMenu';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { ElementWrapper } from '../../../src/adaptive-flow-editor/renderers/ElementWrapper';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render, fireEvent, findAllByText } from '@bfc/test-utils';
import { render, fireEvent, findAllByText } from '@botframework-composer/test-utils';

import { NodeMenu } from '../../../src/adaptive-flow-editor/renderers/NodeMenu';
import { NodeEventTypes } from '../../../src/adaptive-flow-renderer/constants/NodeEventTypes';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render, fireEvent } from '@bfc/test-utils';
import { render, fireEvent } from '@botframework-composer/test-utils';
import { EditorExtensionContext } from '@bfc/extension-client';

import { ActionNodeWrapper } from '../../../src/adaptive-flow-editor/renderers/NodeWrapper';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@ export const ShellApiStub: ShellApi = {
updateLgTemplate: fnPromise,
removeLgTemplate: fnPromise,
removeLgTemplates: fnPromise,
updateLgFile: fnPromise,
debouncedUpdateLgTemplate: fnPromise,
getLuIntent: fn,
getLuIntents: fnList,
addLuIntent: fnPromise,
updateLuIntent: fnPromise,
removeLuIntent: fn,
updateLuFile: fnPromise,
debouncedUpdateLuIntent: fnPromise,
renameLuIntent: fnPromise,
updateRegExIntent: fn,
createDialog: fnPromise,
addCoachMarkRef: fn,
Expand All @@ -36,6 +41,21 @@ export const ShellApiStub: ShellApi = {
addSkillDialog: fnPromise,
announce: fn,
displayManifestModal: fn,
constructAction: fnPromise,
constructActions: fnPromise,
copyAction: fnPromise,
copyActions: fnPromise,
deleteAction: fnPromise,
deleteActions: fnPromise,
actionsContainLuIntent: fn,
updateQnaContent: fnPromise,
renameRegExIntent: fnPromise,
updateIntentTrigger: fnPromise,
commitChanges: fnPromise,
updateDialogSchema: fnPromise,
createTrigger: fnPromise,
updateSkillSetting: fnPromise,
updateFlowZoomRate: fnPromise,
};

describe('ShellApiStub', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
import { AdaptiveDialog } from '../../../src/adaptive-flow-renderer/adaptive/AdaptiveDialog';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { AdaptiveTrigger } from '../../../src/adaptive-flow-renderer/adaptive/AdaptiveTrigger';
import { SchemaContext } from '../../../src/adaptive-flow-renderer/contexts/SchemaContext';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { ArrowLine } from '../../../src/adaptive-flow-renderer/components/ArrowLine';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { Diamond } from '../../../src/adaptive-flow-renderer/components/Diamond';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { ElementMeasurer } from '../../../src/adaptive-flow-renderer/components/ElementMeasurer';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { FlowEdges } from '../../../src/adaptive-flow-renderer/components/FlowEdges';
import { Edge } from '../../../src/adaptive-flow-renderer/models/EdgeData';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { IconBrick } from '../../../src/adaptive-flow-renderer/components/IconBrick';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { LoopIndicator } from '../../../src/adaptive-flow-renderer/components/LoopIndicator';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { OffsetContainer } from '../../../src/adaptive-flow-renderer/components/OffsetContainer';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { SVGContainer } from '../../../src/adaptive-flow-renderer/components/SVGContainer';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { drawSVGEdge } from '../../../src/adaptive-flow-renderer/utils/visual/EdgeUtil';
import { EdgeDirection } from '../../../src/adaptive-flow-renderer/models/EdgeData';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';
import { WidgetComponent, FlowEditorWidgetMap, FlowWidget } from '@bfc/extension-client';

import { renderUIWidget, UIWidgetContext } from '../../../src/adaptive-flow-renderer/utils/visual/widgetRenderer';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { ActionCard } from '../../../src/adaptive-flow-renderer/widgets';
import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { DialogRef } from '../../../src/adaptive-flow-renderer/widgets';
import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { ForeachWidget } from '../../../src/adaptive-flow-renderer/widgets';
import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { IfConditionWidget } from '../../../src/adaptive-flow-renderer/widgets';
import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { PromptWidget } from '../../../src/adaptive-flow-renderer/widgets';
import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { SwitchConditionWidget } from '../../../src/adaptive-flow-renderer/widgets';
import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

import React from 'react';
import { render } from '@bfc/test-utils';
import { render } from '@botframework-composer/test-utils';

import { Icon } from '../../../src/adaptive-flow-renderer/widgets/ActionHeader/icon';

Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/adaptive-flow/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { createConfig } = require('@bfc/test-utils');
const { createConfig } = require('@botframework-composer/test-utils');

module.exports = createConfig('adaptive-form', 'react');
2 changes: 1 addition & 1 deletion Composer/packages/adaptive-flow/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"react": "16.13.1"
},
"devDependencies": {
"@bfc/test-utils": "*",
"@botframework-composer/test-utils": "*",
"@types/lodash": "^4.14.146",
"@types/react": "16.9.23",
"format-message": "^6.2.3",
Expand Down
Loading