= ({ id, addCoachMarkRef, onClick
}}
iconSize={7}
nodeSelected={nodeSelected}
- menuItems={buildEdgeMenuItemsFromClipboardContext(
- nodeContext,
- onClick,
- selfHosted ? x => x !== SDKKinds.LogAction : undefined
- )}
+ menuItems={menuItems}
label={formatMessage('Add')}
handleMenuShow={handleMenuShow}
{...rest}
diff --git a/Composer/packages/extensions/visual-designer/src/components/menus/EventMenu.tsx b/Composer/packages/extensions/visual-designer/src/components/menus/EventMenu.tsx
deleted file mode 100644
index 7067aebeb2..0000000000
--- a/Composer/packages/extensions/visual-designer/src/components/menus/EventMenu.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import React, { useContext } from 'react';
-import { createStepMenu, DialogGroup } from '@bfc/shared';
-
-import { NodeRendererContext } from '../../store/NodeRendererContext';
-
-import { IconMenu } from './IconMenu';
-
-interface EventMenuProps {
- label?: string;
- onClick: (item: string | null) => void;
-}
-
-export const EventMenu: React.FC
= ({ label, onClick, ...rest }): JSX.Element => {
- const { dialogFactory } = useContext(NodeRendererContext);
- const eventMenuItems = createStepMenu(
- [DialogGroup.EVENTS],
- false,
- (e, item): any => onClick(item ? item.data.$kind : null),
- dialogFactory
- );
-
- return (
-
- );
-};
diff --git a/Composer/packages/extensions/visual-designer/src/components/menus/createSchemaMenu.tsx b/Composer/packages/extensions/visual-designer/src/components/menus/createSchemaMenu.tsx
new file mode 100644
index 0000000000..6fc67fc17b
--- /dev/null
+++ b/Composer/packages/extensions/visual-designer/src/components/menus/createSchemaMenu.tsx
@@ -0,0 +1,197 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+/** @jsx jsx */
+import { jsx, css } from '@emotion/core';
+import {
+ IContextualMenuItem,
+ ContextualMenuItemType,
+} from 'office-ui-fabric-react/lib/components/ContextualMenu/ContextualMenu.types';
+import { ConceptLabels, DialogGroup, dialogGroups, SDKKinds, DefinitionSummary } from '@bfc/shared';
+import { FontIcon } from 'office-ui-fabric-react/lib/Icon';
+import formatMessage from 'format-message';
+
+const resolveMenuTitle = ($kind: SDKKinds): string => {
+ const conceptLabel = ConceptLabels[$kind];
+ return conceptLabel?.title || $kind;
+};
+
+type ActionMenuItemClickHandler = (item?: IContextualMenuItem) => any;
+type ActionKindFilter = ($kind: SDKKinds) => boolean;
+
+const createBaseActionMenu = (
+ onClick: ActionMenuItemClickHandler,
+ filter?: ActionKindFilter
+): IContextualMenuItem[] => {
+ const pickedGroups: DialogGroup[] = [
+ DialogGroup.RESPONSE,
+ DialogGroup.INPUT,
+ DialogGroup.BRANCHING,
+ DialogGroup.LOOPING,
+ DialogGroup.STEP,
+ DialogGroup.MEMORY,
+ DialogGroup.CODE,
+ DialogGroup.LOG,
+ ];
+ const stepMenuItems = pickedGroups
+ .map(key => dialogGroups[key])
+ .filter(groupItem => groupItem && Array.isArray(groupItem.types) && groupItem.types.length)
+ .map(({ label, types: actionKinds }) => {
+ const subMenuItems: IContextualMenuItem[] = actionKinds
+ .filter($kind => (filter ? filter($kind) : true))
+ .map($kind => ({
+ key: $kind,
+ name: resolveMenuTitle($kind),
+ onClick: (e, itemData) => onClick(itemData),
+ }));
+
+ if (subMenuItems.length === 1) {
+ // hoists the only item to upper level
+ return subMenuItems[0];
+ }
+ return createSubMenu(label, onClick, subMenuItems);
+ });
+ return stepMenuItems;
+};
+
+const createDivider = () => ({
+ key: 'divider',
+ itemType: ContextualMenuItemType.Divider,
+});
+
+const get$kindFrom$ref = ($ref: string): SDKKinds => {
+ return $ref.replace('#/definitions/', '') as SDKKinds;
+};
+
+const createCustomActionSubMenu = (
+ customizedActionGroups: DefinitionSummary[][],
+ onClick: ActionMenuItemClickHandler
+): IContextualMenuItem[] => {
+ if (!Array.isArray(customizedActionGroups) || customizedActionGroups.length === 0) {
+ return [];
+ }
+
+ const itemGroups: IContextualMenuItem[][] = customizedActionGroups
+ .filter(actionGroup => Array.isArray(actionGroup) && actionGroup.length)
+ .map(actionGroup => {
+ return actionGroup.map(
+ ({ title, $ref }) =>
+ ({
+ key: get$kindFrom$ref($ref),
+ name: title,
+ onClick: (e, itemData) => onClick(itemData),
+ } as IContextualMenuItem)
+ );
+ });
+
+ const flatMenuItems: IContextualMenuItem[] = itemGroups.reduce((resultItems, currentGroup, currentIndex) => {
+ if (currentIndex !== 0) {
+ // push a sep line ahead.
+ resultItems.push(createDivider());
+ }
+ resultItems.push(...currentGroup);
+ return resultItems;
+ }, []);
+
+ return flatMenuItems;
+};
+
+const createPasteButtonItem = (
+ menuItemCount: number,
+ disabled: boolean,
+ onClick: ActionMenuItemClickHandler
+): IContextualMenuItem => {
+ return {
+ key: 'Paste',
+ name: 'Paste',
+ ariaLabel: 'Paste',
+ disabled: disabled,
+ onRender: () => {
+ return (
+
+ );
+ },
+ };
+};
+
+interface ActionMenuOptions {
+ isSelfHosted: boolean;
+ enablePaste: boolean;
+}
+
+const createSubMenu = (
+ label: string,
+ onClick: ActionMenuItemClickHandler,
+ subItems: IContextualMenuItem[]
+): IContextualMenuItem => {
+ return {
+ key: label,
+ text: label,
+ subMenuProps: {
+ items: subItems,
+ onItemClick: (e, itemData) => onClick(itemData),
+ },
+ };
+};
+
+export const createActionMenu = (
+ onClick: ActionMenuItemClickHandler,
+ options: ActionMenuOptions,
+ customActionGroups?: DefinitionSummary[][]
+) => {
+ const resultItems: IContextualMenuItem[] = [];
+
+ // base SDK menu
+ const baseMenuItems = createBaseActionMenu(
+ onClick,
+ options.isSelfHosted ? ($kind: SDKKinds) => $kind !== SDKKinds.LogAction : undefined
+ );
+ resultItems.push(...baseMenuItems);
+
+ // Append a 'Custom Actions' item conditionally.
+ if (customActionGroups) {
+ const customActionItems = createCustomActionSubMenu(customActionGroups, onClick);
+ if (customActionItems.length) {
+ const customActionTitle = formatMessage('Custom Actions');
+ resultItems.push(createSubMenu(customActionTitle, onClick, customActionItems));
+ }
+ }
+
+ // paste button
+ const pasteButtonDisabled = !options.enablePaste;
+ const pasteButton = createPasteButtonItem(resultItems.length, pasteButtonDisabled, onClick);
+ resultItems.unshift(pasteButton, createDivider());
+
+ return resultItems;
+};
diff --git a/Composer/packages/extensions/visual-designer/src/editors/EventsEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/EventsEditor.tsx
index 380553aa20..1765e3c1bd 100644
--- a/Composer/packages/extensions/visual-designer/src/editors/EventsEditor.tsx
+++ b/Composer/packages/extensions/visual-designer/src/editors/EventsEditor.tsx
@@ -5,7 +5,6 @@ import React, { FC } from 'react';
import { Panel } from '../components/lib/Panel';
import { RuleGroup, CollapsedRuleGroup } from '../components/groups';
-import { EventMenu } from '../components/menus/EventMenu';
import { NodeEventTypes } from '../constants/NodeEventTypes';
import { EditorProps } from './editorProps';
@@ -14,8 +13,6 @@ export const EventsEditor: FC = ({ id, data, onEvent }): JSX.Elemen
const ruleCount = data.children.length;
const title = `Events (${ruleCount})`;
- const onClick = $kind => onEvent(NodeEventTypes.Insert, { id, $kind, position: ruleCount });
-
return (
= ({ id, data, onEvent }): JSX.Elemen
onEvent(NodeEventTypes.FocusEvent, '');
}}
collapsedItems={}
- addMenu={}
+ addMenu={null}
>
diff --git a/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx
index 2b6a20e29e..d8540f08f2 100644
--- a/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx
+++ b/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx
@@ -6,7 +6,7 @@ import { jsx } from '@emotion/core';
import { useContext, FC, useEffect, useState, useRef } from 'react';
import { MarqueeSelection, Selection } from 'office-ui-fabric-react/lib/MarqueeSelection';
import { SDKKinds, DialogUtils } from '@bfc/shared';
-import { useDialogApi, useDialogEditApi, useActionApi } from '@bfc/extension';
+import { useDialogApi, useDialogEditApi, useActionApi, useShellApi } from '@bfc/extension';
import get from 'lodash/get';
import { NodeEventTypes } from '../constants/NodeEventTypes';
@@ -41,6 +41,7 @@ export const ObiEditor: FC = ({
let divRef;
const { focusedId, focusedEvent, clipboardActions, dialogFactory } = useContext(NodeRendererContext);
+ const { shellApi } = useShellApi();
const {
insertAction,
insertActions,
@@ -50,9 +51,9 @@ export const ObiEditor: FC = ({
deleteSelectedAction,
deleteSelectedActions,
updateRecognizer,
- } = useDialogEditApi();
- const { createDialog, readDialog, updateDialog } = useDialogApi();
- const { actionsContainLuIntent } = useActionApi();
+ } = useDialogEditApi(shellApi);
+ const { createDialog, readDialog, updateDialog } = useDialogApi(shellApi);
+ const { actionsContainLuIntent } = useActionApi(shellApi);
const trackActionChange = (actionPath: string) => {
const affectedPaths = DialogUtils.getParentPaths(actionPath);
diff --git a/Composer/packages/extensions/visual-designer/src/index.tsx b/Composer/packages/extensions/visual-designer/src/index.tsx
index 906149c786..0e7313021d 100644
--- a/Composer/packages/extensions/visual-designer/src/index.tsx
+++ b/Composer/packages/extensions/visual-designer/src/index.tsx
@@ -4,7 +4,7 @@
/** @jsx jsx */
import { jsx, css, CacheProvider } from '@emotion/core';
import createCache from '@emotion/cache';
-import React, { useRef } from 'react';
+import React, { useRef, useMemo } from 'react';
import isEqual from 'lodash/isEqual';
import formatMessage from 'format-message';
import { DialogFactory } from '@bfc/shared';
@@ -16,6 +16,7 @@ import { SelfHostContext } from './store/SelfHostContext';
import { FlowSchemaContext } from './store/FlowSchemaContext';
import { FlowSchemaProvider } from './schema/flowSchemaProvider';
import { mergePluginConfig } from './utils/mergePluginConfig';
+import { getCustomSchema } from './utils/getCustomSchema';
formatMessage.setup({
missingTranslation: 'ignore',
@@ -41,7 +42,16 @@ export interface VisualDesignerProps {
}
const VisualDesigner: React.FC = ({ schema }): JSX.Element => {
const { shellApi, plugins, ...shellData } = useShellApi();
- const { dialogId, focusedEvent, focusedActions, focusedTab, clipboardActions, data: inputData, hosted } = shellData;
+ const {
+ dialogId,
+ focusedEvent,
+ focusedActions,
+ focusedTab,
+ clipboardActions,
+ data: inputData,
+ hosted,
+ schemas,
+ } = shellData;
const dataCache = useRef({});
@@ -77,6 +87,12 @@ const VisualDesigner: React.FC = ({ schema }): JSX.Element
const focusedId = Array.isArray(focusedActions) && focusedActions[0] ? focusedActions[0] : '';
+ // Compute schema diff
+ const customSchema = useMemo(() => getCustomSchema(schemas?.default, schemas?.sdk?.content), [
+ schemas?.sdk?.content,
+ schemas?.default,
+ ]);
+
const nodeContext: NodeRendererContextValue = {
focusedId,
focusedEvent,
@@ -89,6 +105,7 @@ const VisualDesigner: React.FC = ({ schema }): JSX.Element
removeLgTemplates,
removeLuIntent,
dialogFactory: new DialogFactory(schema),
+ customSchemas: customSchema ? [customSchema] : [],
};
const visualEditorConfig = mergePluginConfig(...plugins);
diff --git a/Composer/packages/extensions/visual-designer/src/store/NodeRendererContext.ts b/Composer/packages/extensions/visual-designer/src/store/NodeRendererContext.ts
index 4e7aadd7be..0d45eee0c9 100644
--- a/Composer/packages/extensions/visual-designer/src/store/NodeRendererContext.ts
+++ b/Composer/packages/extensions/visual-designer/src/store/NodeRendererContext.ts
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import React from 'react';
-import { ShellApi, DialogFactory } from '@bfc/shared';
+import { ShellApi, DialogFactory, OBISchema } from '@bfc/shared';
type ShellApiFuncs =
| 'getLgTemplates'
@@ -18,6 +18,7 @@ export interface NodeRendererContextValue extends Pick
focusedTab?: string;
clipboardActions: any[];
dialogFactory: DialogFactory;
+ customSchemas: OBISchema[];
}
export const NodeRendererContext = React.createContext({
@@ -32,4 +33,5 @@ export const NodeRendererContext = React.createContext
updateLgTemplate: () => Promise.resolve(),
removeLuIntent: () => Promise.resolve(),
dialogFactory: new DialogFactory(),
+ customSchemas: [],
});
diff --git a/Composer/packages/extensions/visual-designer/src/utils/getCustomSchema.ts b/Composer/packages/extensions/visual-designer/src/utils/getCustomSchema.ts
new file mode 100644
index 0000000000..dd6dac5737
--- /dev/null
+++ b/Composer/packages/extensions/visual-designer/src/utils/getCustomSchema.ts
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { OBISchema } from '@bfc/shared';
+
+export const getCustomSchema = (baseSchema?: OBISchema, ejectedSchema?: OBISchema): OBISchema | undefined => {
+ if (!baseSchema || !ejectedSchema) return;
+
+ const baseDefinitions = baseSchema.definitions;
+ const baseKindHash = Object.keys(baseDefinitions).reduce((hash, $kind) => {
+ hash[$kind] = true;
+ return hash;
+ }, {});
+
+ const ejectedDefinitions = ejectedSchema.definitions;
+ const diffKinds = Object.keys(ejectedDefinitions).filter($kind => !baseKindHash[$kind]);
+ if (diffKinds.length === 0) return;
+
+ const diffSchema = diffKinds.reduce(
+ (schema, $kind) => {
+ const definition = ejectedDefinitions[$kind];
+ schema.definitions[$kind] = definition;
+ schema.oneOf?.push({
+ title: definition.title || $kind,
+ description: definition.description || '',
+ $ref: `#/definitions/${$kind}`,
+ });
+ return schema;
+ },
+ {
+ oneOf: [],
+ definitions: {},
+ } as OBISchema
+ );
+
+ return diffSchema;
+};
diff --git a/Composer/packages/lib/code-editor/src/BaseEditor.tsx b/Composer/packages/lib/code-editor/src/BaseEditor.tsx
index 5bf3697054..772346afb1 100644
--- a/Composer/packages/lib/code-editor/src/BaseEditor.tsx
+++ b/Composer/packages/lib/code-editor/src/BaseEditor.tsx
@@ -225,7 +225,6 @@ const BaseEditor: React.FC = props => {
messageBarType={hasError ? MessageBarType.error : hasWarning ? MessageBarType.warning : MessageBarType.info}
isMultiline={true}
dismissButtonAriaLabel={formatMessage('Close')}
- overflowButtonAriaLabel={formatMessage('See more')}
>
{messageHelp}
{syntaxLink}
diff --git a/Composer/packages/lib/code-editor/src/LuEditor.tsx b/Composer/packages/lib/code-editor/src/LuEditor.tsx
index dfb3133465..6250fefa1c 100644
--- a/Composer/packages/lib/code-editor/src/LuEditor.tsx
+++ b/Composer/packages/lib/code-editor/src/LuEditor.tsx
@@ -10,10 +10,7 @@ import { EditorDidMount, Monaco } from '@monaco-editor/react';
import { registerLULanguage } from './languages';
import { createUrl, createWebSocket, createLanguageClient } from './utils/lspUtil';
import { BaseEditor, BaseEditorProps, OnInit } from './BaseEditor';
-
-const LU_HELP = 'https://aka.ms/lu-file-format';
-const placeholder = `> To learn more about the LU file format, read the documentation at
-> ${LU_HELP}`;
+import { defaultPlaceholder, LU_HELP } from './constants';
export interface LUOption {
projectId?: string;
@@ -85,7 +82,7 @@ const LuEditor: React.FC = props => {
...props.options,
};
- const { luOption, languageServer, onInit: onInitProp, ...restProps } = props;
+ const { luOption, languageServer, onInit: onInitProp, placeholder = defaultPlaceholder, ...restProps } = props;
const luServer = languageServer || defaultLUServer;
const onInit: OnInit = monaco => {
diff --git a/Composer/packages/lib/code-editor/src/constants.ts b/Composer/packages/lib/code-editor/src/constants.ts
new file mode 100644
index 0000000000..1fa17530b1
--- /dev/null
+++ b/Composer/packages/lib/code-editor/src/constants.ts
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import formatMessage from 'format-message';
+
+export const inlineModePlaceholder = formatMessage(`> add some example phrases to trigger this intent:
+> - please tell me the weather
+> - what is the weather like in '{city=Seattle}'
+>
+> entity definitions:
+> @ ml city`);
+
+export const LU_HELP = 'https://aka.ms/lu-file-format';
+export const defaultPlaceholder = formatMessage(
+ `> To learn more about the LU file format, read the documentation at
+> {LU_HELP}`,
+ { LU_HELP }
+);
diff --git a/Composer/packages/lib/code-editor/src/index.ts b/Composer/packages/lib/code-editor/src/index.ts
index 71dfe2decd..effdf10018 100644
--- a/Composer/packages/lib/code-editor/src/index.ts
+++ b/Composer/packages/lib/code-editor/src/index.ts
@@ -11,3 +11,4 @@ export * from './BaseEditor';
export * from './JsonEditor';
export * from './LgEditor';
export * from './LuEditor';
+export * from './constants';
diff --git a/Composer/packages/lib/shared/src/types/schema.ts b/Composer/packages/lib/shared/src/types/schema.ts
index 583585bf80..df93d1da8b 100644
--- a/Composer/packages/lib/shared/src/types/schema.ts
+++ b/Composer/packages/lib/shared/src/types/schema.ts
@@ -121,6 +121,12 @@ export enum SDKRoles {
// union_*_ = 'union(*)',
}
+export interface DefinitionSummary {
+ title: string;
+ description: string;
+ $ref: string;
+}
+
export interface OBISchema extends JSONSchema6 {
$schema?: string;
$role?: string;
@@ -132,6 +138,7 @@ export interface OBISchema extends JSONSchema6 {
[key: string]: any;
};
description?: string;
+ oneOf?: DefinitionSummary[];
definitions?: any;
title?: string;
__additional_property?: boolean;
diff --git a/Composer/packages/lib/shared/src/types/shell.ts b/Composer/packages/lib/shared/src/types/shell.ts
index ce276bb98b..1e4ed15331 100644
--- a/Composer/packages/lib/shared/src/types/shell.ts
+++ b/Composer/packages/lib/shared/src/types/shell.ts
@@ -4,6 +4,7 @@
import { DialogInfo, LuFile, LgFile, LuIntentSection, LgTemplate } from './indexers';
import { UserSettings } from './settings';
+import { OBISchema } from './schema';
/** Recursively marks all properties as optional. */
type AllPartial = {
@@ -18,6 +19,7 @@ export interface EditorSchema {
}
export interface BotSchemas {
+ default?: OBISchema;
sdk?: any;
diagnostics?: any[];
}
@@ -59,13 +61,14 @@ export interface ShellApi {
onSelect: (ids: string[]) => void;
getLgTemplates: (id: string) => LgTemplate[];
copyLgTemplate: (id: string, fromTemplateName: string, toTemplateName?: string) => Promise;
+ addLgTemplate: (id: string, templateName: string, templateStr: string) => Promise;
updateLgTemplate: (id: string, templateName: string, templateStr: string) => Promise;
removeLgTemplate: (id: string, templateName: string) => Promise;
removeLgTemplates: (id: string, templateNames: string[]) => Promise;
getLuIntent: (id: string, intentName: string) => LuIntentSection | undefined;
getLuIntents: (id: string) => LuIntentSection[];
- addLuIntent: (id: string, intentName: string, intent: LuIntentSection | undefined) => Promise;
- updateLuIntent: (id: string, intentName: string, intent: LuIntentSection | undefined) => Promise;
+ addLuIntent: (id: string, intentName: string, intent: LuIntentSection) => Promise;
+ updateLuIntent: (id: string, intentName: string, intent: LuIntentSection) => Promise;
removeLuIntent: (id: string, intentName: string) => void;
updateRegExIntent: (id: string, intentName: string, pattern: string) => void;
createDialog: (actions: any) => Promise;
diff --git a/Composer/packages/lib/shared/src/viewUtils.ts b/Composer/packages/lib/shared/src/viewUtils.ts
index 81df4043ad..97224f1a6e 100644
--- a/Composer/packages/lib/shared/src/viewUtils.ts
+++ b/Composer/packages/lib/shared/src/viewUtils.ts
@@ -1,15 +1,10 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import {
- IContextualMenuItem,
- IContextualMenuProps,
-} from 'office-ui-fabric-react/lib/components/ContextualMenu/ContextualMenu.types';
import get from 'lodash/get';
import { SDKKinds } from './types';
import { ConceptLabels } from './labelMap';
-import { DialogFactory } from './dialogFactory';
export const PROMPT_TYPES = [
SDKKinds.AttachmentInput,
@@ -161,106 +156,6 @@ export const dialogGroups: DialogGroupsMap = {
},
};
-const menuItemHandler = (
- factory: DialogFactory,
- handleType: (
- e: React.MouseEvent | React.KeyboardEvent | undefined,
- item: IContextualMenuItem
- ) => void
-) => (
- e: React.MouseEvent | React.KeyboardEvent | undefined,
- item: IContextualMenuItem | undefined
-) => {
- if (item) {
- const name =
- ConceptLabels[item.$kind] && ConceptLabels[item.$kind].title ? ConceptLabels[item.$kind].title : item.$kind;
- item = {
- ...item,
- data: {
- ...factory.create(item.$kind, {
- $designer: { name },
- }),
- },
- };
- return handleType(e, item);
- }
-};
-
-export const createStepMenu = (
- stepLabels: DialogGroup[],
- subMenu = true,
- handleType: (
- e: React.MouseEvent | React.KeyboardEvent | undefined,
- item: IContextualMenuItem
- ) => void,
- factory: DialogFactory,
- filter?: (x: SDKKinds) => boolean
-): IContextualMenuItem[] => {
- if (subMenu) {
- const stepMenuItems = stepLabels.map(x => {
- const item = dialogGroups[x];
- if (item.types.length === 1) {
- const conceptLabel = ConceptLabels[item.types[0]];
- return {
- key: item.types[0],
- name: conceptLabel && conceptLabel.title ? conceptLabel.title : item.types[0],
- $kind: item.types[0],
- onClick: menuItemHandler(factory, handleType),
- };
- }
- const subMenu: IContextualMenuProps = {
- items: item.types.filter(filter || (() => true)).map($kind => {
- const conceptLabel = ConceptLabels[$kind];
-
- return {
- key: $kind,
- name: conceptLabel && conceptLabel.title ? conceptLabel.title : $kind,
- $kind: $kind,
- };
- }),
- onItemClick: menuItemHandler(factory, handleType),
- };
-
- const menuItem: IContextualMenuItem = {
- key: item.label,
- text: item.label,
- name: item.label,
- subMenuProps: subMenu,
- };
- return menuItem;
- });
-
- return stepMenuItems;
- } else {
- const stepMenuItems = dialogGroups[stepLabels[0]].types.map(item => {
- const conceptLabel = ConceptLabels[item];
- const name = conceptLabel && conceptLabel.title ? conceptLabel.title : item;
- const menuItem: IContextualMenuItem = {
- key: item,
- text: name,
- name: name,
- $kind: item,
- ...factory.create(item, {
- $designer: { name },
- }),
- data: {
- $kind: item,
- ...factory.create(item, {
- $designer: { name },
- }),
- },
- onClick: (e, item: IContextualMenuItem | undefined) => {
- if (item) {
- return handleType(e, item);
- }
- },
- };
- return menuItem;
- });
- return stepMenuItems;
- }
-};
-
export function getDialogGroupByType(type) {
let dialogType = DialogGroup.OTHER;
diff --git a/Composer/packages/server/__tests__/controllers/project.test.ts b/Composer/packages/server/__tests__/controllers/project.test.ts
index def2c60f4b..c85e08af94 100644
--- a/Composer/packages/server/__tests__/controllers/project.test.ts
+++ b/Composer/packages/server/__tests__/controllers/project.test.ts
@@ -159,7 +159,7 @@ describe('dialog operation', () => {
const mockReq = {
params: { projectId },
query: {},
- body: { name: 'test.dialog', content: '' },
+ body: { name: 'test2.dialog', content: '' },
} as Request;
await ProjectController.createFile(mockReq, mockRes);
expect(mockRes.status).toHaveBeenCalledWith(200);
@@ -167,7 +167,7 @@ describe('dialog operation', () => {
it('should remove dialog', async () => {
const mockReq = {
- params: { name: 'test.dialog', projectId },
+ params: { name: 'test2.dialog', projectId },
query: {},
body: {},
} as Request;
diff --git a/Composer/packages/server/src/controllers/project.ts b/Composer/packages/server/src/controllers/project.ts
index 8f5cdd32c3..faebddd8e9 100644
--- a/Composer/packages/server/src/controllers/project.ts
+++ b/Composer/packages/server/src/controllers/project.ts
@@ -80,7 +80,6 @@ async function getProjectById(req: Request, res: Response) {
const currentProject = await BotProjectService.getProjectById(projectId, user);
if (currentProject !== undefined && (await currentProject.exists())) {
- await currentProject.init();
const project = currentProject.getProject();
res.status(200).json({
id: projectId,
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
index 622f27943d..963f170823 100644
--- a/Composer/packages/server/src/models/bot/botProject.ts
+++ b/Composer/packages/server/src/models/bot/botProject.ts
@@ -178,6 +178,7 @@ export class BotProject {
sdk: {
content: sdkSchema,
},
+ default: this.defaultSDKSchema,
diagnostics,
};
};
@@ -250,7 +251,7 @@ export class BotProject {
};
public deleteFile = async (name: string) => {
- if (Path.resolve(name) === 'Main') {
+ if (Path.basename(name, '.dialog') === this.name) {
throw new Error(`Main dialog can't be removed`);
}
@@ -333,7 +334,7 @@ export class BotProject {
try {
await this.fileStorage.rmDir(folderPath);
} catch (e) {
- console.log(e);
+ // pass
}
}
};
@@ -410,10 +411,12 @@ export class BotProject {
if (index === -1) {
throw new Error(`no such file at ${relativePath}`);
}
+
const absolutePath = `${this.dir}/${relativePath}`;
// only write if the file has actually changed
if (this.files[index].content !== content) {
+ this.files[index].content = content;
await this.fileStorage.writeFile(absolutePath, content);
}
@@ -421,8 +424,6 @@ export class BotProject {
// instead of calling stat again which could be expensive
const stats = await this.fileStorage.stat(absolutePath);
- this.files[index].content = content;
-
return stats.lastModified;
};
@@ -433,10 +434,10 @@ export class BotProject {
if (index === -1) {
throw new Error(`no such file at ${relativePath}`);
}
+ this.files.splice(index, 1);
const absolutePath = `${this.dir}/${relativePath}`;
await this.fileStorage.removeFile(absolutePath);
- this.files.splice(index, 1);
};
// ensure dir exist, dir is a absolute dir path
diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
index 0576609c6c..5af12caa27 100644
--- a/Composer/packages/server/src/services/project.ts
+++ b/Composer/packages/server/src/services/project.ts
@@ -4,6 +4,7 @@
import merge from 'lodash/merge';
import find from 'lodash/find';
import { importResolverGenerator, ResolverResource } from '@bfc/shared';
+import extractMemoryPaths from '@bfc/indexers/lib/dialogUtils/extractMemoryPaths';
import { UserIdentity } from '@bfc/plugin-loader';
import { BotProject } from '../models/bot/botProject';
@@ -35,7 +36,7 @@ export class BotProjectService {
public static lgImportResolver(source: string, id: string, projectId: string): ResolverResource {
BotProjectService.initialize();
- const project = BotProjectService.currentBotProjects.find(({ id }) => id === projectId);
+ const project = BotProjectService.getIndexedProjectById(projectId);
if (!project) throw new Error('project not found');
const resource = project.files.reduce((result: ResolverResource[], file) => {
const { name, content } = file;
@@ -50,7 +51,7 @@ export class BotProjectService {
public static luImportResolver(source: string, id: string, projectId: string): ResolverResource {
BotProjectService.initialize();
- const project = BotProjectService.currentBotProjects.find(({ id }) => id === projectId);
+ const project = BotProjectService.getIndexedProjectById(projectId);
if (!project) throw new Error('project not found');
const resource = project.files.reduce((result: ResolverResource[], file) => {
const { name, content } = file;
@@ -88,9 +89,13 @@ export class BotProjectService {
'turn.repeatedIds',
'turn.activityProcessed',
];
+ const projectVariables = BotProjectService.getIndexedProjectById(projectId)
+ ?.files.filter(file => file.name.endsWith('.dialog'))
+ .map(({ content }) => extractMemoryPaths(content));
+
const userDefined: string[] =
- BotProjectService.currentBotProjects[projectId]?.dialogs.reduce((result: string[], dialog) => {
- result = [...dialog.userDefinedVariables, ...result];
+ projectVariables?.reduce((result: string[], variables) => {
+ result = [...variables, ...result];
return result;
}, []) || [];
return [...defaultProperties, ...userDefined];
@@ -180,9 +185,18 @@ export class BotProjectService {
Store.set('projectLocationMap', BotProjectService.projectLocationMap);
};
- public static getProjectById = async (projectId: string, user?: UserIdentity) => {
+ public static getIndexedProjectById(projectId): BotProject | undefined {
+ // use indexed project
+ const indexedCurrentProject = BotProjectService.currentBotProjects.find(({ id }) => id === projectId);
+ if (indexedCurrentProject) return indexedCurrentProject;
+ }
+
+ public static getProjectById = async (projectId: string, user?: UserIdentity): Promise => {
BotProjectService.initialize();
+ const cachedProject = BotProjectService.getIndexedProjectById(projectId);
+ if (cachedProject) return cachedProject;
+
if (!BotProjectService.projectLocationMap?.[projectId]) {
throw new Error('project not found in cache');
} else {
diff --git a/Composer/packages/ui-plugins/expressions/src/index.ts b/Composer/packages/ui-plugins/expressions/src/index.ts
index 991521568b..e2c9d34412 100644
--- a/Composer/packages/ui-plugins/expressions/src/index.ts
+++ b/Composer/packages/ui-plugins/expressions/src/index.ts
@@ -10,6 +10,7 @@ const config: PluginConfig = {
roleSchema: {
[SDKRoles.expression]: {
field: ExpressionField,
+ helpLink: 'https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/common-expression-language',
},
},
};
diff --git a/Composer/packages/ui-plugins/lg/src/LgField.tsx b/Composer/packages/ui-plugins/lg/src/LgField.tsx
index 7f094320cc..ec3ef16ca5 100644
--- a/Composer/packages/ui-plugins/lg/src/LgField.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgField.tsx
@@ -112,7 +112,7 @@ const LgField: React.FC> = props => {
> = props => {
- const { onChange, value, schema } = props;
+ const { onChange, value, schema, placeholder } = props;
const { currentDialog, designerId, luFiles, shellApi, locale, projectId, userSettings } = useShellApi();
const luFile = luFiles.find(f => f.id === `${currentDialog.id}.${locale}`);
@@ -51,13 +51,14 @@ const LuisIntentEditor: React.FC> = props => {
return (
);
};
diff --git a/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx b/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
index 1f18ca6b48..377fd69c70 100644
--- a/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
+++ b/Composer/packages/ui-plugins/prompts/src/PromptField/UserInput.tsx
@@ -20,16 +20,26 @@ const getOptions = (enumSchema: JSONSchema7) => {
return enumSchema.enum.map(o => o as string);
};
+const expectedResponsesPlaceholder = () =>
+ formatMessage(`> add some expected user responses:
+> - Please remind me to '{itemTitle=buy milk}'
+> - remind me to '{itemTitle}'
+> - add '{itemTitle}' to my todo list
+>
+> entity definitions:
+> @ ml itemTitle
+`);
+
const UserInput: React.FC> = props => {
const { onChange, getSchema, value, id, uiOptions, getError, definitions, depth, schema = {} } = props;
const { currentDialog, designerId } = useShellApi();
const { recognizers } = usePluginConfig();
- const { const: $kind } = (schema?.properties?.['$kind'] as any) || {};
+ const { const: $kind } = (schema?.properties?.$kind as { const: string }) || {};
const intentName = new LuMetaData(new LuType($kind).toString(), designerId).toString();
const type = recognizerType(currentDialog);
- const Editor: any = type === SDKKinds.LuisRecognizer && recognizers.find(r => r.id === type)?.editor;
+ const Editor = type === SDKKinds.LuisRecognizer && recognizers.find(r => r.id === type)?.editor;
const intentLabel = formatMessage('Expected responses (intent: #{intentName})', { intentName });
return (
@@ -72,7 +82,7 @@ const UserInput: React.FC> = props => {
{Editor && $kind !== SDKKinds.AttachmentInput && (
- {}} />
+ {}} placeholder={expectedResponsesPlaceholder()} />
)}
{getSchema('defaultLocale') && (
diff --git a/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx b/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
index b1d8e6bcb7..5e43fee025 100644
--- a/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
+++ b/Composer/packages/ui-plugins/select-skill-dialog/src/SkillEndpointField.tsx
@@ -7,7 +7,7 @@ import React from 'react';
import { FieldProps } from '@bfc/extension';
import {
getUiLabel,
- getUISchema,
+ getUIOptions,
getUiPlaceholder,
getUiDescription,
schemaField,
@@ -20,7 +20,7 @@ export const SkillEndpointField: React.FC = props => {
const pluginConfig = usePluginConfig();
const uiOptions = {
- ...getUISchema(schema, pluginConfig.formSchema),
+ ...getUIOptions(schema, pluginConfig.formSchema),
...baseUIOptions,
};