- {formatMessage('Populate your Knowledge Base')}
-
- );
-};
-
-interface FormField {
- urls: string[];
-}
-
-const validateUrls = (urls: string[]) => {
- const errors = Array(urls.length).fill('');
-
- for (let i = 0; i < urls.length; i++) {
- const baseUrl = urls[i].replace(/\/$/, '');
- for (let j = 0; j < urls.length; j++) {
- const candidateUrl = urls[j].replace(/\/$/, '');
- if (baseUrl && candidateUrl && baseUrl === candidateUrl && i !== j) {
- errors[i] = errors[j] = formatMessage('This url is duplicated');
- }
- }
- }
-
- for (let i = 0; i < urls.length; i++) {
- if (urls[i] && !urls[i].startsWith('http://') && !urls[i].startsWith('https://')) {
- errors[i] = formatMessage('A valid url should start with http:// or https://');
- }
- }
-
- return errors;
-};
-
-const formConfig: FieldConfig- - {formatMessage( - 'Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. ' - )} - - {formatMessage('Learn more about knowledge base sources. ')} - - {formatMessage( - 'Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. ' - )} - - {formatMessage('Learn more about QnA Maker SKUs.')} - - -
-
-
- {formData.urls.map((l, index) => {
- return (
-
- {formatMessage('Add additional URL')}
-
- {!isQnAFileselected && (
-
-
-
- updateUrl(index, url)}
- />
- {index !== 0 && (
- removeUrl(index)}
- />
- )}
-
- );
- })}
- {formatMessage('Please select a specific qna file to import QnA')}
- )}
-
+ {isImportedSource && (
+
+ {sourceUrl && (
+
+
+ {groupName}
+
+
+ )}
+ {!sourceUrl && {
+ setEditQnAFile(containerQnAFile);
+ },
+ },
+ ]}
+ overflowItems={
+ [
+ {
+ key: 'edit',
+ name: formatMessage('Show code'),
+ iconProps: { iconName: 'CodeEdit' },
+ onClick: () => {
+ navigateTo(`/bot/${projectId}/knowledge-base/${dialogId}/edit?C=${containerId}`);
+ },
+ },
+ {
+ key: 'delete',
+ iconProps: { iconName: 'Delete' },
+ name: formatMessage('Delete knowledge base'),
+ disabled: dialogId === 'all',
+ onClick: async () => {
+ if (!qnaFile) return;
+ await removeQnAImport({ id: qnaFile.id, sourceId: containerId, projectId });
+ await removeQnAFile({ id: containerId, projectId });
+ },
+ },
+ ] as IOverflowSetItemProps[]
+ }
+ role="menubar"
+ onRenderItem={onRenderItem}
+ onRenderOverflowButton={onRenderOverflowButton}
+ />
+
+ )}
+ {!isImportedSource &&
+ );
+ };
+ if (props) {
+ return (
+ {groupName}
}
+
+ {groupName}
}
+
- {showingQuestions.map((q, qIndex) => {
- if (!isUpdatingIthQnASectionKthQuestion(qnaIndex, qIndex, editMode)) {
- return (
- {
- handleQuestionOnBlur(e);
+ {questions.map((question, qIndex: number) => {
+ const isQuestionEmpty = question.content === '';
+ const isOnlyQuestion = questions.length === 1 && qIndex === 0;
+ return (
+ {
- handleQuestionOnBlur(e);
- }}
- onChange={(e, newValue) => {
- e.preventDefault();
- handleQuestionOnChange(newValue, qnaIndex);
+ {kthSectionIsCreatingQuestion === item.sectionId ? (
+ {
+ const newValue = value?.trim();
+ if (!newValue) {
+ setCreatingQuestionInKthSection('');
+ return;
+ }
+
+ if (isCreatingQnA) {
+ const creatingQnAItem = creatQnAPairSettings.item;
+ const fileId = creatQnAPairSettings.groupKey;
+ if (!creatingQnAItem) return;
+ const updatedItem = {
+ ...creatingQnAItem,
+ Question: newValue,
+ };
+ setCreatQnAPairSettings({
+ ...creatQnAPairSettings,
+ item: updatedItem,
+ });
+ onCreateNewQnAPairsEnd(fileId, updatedItem);
+ } else {
+ onCreateNewQuestion(item.fileId, item.sectionId, newValue);
+ }
+
+ setCreatingQuestionInKthSection('');
}}
- onKeyDown={(e) => handleQuestionKeydown(e)}
+ onChange={() => {}}
+ onFocus={() => setExpandedIndex(index)}
/>
- )}
- {!isCreatingNewQuestionOnIthQnASection(qnaIndex, editMode) && dialogId !== 'all' && (
- handleAddingAlternatives(e, qnaIndex)}
- >
- {formatMessage('add alternative phrasing')}
-
+ ) : (
+ addQuestionButton
)}
);
@@ -397,54 +553,92 @@ const TableView: React.FC
- dialogId !== 'all' ? handleUpdateingAlternatives(e, qnaIndex, qIndex, q.content) : () => {}
- }
- onKeyDown={(e) => {
- e.preventDefault();
- if (e.key === 'Enter') {
- handleUpdateingAlternatives(e, qnaIndex, qIndex, q.content);
- }
- }}
- >
- {isQuestionEmpty &&
- );
- //It is updating this qnaSection's qIndex-th Question
- } else if (isUpdatingIthQnASectionKthQuestion(qnaIndex, qIndex, editMode)) {
- return (
- {formatMessage('Enter a question')}
}
- {!isQuestionEmpty && (
-
- {`${q.content} ${
- qIndex === 0 && !showQnAPairDetails[qnaIndex] ? `(${questions.length})` : ''
- }`}
-
- )}
-
+ {
- handleQuestionOnChange(newValue, qnaIndex);
+ id={question.id}
+ name={question.content}
+ placeholder={formatMessage('Add new question')}
+ required={isOnlyQuestion}
+ requiredMessage={formatMessage('At least one question is required')}
+ resizable={false}
+ styles={editableField}
+ value={question.content}
+ onBlur={(_id, value = '') => {
+ const newValue = value?.trim();
+ const isChanged = question.content !== newValue;
+ if ((!newValue && isOnlyQuestion) || !isChanged) return;
+
+ if (isCreatingQnA) {
+ const creatingQnAItem = creatQnAPairSettings.item;
+ const fileId = creatQnAPairSettings.groupKey;
+ if (!creatingQnAItem) return;
+ const updatedItem = {
+ ...creatingQnAItem,
+ Question: newValue,
+ };
+ setCreatQnAPairSettings({
+ ...creatQnAPairSettings,
+ item: updatedItem,
+ });
+ onCreateNewQnAPairsEnd(fileId, updatedItem);
+ } else {
+ onUpdateQnAQuestion(item.fileId, item.sectionId, question.id, newValue);
+ }
}}
- onKeyDown={(e) => handleQuestionKeydown(e)}
+ onChange={() => {}}
+ onFocus={() => setExpandedIndex(index)}
/>
- );
- }
+
+ );
})}
- {isCreatingNewQuestionOnIthQnASection(qnaIndex, editMode) && dialogId !== 'all' && (
-
- {!isUpdateingIthQnASectionAnswer(qnaIndex, isUpdatingAnswer, editMode) && (
- {
- handleAnswerOnBlur(e);
- }}
- onChange={(e, newValue) => {
- handleAnswerOnChange(newValue, qnaIndex);
- }}
- onKeyDown={(e) => handleAnswerKeydown(e)}
- />
- )}
+ {
+ const newValue = value?.trim();
+ const isChanged = item.Answer !== newValue;
+ if (!newValue || !isChanged) return;
+
+ if (isCreatingQnA) {
+ const creatingQnAItem = creatQnAPairSettings.item;
+ const fileId = creatQnAPairSettings.groupKey;
+ if (!creatingQnAItem) return;
+ const updatedItem = {
+ ...creatingQnAItem,
+ Answer: newValue,
+ };
+ setCreatQnAPairSettings({
+ ...creatQnAPairSettings,
+ item: updatedItem,
+ });
+ onCreateNewQnAPairsEnd(fileId, updatedItem);
+ } else {
+ onUpdateQnAAnswer(item.fileId, item.sectionId, newValue);
+ }
+ }}
+ onChange={() => {}}
+ onFocus={() => setExpandedIndex(index)}
+ />
);
},
},
- ];
- if (dialogId !== 'all') {
- const extraOperations = {
+ {
+ key: 'UsedIn',
+ name: formatMessage('Used In'),
+ fieldName: 'UsedIn',
+ minWidth: 150,
+ maxWidth: 200,
+ isResizable: true,
+ data: 'string',
+ onRender: (item) => {
+ return (
+ (dialogId !== 'all' ? handleUpdateingAnswer(e, qnaIndex, item.Answer) : () => {})}
- onKeyDown={(e) => {
- e.preventDefault();
- if (e.key === 'Enter') {
- handleUpdateingAnswer(e, qnaIndex, item.Answer);
- }
- }}
- >
- {item.Answer || formatMessage('Enter an answer')}
-
- )}
- {isUpdateingIthQnASectionAnswer(qnaIndex, isUpdatingAnswer, editMode) && (
-
+ {item.usedIn.map(({ id, displayName }) => {
+ return (
+ {
+ navigateTo(`/bot/${projectId}/knowledge-base/${id}`);
+ }}
+ >
+ {displayName}
+
+ );
+ })}
+
+ );
+ },
+ },
+ {
key: 'buttons',
name: '',
minWidth: 50,
@@ -452,106 +646,149 @@ const TableView: React.FC
-
- );
- },
- };
- tableColums.splice(3, 0, beenUsedColumn);
- }
return tableColums;
};
+ const [groups, setGroups] = useState
- {item.dialogId}
-
-
+
{defaultRender({
...props,
+ isCollapsable: false,
onRenderColumnHeaderTooltip: (tooltipHostProps) =>
);
},
- [dialogIdRef, showQnAPairDetails]
+ [dialogId]
);
- const onRenderRow = (props) => {
- if (props) {
- return
= (props) => {
onRenderRow={onRenderRow}
/>
+ {editQnAFile && (
+ {
+ setEditQnAFile(undefined);
+ }}
+ onSubmit={onSubmitEditKB}
+ >
+ )}
);
};
diff --git a/Composer/packages/client/src/pages/language-generation/LGPage.tsx b/Composer/packages/client/src/pages/language-generation/LGPage.tsx
index d786f33b01..66921b4237 100644
--- a/Composer/packages/client/src/pages/language-generation/LGPage.tsx
+++ b/Composer/packages/client/src/pages/language-generation/LGPage.tsx
@@ -5,12 +5,11 @@
import { jsx } from '@emotion/core';
import React, { Fragment, useMemo, useCallback, Suspense, useEffect } from 'react';
import formatMessage from 'format-message';
-import { Toggle } from 'office-ui-fabric-react/lib/Toggle';
+import { ActionButton } from 'office-ui-fabric-react/lib/Button';
import { RouteComponentProps, Router } from '@reach/router';
import { useRecoilValue } from 'recoil';
import { LoadingSpinner } from '../../components/LoadingSpinner';
-import { actionButton } from '../language-understanding/styles';
import { navigateTo } from '../../utils/navigation';
import { TestController } from '../../components/TestController/TestController';
import { INavTreeItem } from '../../components/NavTree';
@@ -74,12 +73,12 @@ const LGPage: React.FC> = (props: RouteComponen
}, [dialogId, dialogs, projectId]);
const onToggleEditMode = useCallback(
- (_e, checked) => {
+ (_e) => {
let url = `/bot/${projectId}/language-generation/${dialogId}`;
- if (checked) url += `/edit`;
+ if (!edit) url += `/edit`;
navigateTo(url);
},
- [dialogId, projectId]
+ [dialogId, projectId, edit]
);
const toolbarItems = [
@@ -92,14 +91,9 @@ const LGPage: React.FC> = (props: RouteComponen
const onRenderHeaderContent = () => {
return (
-
+ {edit ? formatMessage('Hide code') : formatMessage('Show code')}
+
);
};
diff --git a/Composer/packages/client/src/pages/language-generation/code-editor.tsx b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
index 30e5ec6aba..aa6cfd03ac 100644
--- a/Composer/packages/client/src/pages/language-generation/code-editor.tsx
+++ b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
@@ -13,7 +13,7 @@ import { RouteComponentProps } from '@reach/router';
import querystring from 'query-string';
import { CodeEditorSettings } from '@bfc/shared';
import { useRecoilValue } from 'recoil';
-import { LgFile } from '@bfc/shared/src/types/indexers';
+import { LgFile } from '@bfc/extension-client';
import { localeState, lgFilesState, settingsState } from '../../recoilModel/atoms/botState';
import { userSettingsState, dispatcherState } from '../../recoilModel';
diff --git a/Composer/packages/client/src/pages/language-generation/table-view.tsx b/Composer/packages/client/src/pages/language-generation/table-view.tsx
index 11dccf3da1..cdead54f70 100644
--- a/Composer/packages/client/src/pages/language-generation/table-view.tsx
+++ b/Composer/packages/client/src/pages/language-generation/table-view.tsx
@@ -21,11 +21,11 @@ import { lgUtil } from '@bfc/indexers';
import { EditableField } from '../../components/EditableField';
import { navigateTo } from '../../utils/navigation';
-import { actionButton, formCell } from '../language-understanding/styles';
+import { actionButton, formCell, editableFieldContainer } from '../language-understanding/styles';
import {
dispatcherState,
- localeState,
lgFilesState,
+ localeState,
settingsState,
validateDialogSelectorFamily,
} from '../../recoilModel';
@@ -57,7 +57,7 @@ const TableView: React.FC = (props) => {
const activeDialog = dialogs.find(({ id }) => id === dialogId);
- const [focusedIndex, setFocusedIndex] = useState(0);
+ //const [focusedIndex, setFocusedIndex] = useState(0);
useEffect(() => {
if (!file || isEmpty(file)) return;
@@ -86,7 +86,7 @@ const TableView: React.FC = (props) => {
} as LgTemplate,
};
createLgTemplate(payload);
- setFocusedIndex(file.templates.length);
+ //setFocusedIndex(file.templates.length);
}
}, [file]);
@@ -99,7 +99,7 @@ const TableView: React.FC = (props) => {
projectId,
};
removeLgTemplate(payload);
- setFocusedIndex(file.templates.findIndex((item) => item.name === name));
+ //setFocusedIndex(file.templates.findIndex((item) => item.name === name));
}
},
[file]
@@ -116,7 +116,7 @@ const TableView: React.FC = (props) => {
projectId,
};
copyLgTemplate(payload);
- setFocusedIndex(file.templates.length);
+ //setFocusedIndex(file.templates.length);
}
},
[file]
@@ -209,6 +209,7 @@ const TableView: React.FC = (props) => {
= (props) => {
= (props) => {
= (props) => {
= (props) => {
columns={getTableColums()}
componentRef={listRef}
getKey={getKeyCallback}
- initialFocusedIndex={focusedIndex}
+ //initialFocusedIndex={focusedIndex}
items={templatesToRender}
// getKey={item => item.name}
layoutMode={DetailsListLayoutMode.justified}
diff --git a/Composer/packages/client/src/pages/language-understanding/LUPage.tsx b/Composer/packages/client/src/pages/language-understanding/LUPage.tsx
index 4cad612016..87ed81d6be 100644
--- a/Composer/packages/client/src/pages/language-understanding/LUPage.tsx
+++ b/Composer/packages/client/src/pages/language-understanding/LUPage.tsx
@@ -4,7 +4,7 @@
import { jsx } from '@emotion/core';
import React, { Fragment, useMemo, Suspense, useCallback, useEffect } from 'react';
import formatMessage from 'format-message';
-import { Toggle } from 'office-ui-fabric-react/lib/Toggle';
+import { ActionButton } from 'office-ui-fabric-react/lib/Button';
import { RouteComponentProps, Router } from '@reach/router';
import { useRecoilValue } from 'recoil';
@@ -16,7 +16,6 @@ import { Page } from '../../components/Page';
import { validateDialogSelectorFamily } from '../../recoilModel';
import TableView from './table-view';
-import { actionButton } from './styles';
const CodeEditor = React.lazy(() => import('./code-editor'));
const LUPage: React.FC {
+ (_e) => {
let url = `/bot/${projectId}/language-understanding/${dialogId}`;
- if (checked) url += `/edit`;
+ if (!edit) url += `/edit`;
navigateTo(url);
},
- [dialogId, projectId]
+ [dialogId, projectId, edit]
);
const toolbarItems = [
@@ -83,19 +82,13 @@ const LUPage: React.FC {
- if (!isRoot || edit) {
+ if (!isRoot) {
return (
-
+ {edit ? formatMessage('Hide code') : formatMessage('Show code')}
+
);
}
-
return null;
};
diff --git a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
index 739dbd022d..c695cc5a7f 100644
--- a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
+++ b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
@@ -125,10 +125,12 @@ const CodeEditor: React.FC = (props) => {
[file, intent, projectId]
);
+ const luFeatures = settings?.luFeatures || {};
const luOption = {
projectId,
fileId: file?.id || dialogId,
sectionId: intent?.Name,
+ luFeatures,
};
const handleSettingsChange = (settings: Partial) => {
@@ -158,6 +160,7 @@ const CodeEditor: React.FC = (props) => {
editorSettings={userSettings.codeEditor}
luOption={{
fileId: dialogId,
+ luFeatures,
}}
options={{
readOnly: true,
diff --git a/Composer/packages/client/src/pages/language-understanding/styles.ts b/Composer/packages/client/src/pages/language-understanding/styles.ts
index f28f91f98f..879c07e14c 100644
--- a/Composer/packages/client/src/pages/language-understanding/styles.ts
+++ b/Composer/packages/client/src/pages/language-understanding/styles.ts
@@ -105,3 +105,7 @@ export const diffEditorContent = css`
export const dropdown = {
dropdown: { width: '50%', maxWidth: 300, minWidth: 100 },
};
+
+export const editableFieldContainer = css`
+ outline: none;
+`;
diff --git a/Composer/packages/client/src/pages/language-understanding/table-view.tsx b/Composer/packages/client/src/pages/language-understanding/table-view.tsx
index bdbf22bdfb..9466ec6644 100644
--- a/Composer/packages/client/src/pages/language-understanding/table-view.tsx
+++ b/Composer/packages/client/src/pages/language-understanding/table-view.tsx
@@ -32,7 +32,7 @@ import {
validateDialogSelectorFamily,
} from '../../recoilModel';
-import { formCell, luPhraseCell, tableCell } from './styles';
+import { formCell, luPhraseCell, tableCell, editableFieldContainer } from './styles';
interface TableViewProps extends RouteComponentProps<{ dialogId: string; projectId: string }> {
dialogId: string;
projectId: string;
@@ -177,6 +177,7 @@ const TableView: React.FC = (props) => {
= (props) => {
= (props) => {
= (props) => {
{
@@ -70,25 +80,25 @@ export default function useNotifications(projectId: string, filter?: string) {
});
dialogs.forEach((dialog) => {
- dialog.diagnostics.map((diagnostic) => {
+ dialog.diagnostics.forEach((diagnostic) => {
const location = `${dialog.id}.dialog`;
notifications.push(new DialogNotification(projectId, dialog.id, location, diagnostic));
});
});
getReferredLuFiles(luFiles, dialogs).forEach((lufile) => {
- lufile.diagnostics.map((diagnostic) => {
+ lufile.diagnostics.forEach((diagnostic) => {
const location = `${lufile.id}.lu`;
notifications.push(new LuNotification(projectId, lufile.id, location, diagnostic, lufile, dialogs));
});
});
lgFiles.forEach((lgFile) => {
- lgFile.diagnostics.map((diagnostic) => {
+ lgFile.diagnostics.forEach((diagnostic) => {
const location = `${lgFile.id}.lg`;
notifications.push(new LgNotification(projectId, lgFile.id, location, diagnostic, lgFile, dialogs));
});
});
qnaFiles.forEach((qnaFile) => {
- get(qnaFile, 'diagnostics', []).map((diagnostic) => {
+ get(qnaFile, 'diagnostics', []).forEach((diagnostic) => {
const location = `${qnaFile.id}.qna`;
notifications.push(new QnANotification(projectId, qnaFile.id, location, diagnostic));
});
diff --git a/Composer/packages/client/src/pages/plugin/PluginPageContainer.tsx b/Composer/packages/client/src/pages/plugin/PluginPageContainer.tsx
new file mode 100644
index 0000000000..fd101bb17d
--- /dev/null
+++ b/Composer/packages/client/src/pages/plugin/PluginPageContainer.tsx
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React from 'react';
+import { RouteComponentProps } from '@reach/router';
+
+import { PluginHost } from '../../components/PluginHost/PluginHost';
+import { useShell } from '../../shell';
+
+const PluginPageContainer: React.FC> = (
+ props
+) => {
+ const { pluginId, bundleId, projectId } = props;
+ const shell = useShell('DesignPage', projectId as string);
+
+ if (!pluginId || !bundleId || !projectId) {
+ return null;
+ }
+
+ return > = (props) => {
- const { pluginId } = props;
-
- return ();
const settings = useRecoilValue(settingsState(projectId));
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const publishTypes = useRecoilValue(publishTypesState(projectId));
const publishHistory = useRecoilValue(publishHistoryState(projectId));
diff --git a/Composer/packages/client/src/pages/publish/createPublishTarget.tsx b/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
index cc9fe43042..f897f60595 100644
--- a/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
+++ b/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
@@ -73,8 +73,8 @@ const CreatePublishTarget: React.FC = (props) => {
return targetType ? props.types.find((t) => t.name === targetType)?.schema : undefined;
}, [props.targets, targetType]);
- const hasView = useMemo(() => {
- return targetType ? props.types.find((t) => t.name === targetType)?.hasView : undefined;
+ const targetBundleId = useMemo(() => {
+ return targetType ? props.types.find((t) => t.name === targetType)?.bundleId : undefined;
}, [props.targets, targetType]);
const updateName = (e, newName) => {
@@ -85,7 +85,7 @@ const CreatePublishTarget: React.FC = (props) => {
const saveDisabled = useMemo(() => {
const disabled = !targetType || !name || !!errorMessage;
- if (hasView) {
+ if (targetBundleId) {
// plugin config must also be valid
return disabled || !pluginConfigIsValid;
}
@@ -107,13 +107,14 @@ const CreatePublishTarget: React.FC = (props) => {
};
const publishTargetContent = useMemo(() => {
- if (hasView && targetType) {
+ if (targetBundleId && targetType) {
// render custom plugin view
return (
= (props) => {
);
- }, [targetType, instructions, schema, hasView, saveDisabled]);
+ }, [targetType, instructions, schema, targetBundleId, saveDisabled]);
return (
diff --git a/Composer/packages/client/src/pages/setting/SettingsPage.tsx b/Composer/packages/client/src/pages/setting/SettingsPage.tsx
index 350fa2ed46..37b12d8b4b 100644
--- a/Composer/packages/client/src/pages/setting/SettingsPage.tsx
+++ b/Composer/packages/client/src/pages/setting/SettingsPage.tsx
@@ -37,7 +37,7 @@ const getProjectLink = (path: string, id?: string) => {
const SettingPage: React.FC = () => {
const projectId = useRecoilValue(currentProjectIdState);
const {
- deleteBotProject,
+ deleteBot: deleteBotProject,
addLanguageDialogBegin,
addLanguageDialogCancel,
delLanguageDialogBegin,
diff --git a/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx b/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx
index d4c781d095..4af89f7a76 100644
--- a/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx
+++ b/Composer/packages/client/src/pages/setting/dialog-settings/DialogSettings.tsx
@@ -14,7 +14,13 @@ import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
import cloneDeep from 'lodash/cloneDeep';
import { Label } from 'office-ui-fabric-react/lib/Label';
-import { dispatcherState, userSettingsState, botNameState, localeState, settingsState } from '../../../recoilModel';
+import {
+ dispatcherState,
+ userSettingsState,
+ botDisplayNameState,
+ localeState,
+ settingsState,
+} from '../../../recoilModel';
import { languageListTemplates } from '../../../components/MultiLanguage';
import { settingsEditor, toolbar } from './style';
@@ -22,7 +28,7 @@ import { BotSettings } from './constants';
export const DialogSettings: React.FC> = (props) => {
const { projectId = '' } = props;
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const locale = useRecoilValue(localeState(projectId));
const settings = useRecoilValue(settingsState(projectId));
const userSettings = useRecoilValue(userSettingsState);
diff --git a/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx b/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx
index e687032207..16913d5f23 100644
--- a/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx
+++ b/Composer/packages/client/src/pages/setting/extensions/ExtensionSearchResults.tsx
@@ -16,15 +16,7 @@ import {
import { ScrollablePane } from 'office-ui-fabric-react/lib/ScrollablePane';
import { Sticky } from 'office-ui-fabric-react/lib/Sticky';
import { ShimmeredDetailsList } from 'office-ui-fabric-react/lib/ShimmeredDetailsList';
-
-// TODO: extract to shared?
-export type ExtensionSearchResult = {
- id: string;
- keywords: string[];
- version: string;
- description: string;
- url: string;
-};
+import { ExtensionSearchResult } from '@bfc/extension-client';
type ExtensionSearchResultsProps = {
results: ExtensionSearchResult[];
diff --git a/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx b/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
index fc15946802..a2b26e6913 100644
--- a/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
+++ b/Composer/packages/client/src/pages/setting/extensions/Extensions.tsx
@@ -20,13 +20,12 @@ import { ShimmeredDetailsList } from 'office-ui-fabric-react/lib/ShimmeredDetail
import formatMessage from 'format-message';
import { useRecoilValue, selector } from 'recoil';
import { NeutralColors } from '@uifabric/fluent-theme';
+import { ExtensionMetadata, ExtensionSearchResult } from '@bfc/extension-client';
-import { ExtensionConfig } from '../../../recoilModel/types';
import { Toolbar, IToolbarItem } from '../../../components/Toolbar';
import { dispatcherState, extensionsState } from '../../../recoilModel';
import { InstallExtensionDialog } from './InstallExtensionDialog';
-import { ExtensionSearchResult } from './ExtensionSearchResults';
const remoteExtensionsState = selector({
key: 'remoteExtensions',
@@ -45,11 +44,11 @@ const Extensions: React.FC = () => {
// if a string, its the id of the extension being updated
const [isUpdating, setIsUpdating] = useState(false);
const [showNewModal, setShowNewModal] = useState(false);
- const [selectedExtensions, setSelectedExtensions] = useState([]);
+ const [selectedExtensions, setSelectedExtensions] = useState([]);
const selection = useRef(
new Selection({
onSelectionChanged: () => {
- setSelectedExtensions(selection.getSelection() as ExtensionConfig[]);
+ setSelectedExtensions(selection.getSelection() as ExtensionMetadata[]);
},
})
).current;
@@ -91,7 +90,7 @@ const Extensions: React.FC = () => {
minWidth: 100,
maxWidth: 150,
isResizable: true,
- onRender: (item: ExtensionConfig) => {
+ onRender: (item: ExtensionMetadata) => {
return (
> = (props) => {
const { projectId = '' } = props;
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const settings = useRecoilValue(settingsState(projectId));
const ejectedRuntimeExists = useRecoilValue(isEjectRuntimeExistState(projectId));
diff --git a/Composer/packages/client/src/pages/skills/index.tsx b/Composer/packages/client/src/pages/skills/index.tsx
index bdfa8467b9..12df39ccaf 100644
--- a/Composer/packages/client/src/pages/skills/index.tsx
+++ b/Composer/packages/client/src/pages/skills/index.tsx
@@ -9,7 +9,7 @@ import formatMessage from 'format-message';
import { useRecoilValue } from 'recoil';
import { SkillSetting } from '@bfc/shared';
-import { dispatcherState, settingsState, botNameState } from '../../recoilModel';
+import { dispatcherState, settingsState, botDisplayNameState } from '../../recoilModel';
import { Toolbar, IToolbarItem } from '../../components/Toolbar';
import { TestController } from '../../components/TestController/TestController';
import { CreateSkillModal } from '../../components/CreateSkillModal';
@@ -22,7 +22,7 @@ const Skills: React.FC> = (props) =>
const { projectId = '' } = props;
const [showAddSkillDialogModal, setShowAddSkillDialogModal] = useState(false);
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const settings = useRecoilValue(settingsState(projectId));
const { addSkill, setSettings } = useRecoilValue(dispatcherState);
diff --git a/Composer/packages/client/src/plugins.ts b/Composer/packages/client/src/plugins.ts
index cd8b8f9dc4..f6db7a8b0c 100644
--- a/Composer/packages/client/src/plugins.ts
+++ b/Composer/packages/client/src/plugins.ts
@@ -29,7 +29,7 @@ const mergeArrays: MergeWithCustomizer = (objValue, srcValue, key) => {
const defaultPlugin: Required = {
uiSchema: {},
- flowWidgets: {},
+ widgets: {},
};
export function mergePluginConfigs(...plugins: PluginConfig[]): Required {
diff --git a/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx b/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx
index 892e7b7455..c6f7852039 100644
--- a/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx
+++ b/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx
@@ -14,7 +14,6 @@ import { UndoRoot } from './undo/history';
import { prepareAxios } from './../utils/auth';
import createDispatchers, { Dispatcher } from './dispatchers';
import {
- botProjectsSpaceState,
dialogsState,
luFilesState,
qnaFilesState,
@@ -23,7 +22,10 @@ import {
dialogSchemasState,
settingsState,
filePersistenceState,
+ botProjectFileState,
+ jsonSchemaFilesState,
} from './atoms';
+import { botsForFilePersistenceSelector, formDialogSchemasSelectorFamily } from './selectors';
const getBotAssets = async (projectId, snapshot: Snapshot): Promise => {
const result = await Promise.all([
@@ -34,6 +36,9 @@ const getBotAssets = async (projectId, snapshot: Snapshot): Promise =
snapshot.getPromise(skillManifestsState(projectId)),
snapshot.getPromise(settingsState(projectId)),
snapshot.getPromise(dialogSchemasState(projectId)),
+ snapshot.getPromise(botProjectFileState(projectId)),
+ snapshot.getPromise(formDialogSchemasSelectorFamily(projectId)),
+ snapshot.getPromise(jsonSchemaFilesState(projectId)),
]);
return {
projectId,
@@ -44,6 +49,9 @@ const getBotAssets = async (projectId, snapshot: Snapshot): Promise =
skillManifests: result[4],
setting: result[5],
dialogSchemas: result[6],
+ botProjectFile: result[7],
+ formDialogSchemas: result[8],
+ jsonSchemaFiles: result[9],
};
};
@@ -85,10 +93,11 @@ const InitDispatcher = ({ onLoad }) => {
export const DispatcherWrapper = ({ children }) => {
const [loaded, setLoaded] = useState(false);
- const botProjects = useRecoilValue(botProjectsSpaceState);
+ const botProjects = useRecoilValue(botsForFilePersistenceSelector);
useRecoilTransactionObserver_UNSTABLE(async ({ snapshot, previousSnapshot }) => {
- for (const projectId of botProjects) {
+ const botsForFilePersistence = await snapshot.getPromise(botsForFilePersistenceSelector);
+ for (const projectId of botsForFilePersistence) {
const assets = await getBotAssets(projectId, snapshot);
const previousAssets = await getBotAssets(projectId, previousSnapshot);
const filePersistence = await snapshot.getPromise(filePersistenceState(projectId));
diff --git a/Composer/packages/client/src/recoilModel/atoms/appState.ts b/Composer/packages/client/src/recoilModel/atoms/appState.ts
index ffa97d2f58..906ffd8832 100644
--- a/Composer/packages/client/src/recoilModel/atoms/appState.ts
+++ b/Composer/packages/client/src/recoilModel/atoms/appState.ts
@@ -2,7 +2,8 @@
// Licensed under the MIT License.
import { atom, atomFamily } from 'recoil';
-import { ProjectTemplate, UserSettings } from '@bfc/shared';
+import { FormDialogSchemaTemplate, ProjectTemplate, UserSettings } from '@bfc/shared';
+import { ExtensionMetadata } from '@bfc/extension-client';
import {
StorageFolder,
@@ -11,7 +12,6 @@ import {
AppUpdateState,
BoilerplateVersion,
Notification,
- ExtensionConfig,
} from '../../recoilModel/types';
import { getUserSettings } from '../utils';
import onboardingStorage from '../../utils/onboardingStorage';
@@ -165,22 +165,37 @@ export const notificationsState = atomFamily({
},
});
-export const extensionsState = atom({
+export const extensionsState = atom[]>({
key: getFullyQualifiedKey('extensions'),
default: [],
});
+export const botProjectIdsState = atom({
+ key: getFullyQualifiedKey('botProjectIdsState'),
+ default: [],
+});
+
+export const currentProjectIdState = atom({
+ key: getFullyQualifiedKey('currentProjectId'),
+ default: '',
+});
+
+export const botProjectSpaceLoadedState = atom({
+ key: getFullyQualifiedKey('botProjectSpaceLoadedState'),
+ default: false,
+});
+
export const botOpeningState = atom({
- key: getFullyQualifiedKey('botOpening'),
+ key: getFullyQualifiedKey('botOpeningState'),
default: false,
});
-export const botProjectsSpaceState = atom({
- key: getFullyQualifiedKey('botProjectsSpace'),
+export const formDialogLibraryTemplatesState = atom({
+ key: getFullyQualifiedKey('formDialogLibraryTemplates'),
default: [],
});
-export const currentProjectIdState = atom({
- key: getFullyQualifiedKey('currentProjectId'),
- default: '',
+export const formDialogGenerationProgressingState = atom({
+ key: getFullyQualifiedKey('formDialogGenerationProgressing'),
+ default: false,
});
diff --git a/Composer/packages/client/src/recoilModel/atoms/botState.ts b/Composer/packages/client/src/recoilModel/atoms/botState.ts
index 5880e99a3d..0ecd54c188 100644
--- a/Composer/packages/client/src/recoilModel/atoms/botState.ts
+++ b/Composer/packages/client/src/recoilModel/atoms/botState.ts
@@ -1,24 +1,29 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { atomFamily } from 'recoil';
import {
+ BotProjectFile,
+ BotProjectSpace,
+ BotSchemas,
+ Diagnostic,
DialogInfo,
DialogSchemaFile,
- Diagnostic,
+ DialogSetting,
+ FormDialogSchema,
+ JsonSchemaFile,
LgFile,
LuFile,
QnAFile,
- BotSchemas,
Skill,
- DialogSetting,
} from '@bfc/shared';
+import { atomFamily } from 'recoil';
-import { BotLoadError, DesignPageLocation, QnAAllUpViewStatus } from '../../recoilModel/types';
+import { BotLoadError, DesignPageLocation } from '../../recoilModel/types';
import FilePersistence from '../persistence/FilePersistence';
-import { PublishType, BreadcrumbItem } from './../../recoilModel/types';
import { BotStatus } from './../../constants';
+import { BreadcrumbItem, PublishType } from './../../recoilModel/types';
+
const getFullyQualifiedKey = (value: string) => {
return `Bot_${value}_State`;
};
@@ -42,8 +47,8 @@ export const dialogSchemasState = atomFamily({
default: [],
});
-export const botNameState = atomFamily({
- key: getFullyQualifiedKey('botName'),
+export const botDisplayNameState = atomFamily({
+ key: getFullyQualifiedKey('botDisplayName'),
default: (id) => {
return '';
},
@@ -218,10 +223,13 @@ export const onDelLanguageDialogCompleteState = atomFamily({
default: { func: undefined },
});
-export const projectMetaDataState = atomFamily({
+export const projectMetaDataState = atomFamily<{ isRootBot: boolean; isRemote: boolean }, string>({
key: getFullyQualifiedKey('projectsMetaDataState'),
- default: (id) => {
- return {};
+ default: () => {
+ return {
+ isRootBot: false,
+ isRemote: false,
+ };
},
});
@@ -234,9 +242,27 @@ export const designPageLocationState = atomFamily({
},
});
-export const qnaAllUpViewStatusState = atomFamily({
- key: getFullyQualifiedKey('qnaAllUpViewStatusState'),
- default: QnAAllUpViewStatus.Success,
+export const showCreateQnAFromUrlDialogState = atomFamily({
+ key: getFullyQualifiedKey('showCreateQnAFromUrlDialog'),
+ default: false,
+});
+
+export const showCreateQnAFromUrlDialogWithScratchState = atomFamily({
+ key: getFullyQualifiedKey('showCreateQnAFromUrlDialogWithScratch'),
+ default: false,
+});
+
+export const showCreateQnAFromScratchDialogState = atomFamily({
+ key: getFullyQualifiedKey('showCreateQnAFromScratchDialog'),
+ default: false,
+});
+export const onCreateQnAFromUrlDialogCompleteState = atomFamily<{ func: undefined | (() => void) }, string>({
+ key: getFullyQualifiedKey('onCreateQnAFromUrlDialogCompleteState'),
+ default: { func: undefined },
+});
+export const onCreateQnAFromScratchDialogCompleteState = atomFamily<{ func: undefined | (() => void) }, string>({
+ key: getFullyQualifiedKey('onCreateQnAFromScratchDialogCompleteState'),
+ default: { func: undefined },
});
export const isEjectRuntimeExistState = atomFamily({
@@ -249,8 +275,46 @@ export const qnaFilesState = atomFamily({
default: [],
});
+export const jsonSchemaFilesState = atomFamily({
+ key: getFullyQualifiedKey('jsonSchemaFiles'),
+ default: [],
+});
+
export const filePersistenceState = atomFamily({
key: getFullyQualifiedKey('filePersistence'),
default: {} as FilePersistence,
dangerouslyAllowMutability: true,
});
+
+export const formDialogSchemaIdsState = atomFamily({
+ key: getFullyQualifiedKey('formDialogSchemaIds'),
+ default: [],
+});
+
+export const formDialogSchemaState = atomFamily({
+ key: getFullyQualifiedKey('formDialogSchema'),
+ default: {
+ id: '',
+ content: '',
+ } as FormDialogSchema,
+});
+
+export const botProjectFileState = atomFamily({
+ key: getFullyQualifiedKey('botProjectFile'),
+ default: {
+ content: {} as BotProjectSpace,
+ id: '',
+ lastModified: '',
+ },
+});
+
+export const botErrorState = atomFamily({
+ key: getFullyQualifiedKey('botError'),
+ default: undefined,
+});
+
+// Object key to identify the skill in BotProject file and settings.skill
+export const botNameIdentifierState = atomFamily({
+ key: getFullyQualifiedKey('botNameIdentifier'),
+ default: '',
+});
diff --git a/Composer/packages/client/src/recoilModel/atoms/index.ts b/Composer/packages/client/src/recoilModel/atoms/index.ts
index 35425c3954..6e08aef7b9 100644
--- a/Composer/packages/client/src/recoilModel/atoms/index.ts
+++ b/Composer/packages/client/src/recoilModel/atoms/index.ts
@@ -3,3 +3,4 @@
export * from './appState';
export * from './botState';
+export * from './zoomState';
diff --git a/Composer/packages/client/src/recoilModel/atoms/zoomState.ts b/Composer/packages/client/src/recoilModel/atoms/zoomState.ts
new file mode 100644
index 0000000000..f574293598
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/atoms/zoomState.ts
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { atom } from 'recoil';
+import { ZoomInfo } from '@bfc/shared';
+
+const getFullyQualifiedKey = (value: string) => {
+ return `Zoom_${value}_State`;
+};
+
+export const rateInfoState = atom({
+ key: getFullyQualifiedKey('rateInfo'),
+ default: {
+ rateList: [0.25, 0.33, 0.5, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.75, 2, 2.5, 3, 4, 5],
+ maxRate: 3,
+ minRate: 0.5,
+ currentRate: 1,
+ },
+});
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/application.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/application.test.tsx
index e41bf2110f..0609f4fd61 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/application.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/application.test.tsx
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilState, useRecoilValue } from 'recoil';
-import { act, RenderHookResult, HookResult } from '@bfc/test-utils/lib/hooks';
+import { act, RenderHookResult, HookResult } from '@botframework-composer/test-utils/lib/hooks';
// eslint-disable-next-line lodash/import-scope
import debounce from 'lodash/debounce';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/botProjectFile.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/botProjectFile.test.tsx
new file mode 100644
index 0000000000..678d906e3d
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/botProjectFile.test.tsx
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { selector, useRecoilValue, selectorFamily, useRecoilState } from 'recoil';
+import { act, RenderHookResult, HookResult } from '@botframework-composer/test-utils/lib/hooks';
+import noop from 'lodash/noop';
+
+import { botProjectFileDispatcher } from '../botProjectFile';
+import { renderRecoilHook } from '../../../../__tests__/testUtils';
+import {
+ botDisplayNameState,
+ botErrorState,
+ botNameIdentifierState,
+ botProjectFileState,
+ botProjectIdsState,
+ currentProjectIdState,
+ locationState,
+ projectMetaDataState,
+} from '../../atoms';
+import { dispatcherState } from '../../DispatcherWrapper';
+import { Dispatcher } from '..';
+
+jest.mock('../../../utils/httpUtil');
+const rootBotProjectId = '2345.32324';
+const testSkillId = '123.1sd23';
+
+describe('Bot Project File dispatcher', () => {
+ const skillsDataSelector = selectorFamily({
+ key: 'skillsDataSelector-botProjectFile',
+ get: (skillId: string) => noop,
+ set: (skillId: string) => ({ set }, stateUpdater: any) => {
+ const { botNameIdentifier, location } = stateUpdater;
+ set(botNameIdentifierState(skillId), botNameIdentifier);
+ set(locationState(skillId), location);
+ },
+ });
+
+ const botStatesSelector = selector({
+ key: 'botStatesSelector',
+ get: ({ get }) => {
+ const botProjectIds = get(botProjectIdsState);
+ const botProjectData: { [projectName: string]: { botDisplayName: string; botError: any; location: string } } = {};
+ botProjectIds.map((projectId) => {
+ const botDisplayName = get(botDisplayNameState(projectId));
+ const botNameIdentifier = get(botNameIdentifierState(projectId));
+ const botError = get(botErrorState(projectId));
+ const location = get(locationState(projectId));
+ if (botNameIdentifier) {
+ botProjectData[botNameIdentifier] = {
+ botDisplayName,
+ location,
+ botError,
+ };
+ }
+ });
+ return botProjectData;
+ },
+ });
+
+ const useRecoilTestHook = () => {
+ const botName = useRecoilValue(botDisplayNameState(rootBotProjectId));
+ const botProjectFile = useRecoilValue(botProjectFileState(rootBotProjectId));
+ const currentDispatcher = useRecoilValue(dispatcherState);
+ const botStates = useRecoilValue(botStatesSelector);
+ const [skillsData, setSkillsData] = useRecoilState(skillsDataSelector(testSkillId));
+
+ return {
+ botName,
+ currentDispatcher,
+ botProjectFile,
+ botStates,
+ skillsData,
+ setSkillsData,
+ };
+ };
+
+ let renderedComponent: HookResult>, dispatcher: Dispatcher;
+ beforeEach(() => {
+ const rendered: RenderHookResult> = renderRecoilHook(
+ useRecoilTestHook,
+ {
+ states: [
+ { recoilState: currentProjectIdState, initialValue: rootBotProjectId },
+ {
+ recoilState: botProjectFileState(rootBotProjectId),
+ initialValue: {
+ content: {
+ $schema: '',
+ name: 'TesterBot',
+ workspace: 'file:///Users/tester/Desktop/LoadedBotProject/TesterBot',
+ skills: {},
+ },
+ },
+ },
+ {
+ recoilState: projectMetaDataState(rootBotProjectId),
+ initialValue: {
+ isRootBot: true,
+ },
+ },
+ { recoilState: botProjectIdsState, initialValue: [rootBotProjectId] },
+ ],
+ dispatcher: {
+ recoilState: dispatcherState,
+ initialValue: {
+ botProjectFileDispatcher,
+ },
+ },
+ }
+ );
+ renderedComponent = rendered.result;
+ dispatcher = renderedComponent.current.currentDispatcher;
+ });
+
+ it('should add a local skill to bot project file', async () => {
+ await act(async () => {
+ renderedComponent.current.setSkillsData({
+ location: 'Users/tester/Desktop/LoadedBotProject/Todo-Skill',
+ botNameIdentifier: 'todoSkill',
+ });
+ });
+
+ await act(async () => {
+ dispatcher.addLocalSkillToBotProjectFile(testSkillId);
+ });
+
+ expect(renderedComponent.current.botProjectFile.content.skills.todoSkill.workspace).toBe(
+ 'file:///Users/tester/Desktop/LoadedBotProject/Todo-Skill'
+ );
+ expect(renderedComponent.current.botProjectFile.content.skills.todoSkill.remote).toBeFalsy();
+ });
+
+ it('should add a remote skill to bot project file', async () => {
+ const manifestUrl = 'https://test-dev.azurewebsites.net/manifests/test-2-1-preview-1-manifest.json';
+ await act(async () => {
+ renderedComponent.current.setSkillsData({
+ location: manifestUrl,
+ botNameIdentifier: 'oneNoteSkill',
+ });
+ });
+
+ await act(async () => {
+ dispatcher.addRemoteSkillToBotProjectFile(testSkillId, manifestUrl, 'remote');
+ });
+
+ expect(renderedComponent.current.botProjectFile.content.skills.oneNoteSkill.manifest).toBe(manifestUrl);
+ expect(renderedComponent.current.botProjectFile.content.skills.oneNoteSkill.workspace).toBeUndefined();
+ expect(renderedComponent.current.botProjectFile.content.skills.oneNoteSkill.endpointName).toBe('remote');
+ });
+
+ it('should remove a skill from the bot project file', async () => {
+ const manifestUrl = 'https://test-dev.azurewebsites.net/manifests/test-2-1-preview-1-manifest.json';
+ await act(async () => {
+ renderedComponent.current.setSkillsData({
+ location: manifestUrl,
+ botNameIdentifier: 'oneNoteSkill',
+ });
+ });
+
+ await act(async () => {
+ dispatcher.addRemoteSkillToBotProjectFile(testSkillId, manifestUrl, 'remote');
+ });
+ expect(renderedComponent.current.botProjectFile.content.skills.oneNoteSkill.manifest).toBe(manifestUrl);
+
+ await act(async () => {
+ dispatcher.removeSkillFromBotProjectFile(testSkillId);
+ });
+ expect(renderedComponent.current.botProjectFile.content.skills.oneNoteSkill).toBeUndefined();
+ });
+});
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialog.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialog.test.tsx
index 6e07c5aca1..ba7ea87a79 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialog.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialog.test.tsx
@@ -3,7 +3,7 @@
import { useRecoilValue } from 'recoil';
import test from '@bfc/indexers';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { dialogsDispatcher } from '../dialogs';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
@@ -45,6 +45,12 @@ jest.mock('@bfc/indexers', () => {
content,
}),
},
+ qnaIndexer: {
+ parse: (id, content) => ({
+ id,
+ content,
+ }),
+ },
lgUtil: {
parse: (id, content) => ({
id,
@@ -57,6 +63,12 @@ jest.mock('@bfc/indexers', () => {
content,
}),
},
+ qnaUtil: {
+ parse: (id, content) => ({
+ id,
+ content,
+ }),
+ },
};
});
@@ -120,8 +132,9 @@ describe('dialog dispatcher', () => {
states: [
{ recoilState: dialogsState(projectId), initialValue: [{ id: '1' }, { id: '2' }] },
{ recoilState: dialogSchemasState(projectId), initialValue: [{ id: '1' }, { id: '2' }] },
- { recoilState: lgFilesState(projectId), initialValue: [{ id: '1.lg' }, { id: '2' }] },
- { recoilState: luFilesState(projectId), initialValue: [{ id: '1.lu' }, { id: '2' }] },
+ { recoilState: lgFilesState(projectId), initialValue: [{ id: '1.en-us' }, { id: '2.en-us' }] },
+ { recoilState: luFilesState(projectId), initialValue: [{ id: '1.en-us' }, { id: '2.en-us' }] },
+ { recoilState: qnaFilesState(projectId), initialValue: [{ id: '1.en-us' }, { id: '2.en-us' }] },
{ recoilState: schemasState(projectId), initialValue: { sdk: { content: '' } } },
],
dispatcher: {
@@ -137,16 +150,17 @@ describe('dialog dispatcher', () => {
it('removes a dialog file', async () => {
await act(async () => {
- await dispatcher.createDialog({ id: '1', content: 'abcde', projectId });
+ await dispatcher.createDialog({ id: '3', content: 'abcde', projectId });
});
await act(async () => {
- await dispatcher.removeDialog('1', projectId);
+ await dispatcher.removeDialog('3', projectId);
});
- expect(renderedComponent.current.dialogs).toEqual([{ id: '2' }]);
- expect(renderedComponent.current.dialogSchemas).toEqual([{ id: '2' }]);
- expect(renderedComponent.current.lgFiles).toEqual([{ id: '2' }]);
- expect(renderedComponent.current.luFiles).toEqual([{ id: '2' }]);
+ expect(renderedComponent.current.dialogs).toEqual([{ id: '1' }, { id: '2' }]);
+ expect(renderedComponent.current.dialogSchemas).toEqual([{ id: '1' }, { id: '2' }]);
+ expect(renderedComponent.current.lgFiles).toEqual([{ id: '1.en-us' }, { id: '2.en-us' }]);
+ expect(renderedComponent.current.luFiles).toEqual([{ id: '1.en-us' }, { id: '2.en-us' }]);
+ expect(renderedComponent.current.qnaFiles).toEqual([{ id: '1.en-us' }, { id: '2.en-us' }]);
});
it('updates a dialog file', async () => {
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialogSchema.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialogSchema.test.tsx
index 6a5070e9dd..ae3c6139fb 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialogSchema.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/dialogSchema.test.tsx
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { dialogSchemaDispatcher } from '../dialogSchema';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/editor.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/editor.test.tsx
index 29e2e22403..c18a592d26 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/editor.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/editor.test.tsx
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilState, useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { editorDispatcher } from '../editor';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/export.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/export.test.tsx
index c02ff75ea7..62a3a2b590 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/export.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/export.test.tsx
@@ -2,12 +2,12 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import httpClient from '../../../utils/httpUtil';
import { exportDispatcher } from '../export';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
-import { botNameState, currentProjectIdState } from '../../atoms';
+import { botDisplayNameState, currentProjectIdState } from '../../atoms';
import { dispatcherState } from '../../../recoilModel/DispatcherWrapper';
import { Dispatcher } from '../../../recoilModel/dispatchers';
@@ -22,7 +22,7 @@ describe('Export dispatcher', () => {
prevAppendChild = document.body.appendChild;
const useRecoilTestHook = () => {
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const currentDispatcher = useRecoilValue(dispatcherState);
return {
botName,
@@ -33,7 +33,7 @@ describe('Export dispatcher', () => {
const { result } = renderRecoilHook(useRecoilTestHook, {
states: [
{ recoilState: currentProjectIdState, initialValue: projectId },
- { recoilState: botNameState(projectId), initialValue: 'emptybot-1' },
+ { recoilState: botDisplayNameState(projectId), initialValue: 'emptybot-1' },
],
dispatcher: {
recoilState: dispatcherState,
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lg.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lg.test.tsx
index 34b42bf1d0..913b182e2e 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lg.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lg.test.tsx
@@ -4,7 +4,7 @@
import { useRecoilState } from 'recoil';
import { LgFile, LgTemplate } from '@bfc/shared';
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { lgDispatcher } from '../lg';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lu.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lu.test.tsx
index dd7f2df8f8..6e6cd0df73 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lu.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lu.test.tsx
@@ -4,7 +4,7 @@
import { useRecoilState } from 'recoil';
import { LuIntentSection, LuFile } from '@bfc/shared';
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { luUtil } from '@bfc/indexers';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
@@ -13,9 +13,11 @@ import { dispatcherState } from '../../../recoilModel/DispatcherWrapper';
import { Dispatcher } from '..';
import { luDispatcher } from '../lu';
+const luFeatures = {};
+
jest.mock('../../parsers/luWorker', () => {
return {
- parse: (id, content) => ({ id, content }),
+ parse: (id, content, luFeatures) => ({ id, content, luFeatures }),
addIntent: require('@bfc/indexers/lib/utils/luUtil').addIntent,
addIntents: require('@bfc/indexers/lib/utils/luUtil').addIntents,
updateIntent: require('@bfc/indexers/lib/utils/luUtil').updateIntent,
@@ -29,7 +31,7 @@ const file1 = {
content: `\r\n# Hello\r\n-hi`,
};
-const luFiles = [luUtil.parse(file1.id, file1.content)] as LuFile[];
+const luFiles = [luUtil.parse(file1.id, file1.content, luFeatures)] as LuFile[];
const getLuIntent = (Name, Body): LuIntentSection =>
({
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockBotProjectFile.json b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockBotProjectFile.json
new file mode 100644
index 0000000000..b1bf6ae908
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockBotProjectFile.json
@@ -0,0 +1,17 @@
+{
+ "$schema": "",
+ "name": "TesterBot",
+ "workspace": "file:///Users/tester/Desktop/LoadedBotProject/TesterBot",
+ "skills": {
+ "todoSkill": {
+ "workspace": "file:///Users/tester/Desktop/LoadedBotProject/Todo-Skill",
+ "manifest": "Todo-Skill-2-1-preview-1-manifest",
+ "remote": false,
+ "endpointName": "default"
+ },
+ "googleKeepSync": {
+ "workspace": "file:///Users/tester/Desktop/LoadedBotProject/GoogleKeepSync",
+ "remote": false
+ }
+ }
+}
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockManifest.json b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockManifest.json
new file mode 100644
index 0000000000..839e03f889
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockManifest.json
@@ -0,0 +1,25 @@
+
+{
+ "$schema": "https://schemas.botframework.com/schemas/skills/skill-manifest-2.1.preview-1.json",
+ "$id": "OneNoteSync",
+ "name": "OneNoteSync",
+ "version": "1.0",
+ "publisherName": "Microsoft",
+ "description": "Sync notes to OneNote",
+ "endpoints": [
+ {
+ "name": "default",
+ "protocol": "BotFrameworkV3",
+ "description": "Local endpoint for SkillBot.",
+ "endpointUrl": "http://localhost:3988/api/messages",
+ "msAppId": "123-b33a9-4b2bb-9d6d-21"
+ },
+ {
+ "name": "remote",
+ "protocol": "BotFrameworkV3",
+ "description": "Production endpoint for SkillBot.",
+ "endpointUrl": "https://test.net/api/messages",
+ "msAppId": "123-8138c-43144-8676-21"
+ }
+ ]
+}
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json
index 1f752cb915..e815347024 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json
@@ -6,8 +6,8 @@
{
"name": "emptybot-1.dialog",
"content": "{\n \"$kind\": \"Microsoft.AdaptiveDialog\",\n \"$designer\": {\n \"name\": \"AddItem\",\n \"id\": \"225905\"\n },\n \"autoEndDialog\": true,\n \"defaultResultProperty\": \"dialog.result\",\n \"triggers\": [\n {\n \"$kind\": \"Microsoft.OnBeginDialog\",\n \"$designer\": {\n \"name\": \"BeginDialog\",\n \"id\": \"479346\"\n },\n \"actions\": [\n {\n \"$kind\": \"Microsoft.SetProperties\",\n \"$designer\": {\n \"id\": \"811190\",\n \"name\": \"Set properties\"\n },\n \"assignments\": [\n {\n \"property\": \"dialog.itemTitle\",\n \"value\": \"=coalesce(@itemTitle, $itemTitle)\"\n },\n {\n \"property\": \"dialog.listType\",\n \"value\": \"=coalesce(@listType, $listType)\"\n }\n ]\n },\n {\n \"$kind\": \"Microsoft.TextInput\",\n \"$designer\": {\n \"id\": \"282825\",\n \"name\": \"AskForTitle\"\n },\n \"prompt\": \"${TextInput_Prompt_282825()}\",\n \"maxTurnCount\": \"3\",\n \"property\": \"dialog.itemTitle\",\n \"value\": \"=coalesce(@itemTitle, $itemTitle)\",\n \"allowInterruptions\": \"!@itemTitle && #_Interruption.Score >= 0.9\"\n },\n {\n \"$kind\": \"Microsoft.ChoiceInput\",\n \"$designer\": {\n \"id\": \"878594\",\n \"name\": \"AskForListType\"\n },\n \"prompt\": \"${TextInput_Prompt_878594()}\",\n \"maxTurnCount\": \"3\",\n \"property\": \"dialog.listType\",\n \"value\": \"=@listType\",\n \"allowInterruptions\": \"!@listType\",\n \"outputFormat\": \"value\",\n \"choices\": [\n {\n \"value\": \"todo\",\n \"synonyms\": [\n \"to do\"\n ]\n },\n {\n \"value\": \"grocery\",\n \"synonyms\": [\n \"groceries\"\n ]\n },\n {\n \"value\": \"shopping\",\n \"synonyms\": [\n \"shoppers\"\n ]\n }\n ],\n \"appendChoices\": \"true\",\n \"defaultLocale\": \"en-us\",\n \"style\": \"Auto\",\n \"choiceOptions\": {\n \"inlineSeparator\": \", \",\n \"inlineOr\": \" or \",\n \"inlineOrMore\": \", or \",\n \"includeNumbers\": true\n },\n \"recognizerOptions\": {\n \"noValue\": false\n }\n },\n {\n \"$kind\": \"Microsoft.EditArray\",\n \"$designer\": {\n \"id\": \"733511\",\n \"name\": \"Edit an Array property\"\n },\n \"changeType\": \"push\",\n \"itemsProperty\": \"user.lists[dialog.listType]\",\n \"value\": \"=$itemTitle\"\n },\n {\n \"$kind\": \"Microsoft.SendActivity\",\n \"$designer\": {\n \"id\": \"139532\",\n \"name\": \"Send a response\"\n },\n \"activity\": \"${SendActivity_139532()}\"\n }\n ]\n }\n ],\n \"generator\": \"additem.lg\",\n \"recognizer\": \"additem.lu\"\n}\n",
- "path": "/Users/tester/Desktop/EmptyBot-1/dialogs/additem/additem.dialog",
- "relativePath": "dialogs/additem/additem.dialog",
+ "path": "/Users/tester/Desktop/EmptyBot-1/additem.dialog",
+ "relativePath": "",
"lastModified": "Thu Jul 09 2020 10:19:09 GMT-0700 (Pacific Daylight Time)"
},
{
@@ -23,6 +23,12 @@
"path": "/Users/tester/Desktop/EmptyBot-1/dialogs/additem/language-understanding/en-us/additem.en-us.lu",
"relativePath": "dialogs/additem/language-understanding/en-us/additem.en-us.lu",
"lastModified": "Thu Jul 09 2020 10:19:09 GMT-0700 (Pacific Daylight Time)"
+ },{
+ "name": "EmptyBot-1.botproj",
+ "content": "{\"$schema\":\"https:\/\/schemas.botframework.com\/schemas\/botprojects\/v0.1\/botproject-schema.json\",\"name\":\"echobot-0\",\"workspace\":\"\/Users\/tester\/Desktop\/samples\/EchoBot-0\",\"skills\":{}}",
+ "path": "/Users/tester/Desktop/EmptyBot-1/EmptyBot-1.botproj",
+ "relativePath": "dialogs/additem/language-understanding/en-us/additem.en-us.lu",
+ "lastModified": "Thu Jul 09 2020 10:19:09 GMT-0700 (Pacific Daylight Time)"
}
],
"location": "/Users/tester/Desktop/EmptyBot-1",
@@ -8623,7 +8629,7 @@
},
"diagnostics": []
},
- "skills": [],
+ "skills": {},
"diagnostics": [],
"settings": {
"feature": {
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/multilang.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/multilang.test.tsx
index 2383f43e87..4d0cd03677 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/multilang.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/multilang.test.tsx
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
import {
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/navigation.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/navigation.test.tsx
index 44385b6fc4..7ef6a2d6c4 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/navigation.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/navigation.test.tsx
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { SDKKinds } from '@bfc/shared';
import { navigationDispatcher } from '../navigation';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/project.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/project.test.tsx
index b572b7f35d..b29387b55a 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/project.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/project.test.tsx
@@ -1,12 +1,17 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { useRecoilValue } from 'recoil';
-import { act, RenderHookResult, HookResult } from '@bfc/test-utils/lib/hooks';
+import { selector, useRecoilValue } from 'recoil';
+import { v4 as uuid } from 'uuid';
+import { act, RenderHookResult, HookResult } from '@botframework-composer/test-utils/lib/hooks';
import { useRecoilState } from 'recoil';
+import cloneDeep from 'lodash/cloneDeep';
+import endsWith from 'lodash/endsWith';
+import findIndex from 'lodash/findIndex';
import httpClient from '../../../utils/httpUtil';
import { projectDispatcher } from '../project';
+import { botProjectFileDispatcher } from '../botProjectFile';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
import {
recentProjectsState,
@@ -28,15 +33,22 @@ import {
schemasState,
locationState,
skillsState,
- botOpeningState,
botStatusState,
- botNameState,
+ botDisplayNameState,
+ botOpeningState,
+ botProjectFileState,
+ botProjectIdsState,
+ botNameIdentifierState,
+ botErrorState,
+ botProjectSpaceLoadedState,
} from '../../atoms';
import { dispatcherState } from '../../../recoilModel/DispatcherWrapper';
import { Dispatcher } from '../../dispatchers';
import { BotStatus } from '../../../constants';
-import mockProjectResponse from './mocks/mockProjectResponse.json';
+import mockProjectData from './mocks/mockProjectResponse.json';
+import mockManifestData from './mocks/mockManifest.json';
+import mockBotProjectFileData from './mocks/mockBotProjectFile.json';
// let httpMocks;
let navigateTo;
@@ -73,11 +85,35 @@ jest.mock('../../persistence/FilePersistence', () => {
});
describe('Project dispatcher', () => {
+ let mockProjectResponse, mockManifestResponse, mockBotProjectResponse;
+ const botStatesSelector = selector({
+ key: 'botStatesSelector',
+ get: ({ get }) => {
+ const botProjectIds = get(botProjectIdsState);
+ const botProjectData: { [projectName: string]: any } = {};
+ botProjectIds.map((projectId) => {
+ const botDisplayName = get(botDisplayNameState(projectId));
+ const botNameIdentifier = get(botNameIdentifierState(projectId));
+ const botError = get(botErrorState(projectId));
+ const location = get(locationState(projectId));
+ if (botNameIdentifier) {
+ botProjectData[botNameIdentifier] = {
+ botDisplayName,
+ location,
+ botError,
+ projectId,
+ };
+ }
+ });
+ return botProjectData;
+ },
+ });
+
const useRecoilTestHook = () => {
const schemas = useRecoilValue(schemasState(projectId));
const location = useRecoilValue(locationState(projectId));
const skills = useRecoilValue(skillsState(projectId));
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const skillManifests = useRecoilValue(skillManifestsState(projectId));
const luFiles = useRecoilValue(luFilesState(projectId));
const lgFiles = useRecoilValue(lgFilesState(projectId));
@@ -87,8 +123,9 @@ describe('Project dispatcher', () => {
const diagnostics = useRecoilValue(botDiagnosticsState(projectId));
const locale = useRecoilValue(localeState(projectId));
const botStatus = useRecoilValue(botStatusState(projectId));
+ const botStates = useRecoilValue(botStatesSelector);
+ const botProjectSpaceLoaded = useRecoilValue(botProjectSpaceLoadedState);
- const botOpening = useRecoilValue(botOpeningState);
const currentDispatcher = useRecoilValue(dispatcherState);
const [recentProjects, setRecentProjects] = useRecoilState(recentProjectsState);
const appError = useRecoilValue(applicationErrorState);
@@ -97,9 +134,10 @@ describe('Project dispatcher', () => {
const boilerplateVersion = useRecoilValue(boilerplateVersionState);
const templates = useRecoilValue(templateProjectsState);
const runtimeTemplates = useRecoilValue(runtimeTemplatesState);
+ const botOpening = useRecoilValue(botOpeningState);
+ const [botProjectFile, setBotProjectFile] = useRecoilState(botProjectFileState(projectId));
return {
- botOpening,
skillManifests,
luFiles,
lgFiles,
@@ -117,19 +155,27 @@ describe('Project dispatcher', () => {
currentDispatcher,
recentProjects,
appError,
- setRecentProjects,
templateId,
announcement,
boilerplateVersion,
templates,
runtimeTemplates,
+ botOpening,
+ botProjectFile,
+ setBotProjectFile,
+ setRecentProjects,
+ botStates,
+ botProjectSpaceLoaded,
};
};
let renderedComponent: HookResult>, dispatcher: Dispatcher;
- beforeEach(() => {
+ beforeEach(async () => {
navigateTo.mockReset();
+ mockProjectResponse = cloneDeep(mockProjectData);
+ mockManifestResponse = cloneDeep(mockManifestData);
+ mockBotProjectResponse = cloneDeep(mockBotProjectFileData);
const rendered: RenderHookResult> = renderRecoilHook(
useRecoilTestHook,
{
@@ -138,6 +184,7 @@ describe('Project dispatcher', () => {
recoilState: dispatcherState,
initialValue: {
projectDispatcher,
+ botProjectFileDispatcher,
},
},
}
@@ -146,13 +193,25 @@ describe('Project dispatcher', () => {
dispatcher = renderedComponent.current.currentDispatcher;
});
+ it('should throw an error if no bot project file is present in the bot', async () => {
+ const cloned = cloneDeep(mockProjectResponse);
+ const filtered = cloned.files.filter((file) => !endsWith(file.name, '.botproj'));
+ cloned.files = filtered;
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: cloned,
+ });
+ await act(async () => {
+ await dispatcher.openProject('../test/empty-bot', 'default');
+ });
+ expect(navigateTo).toHaveBeenLastCalledWith(`/home`);
+ });
+
it('should open bot project', async () => {
- let result;
(httpClient.put as jest.Mock).mockResolvedValueOnce({
data: mockProjectResponse,
});
await act(async () => {
- result = await dispatcher.openProject('../test/empty-bot', 'default');
+ await dispatcher.openProject('../test/empty-bot', 'default');
});
expect(renderedComponent.current.projectId).toBe(mockProjectResponse.id);
@@ -166,8 +225,7 @@ describe('Project dispatcher', () => {
expect(renderedComponent.current.schemas.sdk).toBeDefined();
expect(renderedComponent.current.schemas.default).toBeDefined();
expect(renderedComponent.current.schemas.diagnostics?.length).toBe(0);
- expect(navigateTo).toHaveBeenLastCalledWith(`/bot/${projectId}/dialogs/`);
- expect(result).toBe(renderedComponent.current.projectId);
+ expect(navigateTo).toHaveBeenLastCalledWith(`/bot/${projectId}/dialogs/emptybot-1`);
});
it('should handle project failure if project does not exist', async () => {
@@ -187,7 +245,7 @@ describe('Project dispatcher', () => {
expect(renderedComponent.current.botOpening).toBeFalsy();
expect(renderedComponent.current.appError).toEqual(errorObj);
expect(renderedComponent.current.recentProjects.length).toBe(0);
- expect(navigateTo).not.toHaveBeenCalled();
+ expect(navigateTo).toHaveBeenLastCalledWith(`/home`);
});
it('should fetch recent projects', async () => {
@@ -200,36 +258,6 @@ describe('Project dispatcher', () => {
expect(renderedComponent.current.recentProjects).toEqual(recentProjects);
});
- it('should get runtime templates', async () => {
- const templates = [
- { id: 'EchoBot', index: 1, name: 'Echo Bot' },
- { id: 'EmptyBot', index: 2, name: 'Empty Bot' },
- ];
- (httpClient.get as jest.Mock).mockResolvedValue({
- data: templates,
- });
- await act(async () => {
- await dispatcher.fetchRuntimeTemplates();
- });
-
- expect(renderedComponent.current.runtimeTemplates).toEqual(templates);
- });
-
- it('should get templates', async () => {
- const templates = [
- { id: 'EchoBot', index: 1, name: 'Echo Bot' },
- { id: 'EmptyBot', index: 2, name: 'Empty Bot' },
- ];
- (httpClient.get as jest.Mock).mockResolvedValue({
- data: templates,
- });
- await act(async () => {
- await dispatcher.fetchTemplates();
- });
-
- expect(renderedComponent.current.templates).toEqual(templates);
- });
-
it('should delete a project', async () => {
(httpClient.delete as jest.Mock).mockResolvedValue({ data: {} });
(httpClient.put as jest.Mock).mockResolvedValueOnce({
@@ -237,7 +265,7 @@ describe('Project dispatcher', () => {
});
await act(async () => {
await dispatcher.openProject('../test/empty-bot', 'default');
- await dispatcher.deleteBotProject(projectId);
+ await dispatcher.deleteBot(projectId);
});
expect(renderedComponent.current.botName).toEqual('');
@@ -277,7 +305,7 @@ describe('Project dispatcher', () => {
expect(renderedComponent.current.announcement).toEqual('Scripts successfully updated.');
});
- it('should get bolierplate version', async () => {
+ it('should get boilerplate version', async () => {
const version = { updateRequired: true, latestVersion: '3', currentVersion: '2' };
(httpClient.get as jest.Mock).mockResolvedValue({
data: version,
@@ -288,4 +316,208 @@ describe('Project dispatcher', () => {
expect(renderedComponent.current.boilerplateVersion).toEqual(version);
});
+
+ it('should be able to add an existing skill to Botproject', async () => {
+ (httpClient.get as jest.Mock).mockResolvedValueOnce({
+ data: {},
+ });
+ const skills = [
+ { botName: 'Echo-Skill-1', id: '40876.502871204648', location: '/Users/tester/Desktop/Echo-Skill-1' },
+ { botName: 'Echo-Skill-2', id: '50876.502871204648', location: '/Users/tester/Desktop/Echo-Skill-2' },
+ ];
+ const mappedSkills = skills.map(({ botName, id, location }) => {
+ const cloned = cloneDeep(mockProjectResponse);
+ return {
+ ...cloned,
+ botName,
+ id,
+ location,
+ };
+ });
+
+ await act(async () => {
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: mockProjectResponse,
+ });
+ await dispatcher.openProject('../test/empty-bot', 'default');
+ });
+
+ await act(async () => {
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: mappedSkills[0],
+ });
+ await dispatcher.addExistingSkillToBotProject(mappedSkills[0].location, 'default');
+ });
+
+ expect(renderedComponent.current.botStates.echoSkill1).toBeDefined();
+ expect(renderedComponent.current.botStates.echoSkill1.botDisplayName).toBe('Echo-Skill-1');
+
+ await act(async () => {
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: mappedSkills[1],
+ });
+ await dispatcher.addExistingSkillToBotProject(mappedSkills[1].location, 'default');
+ });
+
+ expect(renderedComponent.current.botStates.echoSkill2).toBeDefined();
+ expect(renderedComponent.current.botStates.echoSkill2.botDisplayName).toBe('Echo-Skill-2');
+
+ await act(async () => {
+ await dispatcher.addRemoteSkillToBotProject('https://test.net/api/manifest/man', 'test-skill', 'remote');
+ });
+
+ expect(navigateTo).toHaveBeenLastCalledWith(`/bot/${projectId}/dialogs/emptybot-1`);
+ });
+
+ it('should be able to add a remote skill to Botproject', async () => {
+ const mockImplementation = (httpClient.get as jest.Mock).mockImplementation((url: string) => {
+ if (endsWith(url, '/projects/generateProjectId')) {
+ return {
+ data: '1234.1123213',
+ };
+ } else {
+ return {
+ data: mockManifestResponse,
+ };
+ }
+ });
+
+ await act(async () => {
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: mockProjectResponse,
+ });
+ await dispatcher.openProject('../test/empty-bot', 'default');
+ });
+
+ await act(async () => {
+ await dispatcher.addRemoteSkillToBotProject(
+ 'https://test-dev.azurewebsites.net/manifests/onenote-2-1-preview-1-manifest.json',
+ 'one-note',
+ 'remote'
+ );
+ });
+
+ expect(renderedComponent.current.botStates.oneNote).toBeDefined();
+ expect(renderedComponent.current.botStates.oneNote.botDisplayName).toBe('OneNoteSync');
+ expect(renderedComponent.current.botStates.oneNote.location).toBe(
+ 'https://test-dev.azurewebsites.net/manifests/onenote-2-1-preview-1-manifest.json'
+ );
+ expect(navigateTo).toHaveBeenLastCalledWith(`/bot/${projectId}/dialogs/emptybot-1`);
+ mockImplementation.mockClear();
+ });
+
+ it('should remove a skill from bot project', async () => {
+ const mockImplementation = (httpClient.get as jest.Mock).mockImplementation((url: string) => {
+ if (endsWith(url, '/projects/generateProjectId')) {
+ return {
+ data: uuid(),
+ };
+ } else {
+ return {
+ data: mockManifestResponse,
+ };
+ }
+ });
+
+ await act(async () => {
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: mockProjectResponse,
+ });
+ await dispatcher.openProject('../test/empty-bot', 'default');
+ });
+
+ await act(async () => {
+ await dispatcher.addRemoteSkillToBotProject(
+ 'https://test-dev.azurewebsites.net/manifests/onenote-2-1-preview-1-manifest.json',
+ 'one-note',
+ 'remote'
+ );
+ });
+
+ await act(async () => {
+ await dispatcher.addRemoteSkillToBotProject(
+ 'https://test-dev.azurewebsites.net/manifests/onenote-second-manifest.json',
+ 'one-note-2',
+ 'remote'
+ );
+ });
+
+ const oneNoteProjectId = renderedComponent.current.botStates.oneNote.projectId;
+ mockImplementation.mockClear();
+
+ await act(async () => {
+ dispatcher.removeSkillFromBotProject(oneNoteProjectId);
+ });
+ expect(renderedComponent.current.botStates.oneNote).toBeUndefined();
+ });
+
+ it('should be able to add a new skill to Botproject', async () => {
+ await act(async () => {
+ (httpClient.put as jest.Mock).mockResolvedValueOnce({
+ data: mockProjectResponse,
+ });
+ await dispatcher.openProject('../test/empty-bot', 'default');
+ });
+
+ const newProjectDataClone = cloneDeep(mockProjectResponse);
+ newProjectDataClone.botName = 'new-bot';
+ await act(async () => {
+ (httpClient.post as jest.Mock).mockResolvedValueOnce({
+ data: newProjectDataClone,
+ });
+ await dispatcher.addNewSkillToBotProject({
+ name: 'new-bot',
+ description: '',
+ schemaUrl: '',
+ location: '/Users/tester/Desktop/samples',
+ templateId: 'InterruptionSample',
+ locale: 'us-en',
+ qnaKbUrls: [],
+ });
+ });
+
+ expect(renderedComponent.current.botStates.newBot).toBeDefined();
+ expect(renderedComponent.current.botStates.newBot.botDisplayName).toBe('new-bot');
+ expect(navigateTo).toHaveBeenLastCalledWith(`/bot/${projectId}/dialogs/emptybot-1`);
+ });
+
+ it('should be able to open a project and its skills in Bot project file', async (done) => {
+ let callIndex = 0;
+ (httpClient.put as jest.Mock).mockImplementation(() => {
+ let mockSkillData: any;
+ callIndex++;
+ switch (callIndex) {
+ case 1:
+ return Promise.resolve({ data: mockProjectResponse });
+ case 2: {
+ mockSkillData = cloneDeep(mockProjectResponse);
+ mockSkillData.botName = 'todo-skill';
+ mockSkillData.id = '20876.502871204648';
+ return Promise.resolve({ data: mockSkillData });
+ }
+ case 3: {
+ mockSkillData = cloneDeep(mockProjectResponse);
+ mockSkillData.botName = 'google-keep-sync';
+ mockSkillData.id = '50876.502871204648';
+ return Promise.resolve({ data: mockSkillData });
+ }
+ }
+ });
+ const matchIndex = findIndex(mockProjectResponse.files, (file: any) => endsWith(file.name, '.botproj'));
+ mockProjectResponse.files[matchIndex] = {
+ ...mockProjectResponse.files[matchIndex],
+ content: JSON.stringify(mockBotProjectResponse),
+ };
+ expect(renderedComponent.current.botProjectSpaceLoaded).toBeFalsy();
+
+ await act(async () => {
+ await dispatcher.openProject('../test/empty-bot', 'default');
+ });
+ setImmediate(() => {
+ expect(renderedComponent.current.botStates.todoSkill.botDisplayName).toBe('todo-skill');
+ expect(renderedComponent.current.botStates.googleKeepSync.botDisplayName).toBe('google-keep-sync');
+ expect(renderedComponent.current.botProjectSpaceLoaded).toBeTruthy();
+ done();
+ });
+ });
});
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/qna.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/qna.test.tsx
new file mode 100644
index 0000000000..3800f10c2e
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/qna.test.tsx
@@ -0,0 +1,276 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { useRecoilState } from 'recoil';
+import { QnAFile } from '@bfc/shared';
+import { qnaUtil } from '@bfc/indexers';
+import { useRecoilValue } from 'recoil';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
+
+import { qnaDispatcher } from '../qna';
+import { renderRecoilHook } from '../../../../__tests__/testUtils';
+import { qnaFilesState, currentProjectIdState, localeState } from '../../atoms';
+import { dispatcherState } from '../../../recoilModel/DispatcherWrapper';
+import { Dispatcher } from '..';
+
+jest.mock('../../parsers/qnaWorker', () => {
+ const filterParseResult = (qnaFile: QnAFile) => {
+ const cloned = { ...qnaFile, resource: '' };
+ return cloned;
+ };
+ return {
+ parse: (id, content) => ({ id, content }),
+ removeSection: (projectId, qnaFile, sectionId) =>
+ filterParseResult(require('@bfc/indexers/lib/utils/qnaUtil').removeSection(qnaFile, sectionId)),
+ insertSection: (projectId, qnaFile, position, sectionContent) =>
+ filterParseResult(require('@bfc/indexers/lib/utils/qnaUtil').insertSection(qnaFile, position, sectionContent)),
+ createQnAQuestion: (projectId, qnaFile, sectionId, questionContent) =>
+ filterParseResult(
+ require('@bfc/indexers/lib/utils/qnaUtil').createQnAQuestion(qnaFile, sectionId, questionContent)
+ ),
+ updateQnAQuestion: (projectId, qnaFile, sectionId, questionId, questionContent) =>
+ filterParseResult(
+ require('@bfc/indexers/lib/utils/qnaUtil').updateQnAQuestion(qnaFile, sectionId, questionId, questionContent)
+ ),
+ removeQnAQuestion: (projectId, qnaFile, sectionId, questionId) =>
+ filterParseResult(require('@bfc/indexers/lib/utils/qnaUtil').removeQnAQuestion(qnaFile, sectionId, questionId)),
+ updateQnAAnswer: (projectId, qnaFile, sectionId, answerContent) =>
+ filterParseResult(require('@bfc/indexers/lib/utils/qnaUtil').updateQnAAnswer(qnaFile, sectionId, answerContent)),
+ addImport: (projectId, qnaFile, path) =>
+ filterParseResult(require('@bfc/indexers/lib/utils/qnaUtil').addImport(qnaFile, path)),
+ removeImport: (projectId, qnaFile, path) =>
+ filterParseResult(require('@bfc/indexers/lib/utils/qnaUtil').removeImport(qnaFile, path)),
+ };
+});
+
+const projectId = '123asad.123sad';
+const locale = 'en-us';
+
+const content = `# ? What's your name?
+\`\`\`
+Zoidberg
+\`\`\``;
+
+const qna1 = qnaUtil.parse('common.en-us', content);
+const qnaFiles = [qna1];
+
+describe('QnA dispatcher', () => {
+ let renderedComponent, dispatcher: Dispatcher;
+ beforeEach(() => {
+ const useRecoilTestHook = () => {
+ const [qnaFiles, setQnAFiles] = useRecoilState(qnaFilesState(projectId));
+ const currentDispatcher = useRecoilValue(dispatcherState);
+
+ return {
+ qnaFiles,
+ setQnAFiles,
+ currentDispatcher,
+ };
+ };
+
+ const { result } = renderRecoilHook(useRecoilTestHook, {
+ states: [
+ { recoilState: qnaFilesState(projectId), initialValue: qnaFiles },
+ { recoilState: currentProjectIdState, initialValue: projectId },
+ { recoilState: localeState(projectId), initialValue: locale },
+ ],
+ dispatcher: {
+ recoilState: dispatcherState,
+ initialValue: {
+ qnaDispatcher,
+ },
+ },
+ });
+ renderedComponent = result;
+ dispatcher = renderedComponent.current.currentDispatcher;
+ });
+
+ it('should create a qna pairs', async () => {
+ const content = qnaUtil.generateQnAPair('Test', '-add');
+ await act(async () => {
+ await dispatcher.createQnAPairs({
+ id: 'common.en-us',
+ content,
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].content).toContain(content);
+ });
+
+ it('should update a qna file', async () => {
+ const content = qnaUtil.generateQnAPair('Test', '-update');
+ await act(async () => {
+ await dispatcher.updateQnAFile({ id: 'common.en-us', content, projectId });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].content).toBe(content);
+ });
+
+ it('should update a qna question', async () => {
+ await act(async () => {
+ await dispatcher.updateQnAQuestion({
+ id: 'common.en-us',
+ sectionId: qna1.qnaSections[0].sectionId,
+ questionId: qna1.qnaSections[0].Questions[0].id,
+ content: 'What is your name, my friend?',
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].qnaSections[0].Questions[0].content).toContain(
+ 'What is your name, my friend?'
+ );
+ });
+
+ it('should create/remove a qna question', async () => {
+ await act(async () => {
+ await dispatcher.createQnAQuestion({
+ id: 'common.en-us',
+ sectionId: qna1.qnaSections[0].sectionId,
+ content: 'What is your name, my friend?',
+ projectId,
+ });
+ });
+ const section = renderedComponent.current.qnaFiles[0].qnaSections[0];
+
+ expect(section.Questions[1].content).toContain('What is your name, my friend?');
+
+ await act(async () => {
+ await dispatcher.removeQnAQuestion({
+ id: 'common.en-us',
+ sectionId: section.sectionId,
+ questionId: section.Questions[1].id,
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].content).not.toContain('What is your name, my friend?');
+ });
+
+ it('should update a qna answer', async () => {
+ await act(async () => {
+ await dispatcher.updateQnAAnswer({
+ id: 'common.en-us',
+ sectionId: qna1.qnaSections[0].sectionId,
+ content: 'Bender',
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].qnaSections[0].Answer).toBe('Bender');
+ });
+
+ it('should remove a qna pair', async () => {
+ await act(async () => {
+ await dispatcher.removeQnAPairs({
+ id: 'common.en-us',
+ sectionId: qna1.qnaSections[0].sectionId,
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].content).toBe(``);
+ });
+
+ it('should create/remove import', async () => {
+ await act(async () => {
+ await dispatcher.createQnAImport({
+ id: 'common.en-us',
+ sourceId: 'guide.source',
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].content).toContain('[import](guide.source.qna)');
+
+ await act(async () => {
+ await dispatcher.removeQnAImport({
+ id: 'common.en-us',
+ sourceId: 'guide.source',
+ projectId,
+ });
+ });
+
+ expect(renderedComponent.current.qnaFiles[0].content).not.toContain('[import](guide.source.qna)');
+ });
+
+ it('should create/remove qna file', async () => {
+ await act(async () => {
+ await dispatcher.createQnAFile({
+ id: 'guide',
+ content: '> guide',
+ projectId,
+ });
+ });
+
+ const createdFile = renderedComponent.current.qnaFiles.find(({ id }) => id === 'guide.en-us');
+ expect(createdFile).not.toBeFalsy();
+ expect(createdFile.content).toBe('> guide');
+
+ await act(async () => {
+ await dispatcher.removeQnAFile({
+ id: 'guide',
+ projectId,
+ });
+ });
+
+ const createdFileAfterRemove = renderedComponent.current.qnaFiles.find(({ id }) => id === 'guide.en-us');
+ expect(createdFileAfterRemove).toBeFalsy();
+ expect(renderedComponent.current.qnaFiles.length).toBe(1);
+ });
+
+ it('should create qna kb from scratch and auto create import', async () => {
+ await act(async () => {
+ await dispatcher.createQnAKBFromScratch({
+ id: 'common.en-us',
+ name: 'guide',
+ projectId,
+ });
+ });
+
+ const createdFile = renderedComponent.current.qnaFiles.find(({ id }) => id === 'guide.source');
+ expect(createdFile).not.toBeFalsy();
+
+ const commonFile = renderedComponent.current.qnaFiles.find(({ id }) => id === 'common.en-us');
+ expect(commonFile.content).toContain('[import](guide.source.qna)');
+ });
+
+ it('should rename qna kb and re-create import', async () => {
+ await act(async () => {
+ await dispatcher.createQnAKBFromScratch({
+ id: 'common.en-us',
+ name: 'guide',
+ projectId,
+ });
+
+ await dispatcher.renameQnAKB({
+ id: 'guide.source',
+ name: 'guide2.source',
+ projectId,
+ });
+
+ await dispatcher.removeQnAImport({
+ id: 'common.en-us',
+ sourceId: 'guide.source',
+ projectId,
+ });
+
+ await dispatcher.createQnAImport({
+ id: 'common.en-us',
+ sourceId: 'guide2.source',
+ projectId,
+ });
+ });
+
+ const createdFile1 = renderedComponent.current.qnaFiles.find(({ id }) => id === 'guide.source');
+ expect(createdFile1).toBeFalsy();
+
+ const createdFile2 = renderedComponent.current.qnaFiles.find(({ id }) => id === 'guide2.source');
+ expect(createdFile2).not.toBeFalsy();
+
+ const commonFile = renderedComponent.current.qnaFiles.find(({ id }) => id === 'common.en-us');
+ expect(commonFile.content).toContain('[import](guide2.source.qna)');
+ expect(commonFile.content).not.toContain('[import](guide.source.qna)');
+ });
+});
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/setting.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/setting.test.tsx
index d5676354c2..8c6f4b3a4d 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/setting.test.tsx
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/setting.test.tsx
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { renderRecoilHook } from '../../../../__tests__/testUtils';
import { settingsState, currentProjectIdState, skillsState } from '../../atoms';
@@ -109,6 +109,7 @@ describe('setting dispatcher', () => {
MicrosoftAppPassword: 'test',
luis: { ...settings.luis, authoringKey: 'test', endpointKey: 'test' },
qna: { ...settings.qna, subscriptionKey: 'test', endpointKey: 'test' },
+ luFeatures: {},
});
});
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/skill.test.ts b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/skill.test.ts
index 61ebcd3c70..ffeced8fc7 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/skill.test.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/skill.test.ts
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import { Skill } from '@bfc/shared';
import { skillDispatcher } from '../skill';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/storage.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/storage.test.tsx
new file mode 100644
index 0000000000..29b27e6163
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/storage.test.tsx
@@ -0,0 +1,93 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { useRecoilValue } from 'recoil';
+import { act, RenderHookResult, HookResult } from '@botframework-composer/test-utils/lib/hooks';
+
+import httpClient from '../../../utils/httpUtil';
+import { storageDispatcher } from '../storage';
+import { renderRecoilHook } from '../../../../__tests__/testUtils';
+import { runtimeTemplatesState, currentProjectIdState } from '../../atoms';
+import { dispatcherState } from '../../../recoilModel/DispatcherWrapper';
+import { Dispatcher } from '../../dispatchers';
+
+// let httpMocks;
+let navigateTo;
+
+const projectId = '30876.502871204648';
+
+jest.mock('../../../utils/navigation', () => {
+ const navigateMock = jest.fn();
+ navigateTo = navigateMock;
+ return {
+ navigateTo: navigateMock,
+ };
+});
+
+jest.mock('../../../utils/httpUtil');
+
+jest.mock('../../parsers/lgWorker', () => {
+ return {
+ flush: () => new Promise((resolve) => resolve()),
+ addProject: () => new Promise((resolve) => resolve()),
+ };
+});
+
+jest.mock('../../parsers/luWorker', () => {
+ return {
+ flush: () => new Promise((resolve) => resolve()),
+ };
+});
+
+jest.mock('../../persistence/FilePersistence', () => {
+ return jest.fn().mockImplementation(() => {
+ return { flush: () => new Promise((resolve) => resolve()) };
+ });
+});
+
+describe('Storage dispatcher', () => {
+ const useRecoilTestHook = () => {
+ const runtimeTemplates = useRecoilValue(runtimeTemplatesState);
+ const currentDispatcher = useRecoilValue(dispatcherState);
+
+ return {
+ runtimeTemplates,
+ currentDispatcher,
+ };
+ };
+
+ let renderedComponent: HookResult>, dispatcher: Dispatcher;
+
+ beforeEach(() => {
+ navigateTo.mockReset();
+ const rendered: RenderHookResult> = renderRecoilHook(
+ useRecoilTestHook,
+ {
+ states: [{ recoilState: currentProjectIdState, initialValue: projectId }],
+ dispatcher: {
+ recoilState: dispatcherState,
+ initialValue: {
+ storageDispatcher,
+ },
+ },
+ }
+ );
+ renderedComponent = rendered.result;
+ dispatcher = renderedComponent.current.currentDispatcher;
+ });
+
+ it('should get runtime templates', async () => {
+ const templates = [
+ { id: 'EchoBot', index: 1, name: 'Echo Bot' },
+ { id: 'EmptyBot', index: 2, name: 'Empty Bot' },
+ ];
+ (httpClient.get as jest.Mock).mockResolvedValue({
+ data: templates,
+ });
+ await act(async () => {
+ await dispatcher.fetchRuntimeTemplates();
+ });
+
+ expect(renderedComponent.current.runtimeTemplates).toEqual(templates);
+ });
+});
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/user.test.ts b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/user.test.ts
index 8db361f49a..343cffd0f6 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/user.test.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/user.test.ts
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useRecoilValue } from 'recoil';
-import { act } from '@bfc/test-utils/lib/hooks';
+import { act } from '@botframework-composer/test-utils/lib/hooks';
import jwtDecode from 'jwt-decode';
import { userDispatcher } from '../user';
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/botProjectFile.ts b/Composer/packages/client/src/recoilModel/dispatchers/botProjectFile.ts
new file mode 100644
index 0000000000..ad523b1498
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/botProjectFile.ts
@@ -0,0 +1,80 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { CallbackInterface, useRecoilCallback } from 'recoil';
+import { produce } from 'immer';
+import { BotProjectSpaceSkill, convertAbsolutePathToFileProtocol } from '@bfc/shared';
+
+import { botNameIdentifierState, botProjectFileState, locationState } from '../atoms';
+import { rootBotProjectIdSelector } from '../selectors';
+
+export const botProjectFileDispatcher = () => {
+ const addLocalSkillToBotProjectFile = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async (skillId: string) => {
+ const rootBotProjectId = await snapshot.getPromise(rootBotProjectIdSelector);
+ if (!rootBotProjectId) {
+ return;
+ }
+ const skillLocation = await snapshot.getPromise(locationState(skillId));
+ const botName = await snapshot.getPromise(botNameIdentifierState(skillId));
+
+ set(botProjectFileState(rootBotProjectId), (current) => {
+ const result = produce(current, (draftState) => {
+ const skill: BotProjectSpaceSkill = {
+ workspace: convertAbsolutePathToFileProtocol(skillLocation),
+ remote: false,
+ };
+ draftState.content.skills[botName] = skill;
+ });
+ return result;
+ });
+ }
+ );
+
+ const addRemoteSkillToBotProjectFile = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async (skillId: string, manifestUrl: string, endpointName: string) => {
+ const rootBotProjectId = await snapshot.getPromise(rootBotProjectIdSelector);
+ if (!rootBotProjectId) {
+ return;
+ }
+ const botName = await snapshot.getPromise(botNameIdentifierState(skillId));
+
+ set(botProjectFileState(rootBotProjectId), (current) => {
+ const result = produce(current, (draftState) => {
+ const skill: BotProjectSpaceSkill = {
+ manifest: manifestUrl,
+ remote: true,
+ endpointName,
+ };
+
+ draftState.content.skills[botName] = skill;
+ });
+ return result;
+ });
+ }
+ );
+
+ const removeSkillFromBotProjectFile = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async (skillId: string) => {
+ const rootBotProjectId = await snapshot.getPromise(rootBotProjectIdSelector);
+ if (!rootBotProjectId) {
+ return;
+ }
+
+ const botName = await snapshot.getPromise(botNameIdentifierState(skillId));
+ set(botProjectFileState(rootBotProjectId), (current) => {
+ const result = produce(current, (draftState) => {
+ delete draftState.content.skills[botName];
+ });
+ return result;
+ });
+ }
+ );
+
+ return {
+ addLocalSkillToBotProjectFile,
+ removeSkillFromBotProjectFile,
+ addRemoteSkillToBotProjectFile,
+ };
+};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/export.ts b/Composer/packages/client/src/recoilModel/dispatchers/export.ts
index 3a00d0f35a..ed5eb0ed33 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/export.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/export.ts
@@ -5,13 +5,13 @@
import { CallbackInterface, useRecoilCallback } from 'recoil';
import httpClient from '../../utils/httpUtil';
-import { botNameState } from '../atoms';
+import { botDisplayNameState } from '../atoms';
import { logMessage } from './shared';
export const exportDispatcher = () => {
const exportToZip = useRecoilCallback((callbackHelpers: CallbackInterface) => async (projectId: string) => {
- const botName = await callbackHelpers.snapshot.getPromise(botNameState(projectId));
+ const botName = await callbackHelpers.snapshot.getPromise(botDisplayNameState(projectId));
try {
const response = await httpClient.get(`/projects/${projectId}/export/`, { responseType: 'blob' });
const url = window.URL.createObjectURL(new Blob([response.data]));
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts b/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
index b7196583f5..c89454c4fb 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/extensions.ts
@@ -3,10 +3,10 @@
// Licensed under the MIT License.
import { CallbackInterface, useRecoilCallback } from 'recoil';
+import { ExtensionMetadata } from '@bfc/extension-client';
import httpClient from '../../utils/httpUtil';
import { extensionsState } from '../atoms';
-import { ExtensionConfig } from '../types';
export const extensionsDispatcher = () => {
const fetchExtensions = useRecoilCallback((callbackHelpers: CallbackInterface) => async () => {
@@ -16,6 +16,7 @@ export const extensionsDispatcher = () => {
set(extensionsState, res.data);
} catch (err) {
+ // eslint-disable-next-line no-console
console.error(err);
}
});
@@ -25,7 +26,7 @@ export const extensionsDispatcher = () => {
const { set } = callbackHelpers;
try {
const res = await httpClient.post('/extensions', { id: extensionName, version });
- const addedExtension: ExtensionConfig = res.data;
+ const addedExtension: ExtensionMetadata = res.data;
set(extensionsState, (extensions) => {
if (extensions.find((p) => p.id === addedExtension.id)) {
@@ -40,6 +41,7 @@ export const extensionsDispatcher = () => {
}
});
} catch (err) {
+ // eslint-disable-next-line no-console
console.error(err);
}
}
@@ -52,6 +54,7 @@ export const extensionsDispatcher = () => {
set(extensionsState, res.data);
} catch (err) {
+ // eslint-disable-next-line no-console
console.error(err);
}
});
@@ -64,7 +67,7 @@ export const extensionsDispatcher = () => {
id: extensionId,
enabled: Boolean(enabled),
});
- const toggledExtension: ExtensionConfig = res.data;
+ const toggledExtension: ExtensionMetadata = res.data;
set(extensionsState, (extensions) => {
return (extensions = extensions.map((p) => {
@@ -76,7 +79,7 @@ export const extensionsDispatcher = () => {
}));
});
} catch (err) {
- // do nothing
+ // eslint-disable-next-line no-console
console.error(err);
}
}
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts b/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts
new file mode 100644
index 0000000000..3b1257c9bd
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts
@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+/* eslint-disable react-hooks/rules-of-hooks */
+
+import { FormDialogSchemaTemplate } from '@bfc/shared';
+import { navigate } from '@reach/router';
+import formatMessage from 'format-message';
+import { CallbackInterface, useRecoilCallback } from 'recoil';
+
+import httpClient from '../../utils/httpUtil';
+import {
+ applicationErrorState,
+ formDialogGenerationProgressingState,
+ formDialogLibraryTemplatesState,
+} from '../atoms/appState';
+import { formDialogSchemaIdsState, formDialogSchemaState } from '../atoms/botState';
+import { dispatcherState } from '../DispatcherWrapper';
+
+export const formDialogsDispatcher = () => {
+ const createFormDialogSchema = useRecoilCallback(({ set }: CallbackInterface) => ({ id, projectId }) => {
+ set(formDialogSchemaIdsState(projectId), (formDialogSchemaIds) => {
+ return [...formDialogSchemaIds, id];
+ });
+
+ set(formDialogSchemaState({ projectId, schemaId: id }), { id, content: JSON.stringify({}, null, 4) });
+ });
+
+ const updateFormDialogSchema = useRecoilCallback(({ set }: CallbackInterface) => ({ id, content, projectId }) =>
+ set(formDialogSchemaState({ projectId, schemaId: id }), { id, content })
+ );
+
+ const removeFormDialogSchema = useRecoilCallback(({ set, reset }: CallbackInterface) => async ({ id, projectId }) => {
+ set(formDialogSchemaIdsState(projectId), (formDialogSchemas) => {
+ return formDialogSchemas.filter((fdId) => fdId !== id);
+ });
+ reset(formDialogSchemaState({ projectId, schemaId: id }));
+ });
+
+ const loadFormDialogSchemaTemplates = useRecoilCallback((callbackHelpers: CallbackInterface) => async () => {
+ const { set, snapshot } = callbackHelpers;
+ const templates = await snapshot.getPromise(formDialogLibraryTemplatesState);
+ // If templates are already loaded, don't reload.
+ if (templates.length) {
+ return;
+ }
+
+ try {
+ const { data } = await httpClient.get('/formDialogs/templateSchemas');
+ const templates = Object.keys(data).map((key) => ({
+ name: key,
+ isGlobal: data[key].$global,
+ }));
+
+ set(formDialogLibraryTemplatesState, templates);
+ } catch (error) {
+ set(applicationErrorState, {
+ message: error.message,
+ summary: formatMessage('Load form dialog schema templates Error'),
+ });
+ }
+ });
+
+ const generateFormDialog = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async ({ projectId, schemaId }) => {
+ const { set, snapshot } = callbackHelpers;
+ const { reloadProject } = await snapshot.getPromise(dispatcherState);
+ try {
+ set(formDialogGenerationProgressingState, true);
+
+ const formDialogSchema = await snapshot.getPromise(formDialogSchemaState({ projectId, schemaId }));
+ if (!formDialogSchema) {
+ return;
+ }
+
+ const response = await httpClient.post(`/formDialogs/${projectId}/generate`, {
+ name: schemaId,
+ });
+ await reloadProject(callbackHelpers, response);
+ } catch (error) {
+ set(applicationErrorState, {
+ message: error.message,
+ summary: formatMessage('Generating form dialog using ${schemaId} schema failed.', { schemaId }),
+ });
+ } finally {
+ set(formDialogGenerationProgressingState, false);
+ }
+ }
+ );
+
+ const navigateToGeneratedDialog = ({ projectId, schemaId }) => {
+ navigate(`/bot/${projectId}/dialogs/${schemaId}`);
+ };
+
+ return {
+ createFormDialogSchema,
+ updateFormDialogSchema,
+ loadFormDialogSchemaTemplates,
+ removeFormDialogSchema,
+ generateFormDialog,
+ navigateToGeneratedDialog,
+ };
+};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/index.ts b/Composer/packages/client/src/recoilModel/dispatchers/index.ts
index edbae77387..da12d18bc6 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/index.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/index.ts
@@ -20,6 +20,9 @@ import { userDispatcher } from './user';
import { multilangDispatcher } from './multilang';
import { notificationDispatcher } from './notification';
import { extensionsDispatcher } from './extensions';
+import { formDialogsDispatcher } from './formDialogs';
+import { botProjectFileDispatcher } from './botProjectFile';
+import { zoomDispatcher } from './zoom';
const createDispatchers = () => {
return {
@@ -42,6 +45,9 @@ const createDispatchers = () => {
...multilangDispatcher(),
...notificationDispatcher(),
...extensionsDispatcher(),
+ ...formDialogsDispatcher(),
+ ...botProjectFileDispatcher(),
+ ...zoomDispatcher(),
};
};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/lg.ts b/Composer/packages/client/src/recoilModel/dispatchers/lg.ts
index dd4d866f25..95107d37fa 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/lg.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/lg.ts
@@ -112,14 +112,18 @@ export const removeLgFileState = async (
callbackHelpers: CallbackInterface,
{ id, projectId }: { id: string; projectId: string }
) => {
- try {
- const { set, snapshot } = callbackHelpers;
- let lgFiles = await snapshot.getPromise(lgFilesState(projectId));
- lgFiles = lgFiles.filter((file) => getBaseName(file.id) !== id);
- set(lgFilesState(projectId), lgFiles);
- } catch (error) {
- setError(callbackHelpers, error);
+ const { set, snapshot } = callbackHelpers;
+ let lgFiles = await snapshot.getPromise(lgFilesState(projectId));
+ const locale = await snapshot.getPromise(localeState(projectId));
+
+ const targetLgFile = lgFiles.find((item) => item.id === id) || lgFiles.find((item) => item.id === `${id}.${locale}`);
+ if (!targetLgFile) {
+ setError(callbackHelpers, new Error(`remove lg file ${id} not exist`));
+ return;
}
+
+ lgFiles = lgFiles.filter((file) => file.id !== targetLgFile.id);
+ set(lgFilesState(projectId), lgFiles);
};
export const lgDispatcher = () => {
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/lu.ts b/Composer/packages/client/src/recoilModel/dispatchers/lu.ts
index 249f6cf38f..a9d66cfb02 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/lu.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/lu.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
/* eslint-disable react-hooks/rules-of-hooks */
-import { LuFile, LuIntentSection } from '@bfc/shared';
+import { LuFile, LuIntentSection, ILUFeaturesConfig } from '@bfc/shared';
import { useRecoilCallback, CallbackInterface } from 'recoil';
import differenceBy from 'lodash/differenceBy';
import formatMessage from 'format-message';
@@ -19,7 +19,12 @@ const intentIsNotEmpty = ({ Name, Body }) => {
// fill other locale luFile new added intent with '- '
const initialBody = '- ';
-export const updateLuFileState = async (luFiles: LuFile[], updatedLuFile: LuFile, projectId: string) => {
+const updateLuFileState = async (
+ luFiles: LuFile[],
+ updatedLuFile: LuFile,
+ projectId: string,
+ luFeatures: ILUFeaturesConfig
+) => {
const { id } = updatedLuFile;
const dialogId = getBaseName(id);
const locale = getExtension(id);
@@ -50,10 +55,11 @@ export const updateLuFileState = async (luFiles: LuFile[], updatedLuFile: LuFile
// sync add/remove intents
if (onlyAdds || onlyDeletes) {
for (const item of sameIdOtherLocaleFiles) {
- let newLuFile = (await luWorker.addIntents(item, addedIntents)) as LuFile;
+ let newLuFile = (await luWorker.addIntents(item, addedIntents, luFeatures)) as LuFile;
newLuFile = (await luWorker.removeIntents(
newLuFile,
- deletedIntents.map(({ Name }) => Name)
+ deletedIntents.map(({ Name }) => Name),
+ luFeatures
)) as LuFile;
changes.push(newLuFile);
}
@@ -76,11 +82,12 @@ export const createLuFileState = async (
const { set, snapshot } = callbackHelpers;
const luFiles = await snapshot.getPromise(luFilesState(projectId));
const locale = await snapshot.getPromise(localeState(projectId));
- const { languages } = await snapshot.getPromise(settingsState(projectId));
+ const { languages, luFeatures } = await snapshot.getPromise(settingsState(projectId));
const createdLuId = `${id}.${locale}`;
- const createdLuFile = (await luWorker.parse(id, content)) as LuFile;
+ const createdLuFile = (await luWorker.parse(id, content, luFeatures)) as LuFile;
if (luFiles.find((lu) => lu.id === createdLuId)) {
- throw new Error('lu file already exist');
+ setError(callbackHelpers, new Error(formatMessage('lu file already exist')));
+ return;
}
const changes: LuFile[] = [];
@@ -103,14 +110,22 @@ export const removeLuFileState = async (
) => {
const { set, snapshot } = callbackHelpers;
let luFiles = await snapshot.getPromise(luFilesState(projectId));
+ const locale = await snapshot.getPromise(localeState(projectId));
+
+ const targetLuFile = luFiles.find((item) => item.id === id) || luFiles.find((item) => item.id === `${id}.${locale}`);
+ if (!targetLuFile) {
+ // eslint-disable-next-line format-message/literal-pattern
+ setError(callbackHelpers, new Error(formatMessage(`remove lu file ${id} not exist`)));
+ return;
+ }
luFiles.forEach((file) => {
- if (getBaseName(file.id) === getBaseName(id)) {
- luFileStatusStorage.removeFileStatus(projectId, id);
+ if (file.id === targetLuFile.id) {
+ luFileStatusStorage.removeFileStatus(projectId, targetLuFile.id);
}
});
- luFiles = luFiles.filter((file) => getBaseName(file.id) !== id);
+ luFiles = luFiles.filter((file) => file.id !== targetLuFile.id);
set(luFilesState(projectId), luFiles);
};
@@ -127,9 +142,11 @@ export const luDispatcher = () => {
}) => {
const { set, snapshot } = callbackHelpers;
const luFiles = await snapshot.getPromise(luFilesState(projectId));
+ const { luFeatures } = await snapshot.getPromise(settingsState(projectId));
+
try {
- const updatedFile = (await luWorker.parse(id, content)) as LuFile;
- const result = await updateLuFileState(luFiles, updatedFile, projectId);
+ const updatedFile = (await luWorker.parse(id, content, luFeatures)) as LuFile;
+ const result = await updateLuFileState(luFiles, updatedFile, projectId, luFeatures);
set(luFilesState(projectId), result);
} catch (error) {
setError(callbackHelpers, error);
@@ -151,6 +168,8 @@ export const luDispatcher = () => {
}) => {
const { set, snapshot } = callbackHelpers;
const luFiles = await snapshot.getPromise(luFilesState(projectId));
+ const { luFeatures } = await snapshot.getPromise(settingsState(projectId));
+
const luFile = luFiles.find((temp) => temp.id === id);
if (!luFile) return luFiles;
@@ -168,7 +187,12 @@ export const luDispatcher = () => {
if (intent.Name !== intentName) {
const changes: LuFile[] = [];
for (const item of sameIdOtherLocaleFiles) {
- const updatedFile = (await luWorker.updateIntent(item, intentName, { Name: intent.Name })) as LuFile;
+ const updatedFile = (await luWorker.updateIntent(
+ item,
+ intentName,
+ { Name: intent.Name },
+ luFeatures
+ )) as LuFile;
changes.push(updatedFile);
}
@@ -180,7 +204,12 @@ export const luDispatcher = () => {
});
// body change, only update current locale file
} else {
- const updatedFile = (await luWorker.updateIntent(luFile, intentName, { Body: intent.Body })) as LuFile;
+ const updatedFile = (await luWorker.updateIntent(
+ luFile,
+ intentName,
+ { Body: intent.Body },
+ luFeatures
+ )) as LuFile;
set(luFilesState(projectId), (luFiles) => {
return luFiles.map((file) => {
return file.id === id ? updatedFile : file;
@@ -205,11 +234,13 @@ export const luDispatcher = () => {
}) => {
const { set, snapshot } = callbackHelpers;
const luFiles = await snapshot.getPromise(luFilesState(projectId));
+ const { luFeatures } = await snapshot.getPromise(settingsState(projectId));
+
const file = luFiles.find((temp) => temp.id === id);
if (!file) return luFiles;
try {
- const updatedFile = (await luWorker.addIntent(file, intent)) as LuFile;
- const result = await updateLuFileState(luFiles, updatedFile, projectId);
+ const updatedFile = (await luWorker.addIntent(file, intent, luFeatures)) as LuFile;
+ const result = await updateLuFileState(luFiles, updatedFile, projectId, luFeatures);
set(luFilesState(projectId), result);
} catch (error) {
setError(callbackHelpers, error);
@@ -229,11 +260,13 @@ export const luDispatcher = () => {
}) => {
const { set, snapshot } = callbackHelpers;
const luFiles = await snapshot.getPromise(luFilesState(projectId));
+ const { luFeatures } = await snapshot.getPromise(settingsState(projectId));
+
const file = luFiles.find((temp) => temp.id === id);
if (!file) return luFiles;
try {
- const updatedFile = (await luWorker.removeIntent(file, intentName)) as LuFile;
- const result = await updateLuFileState(luFiles, updatedFile, projectId);
+ const updatedFile = (await luWorker.removeIntent(file, intentName, luFeatures)) as LuFile;
+ const result = await updateLuFileState(luFiles, updatedFile, projectId, luFeatures);
set(luFilesState(projectId), result);
} catch (error) {
setError(callbackHelpers, error);
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/multilang.ts b/Composer/packages/client/src/recoilModel/dispatchers/multilang.ts
index 395748390a..ad03d0afdf 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/multilang.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/multilang.ts
@@ -18,7 +18,7 @@ import {
onAddLanguageDialogCompleteState,
onDelLanguageDialogCompleteState,
showDelLanguageModalState,
- botNameState,
+ botDisplayNameState,
} from './../atoms/botState';
const copyLanguageResources = (files: any[], fromLanguage: string, toLanguages: string[]): any[] => {
@@ -58,7 +58,7 @@ const deleteLanguageResources = (
export const multilangDispatcher = () => {
const setLocale = useRecoilCallback(
({ set, snapshot }: CallbackInterface) => async (locale: string, projectId: string) => {
- const botName = await snapshot.getPromise(botNameState(projectId));
+ const botName = await snapshot.getPromise(botDisplayNameState(projectId));
set(localeState(projectId), locale);
languageStorage.setLocale(botName, locale);
@@ -68,7 +68,7 @@ export const multilangDispatcher = () => {
const addLanguages = useRecoilCallback(
(callbackHelpers: CallbackInterface) => async ({ languages, defaultLang, switchTo = false, projectId }) => {
const { set, snapshot } = callbackHelpers;
- const botName = await snapshot.getPromise(botNameState(projectId));
+ const botName = await snapshot.getPromise(botDisplayNameState(projectId));
const prevlgFiles = await snapshot.getPromise(lgFilesState(projectId));
const prevluFiles = await snapshot.getPromise(luFilesState(projectId));
const prevSettings = await snapshot.getPromise(settingsState(projectId));
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/project.ts
index 506b2a5ff9..32c1e4f51d 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/project.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/project.ts
@@ -1,395 +1,305 @@
/* eslint-disable react-hooks/rules-of-hooks */
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { useRecoilCallback, CallbackInterface } from 'recoil';
-import {
- dereferenceDefinitions,
- LuFile,
- QnAFile,
- DialogInfo,
- SensitiveProperties,
- DialogSetting,
- convertSkillsToDictionary,
-} from '@bfc/shared';
-import { indexer, validateDialog } from '@bfc/indexers';
-import objectGet from 'lodash/get';
-import objectSet from 'lodash/set';
+
import formatMessage from 'format-message';
+import findIndex from 'lodash/findIndex';
+import { CallbackInterface, useRecoilCallback } from 'recoil';
-import lgWorker from '../parsers/lgWorker';
-import luWorker from '../parsers/luWorker';
-import qnaWorker from '../parsers/qnaWorker';
-import httpClient from '../../utils/httpUtil';
import { BotStatus } from '../../constants';
-import { getReferredLuFiles } from '../../utils/luUtil';
-import luFileStatusStorage from '../../utils/luFileStatusStorage';
-import { getReferredQnaFiles } from '../../utils/qnaUtil';
-import qnaFileStatusStorage from '../../utils/qnaFileStatusStorage';
import settingStorage from '../../utils/dialogSettingStorage';
-import filePersistence from '../persistence/FilePersistence';
+import { getFileNameFromPath } from '../../utils/fileUtil';
+import httpClient from '../../utils/httpUtil';
+import luFileStatusStorage from '../../utils/luFileStatusStorage';
import { navigateTo } from '../../utils/navigation';
-import languageStorage from '../../utils/languageStorage';
import { projectIdCache } from '../../utils/projectCache';
+import qnaFileStatusStorage from '../../utils/qnaFileStatusStorage';
import {
- designPageLocationState,
- botDiagnosticsState,
- botProjectsSpaceState,
- projectMetaDataState,
- filePersistenceState,
+ botErrorState,
+ botNameIdentifierState,
+ botOpeningState,
+ botProjectIdsState,
+ botProjectSpaceLoadedState,
+ botStatusState,
currentProjectIdState,
+ projectMetaDataState,
} from '../atoms';
-import { QnABotTemplateId } from '../../constants';
-import FilePersistence from '../persistence/FilePersistence';
-import UndoHistory from '../undo/undoHistory';
-import { undoHistoryState } from '../undo/history';
+import { dispatcherState } from '../DispatcherWrapper';
-import {
- skillManifestsState,
- settingsState,
- localeState,
- luFilesState,
- qnaFilesState,
- skillsState,
- schemasState,
- lgFilesState,
- locationState,
- botStatusState,
- botNameState,
- botEnvironmentState,
- dialogsState,
- botOpeningState,
- recentProjectsState,
- templateProjectsState,
- runtimeTemplatesState,
- applicationErrorState,
- templateIdState,
- announcementState,
- boilerplateVersionState,
- dialogSchemasState,
-} from './../atoms';
+import { announcementState, boilerplateVersionState, recentProjectsState, templateIdState } from './../atoms';
import { logMessage, setError } from './../dispatchers/shared';
+import {
+ checkIfBotExistsInBotProjectFile,
+ createNewBotFromTemplate,
+ flushExistingTasks,
+ getSkillNameIdentifier,
+ handleProjectFailure,
+ initBotState,
+ loadProjectData,
+ navigateToBot,
+ openLocalSkill,
+ openRemoteSkill,
+ openRootBotAndSkillsByPath,
+ openRootBotAndSkillsByProjectId,
+ removeRecentProject,
+ resetBotStates,
+ saveProject,
+} from './utils/project';
-const handleProjectFailure = (callbackHelpers: CallbackInterface, ex) => {
- callbackHelpers.set(botOpeningState, false);
- setError(callbackHelpers, ex);
-};
-
-const processSchema = (projectId: string, schema: any) => ({
- ...schema,
- definitions: dereferenceDefinitions(schema.definitions),
-});
-
-// if user set value in terminal or appsetting.json, it should update the value in localStorage
-const refreshLocalStorage = (projectId: string, settings: DialogSetting) => {
- for (const property of SensitiveProperties) {
- const value = objectGet(settings, property);
- if (value) {
- settingStorage.setField(projectId, property, value);
- }
- }
-};
+export const projectDispatcher = () => {
+ const removeSkillFromBotProject = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async (projectIdToRemove: string) => {
+ try {
+ const { set, snapshot } = callbackHelpers;
+ const dispatcher = await snapshot.getPromise(dispatcherState);
+ await dispatcher.removeSkillFromBotProjectFile(projectIdToRemove);
-// merge sensitive values in localStorage
-const mergeLocalStorage = (projectId: string, settings: DialogSetting) => {
- const localSetting = settingStorage.get(projectId);
- const mergedSettings = { ...settings };
- if (localSetting) {
- for (const property of SensitiveProperties) {
- const value = objectGet(localSetting, property);
- if (value) {
- objectSet(mergedSettings, property, value);
- } else {
- objectSet(mergedSettings, property, ''); // set those key back, because that were omit after persisited
+ set(botProjectIdsState, (currentProjects) => {
+ const filtered = currentProjects.filter((id) => id !== projectIdToRemove);
+ return filtered;
+ });
+ resetBotStates(callbackHelpers, projectIdToRemove);
+ } catch (ex) {
+ setError(callbackHelpers, ex);
}
}
- }
- return mergedSettings;
-};
-
-const updateLuFilesStatus = (projectId: string, luFiles: LuFile[]) => {
- const status = luFileStatusStorage.get(projectId);
- return luFiles.map((luFile) => {
- if (typeof status[luFile.id] === 'boolean') {
- return { ...luFile, published: status[luFile.id] };
- } else {
- return { ...luFile, published: false };
- }
- });
-};
-
-const initLuFilesStatus = (projectId: string, luFiles: LuFile[], dialogs: DialogInfo[]) => {
- luFileStatusStorage.checkFileStatus(
- projectId,
- getReferredLuFiles(luFiles, dialogs).map((file) => file.id)
);
- return updateLuFilesStatus(projectId, luFiles);
-};
-const updateQnaFilesStatus = (projectId: string, qnaFiles: QnAFile[]) => {
- const status = qnaFileStatusStorage.get(projectId);
- return qnaFiles.map((qnaFile) => {
- if (typeof status[qnaFile.id] === 'boolean') {
- return { ...qnaFile, published: status[qnaFile.id] };
- } else {
- return { ...qnaFile, published: false };
+ const replaceSkillInBotProject = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async (projectIdToRemove: string, path: string, storageId = 'default') => {
+ try {
+ const { snapshot } = callbackHelpers;
+ const dispatcher = await snapshot.getPromise(dispatcherState);
+ const projectIds = await snapshot.getPromise(botProjectIdsState);
+ const indexToReplace = findIndex(projectIds, (id) => id === projectIdToRemove);
+ if (indexToReplace === -1) {
+ return;
+ }
+ await dispatcher.removeSkillFromBotProject(projectIdToRemove);
+ await dispatcher.addExistingSkillToBotProject(path, storageId);
+ } catch (ex) {
+ setError(callbackHelpers, ex);
+ }
}
- });
-};
-
-const initQnaFilesStatus = (projectId: string, qnaFiles: QnAFile[], dialogs: DialogInfo[]) => {
- qnaFileStatusStorage.checkFileStatus(
- projectId,
- getReferredQnaFiles(qnaFiles, dialogs).map((file) => file.id)
);
- return updateQnaFilesStatus(projectId, qnaFiles);
-};
-export const projectDispatcher = () => {
- const initBotState = async (
- callbackHelpers: CallbackInterface,
- data: any,
- jump: boolean,
- templateId: string,
- qnaKbUrls?: string[]
- ) => {
- const { snapshot, gotoSnapshot, set } = callbackHelpers;
- const {
- files,
- botName,
- botEnvironment,
- location,
- schemas,
- settings,
- id: projectId,
- diagnostics,
- skills: skillContent,
- } = data;
- const curLocation = await snapshot.getPromise(locationState(projectId));
- const storedLocale = languageStorage.get(botName)?.locale;
- const locale = settings.languages.includes(storedLocale) ? storedLocale : settings.defaultLanguage;
-
- // cache current projectId in session, resolve page refresh caused state lost.
- projectIdCache.set(projectId);
-
- const mergedSettings = mergeLocalStorage(projectId, settings);
- if (Array.isArray(mergedSettings.skill)) {
- const skillsArr = mergedSettings.skill.map((skillData) => ({ ...skillData }));
- mergedSettings.skill = convertSkillsToDictionary(skillsArr);
- }
-
- try {
- schemas.sdk.content = processSchema(projectId, schemas.sdk.content);
- } catch (err) {
- const diagnostics = schemas.diagnostics ?? [];
- diagnostics.push(err.message);
- schemas.diagnostics = diagnostics;
- }
-
- try {
- const { dialogs, dialogSchemas, luFiles, lgFiles, qnaFiles, skillManifestFiles, skills } = indexer.index(
- files,
- botName,
- locale,
- skillContent,
- mergedSettings
- );
-
- let mainDialog = '';
- const verifiedDialogs = dialogs.map((dialog) => {
- if (dialog.isRoot) {
- mainDialog = dialog.id;
+ const addExistingSkillToBotProject = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async (path: string, storageId = 'default'): Promise => {
+ const { set, snapshot } = callbackHelpers;
+ try {
+ set(botOpeningState, true);
+ const dispatcher = await snapshot.getPromise(dispatcherState);
+ const botExists = await checkIfBotExistsInBotProjectFile(callbackHelpers, path);
+ if (botExists) {
+ throw new Error(
+ formatMessage('This operation cannot be completed. The skill is already part of the Bot Project')
+ );
}
- dialog.diagnostics = validateDialog(dialog, schemas.sdk.content, lgFiles, luFiles);
- return dialog;
- });
-
- await lgWorker.addProject(projectId, lgFiles);
- set(botProjectsSpaceState, []);
+ const skillNameIdentifier: string = await getSkillNameIdentifier(callbackHelpers, getFileNameFromPath(path));
- // Important: gotoSnapshot will wipe all states.
- const newSnapshot = snapshot.map(({ set }) => {
- set(skillManifestsState(projectId), skillManifestFiles);
- set(luFilesState(projectId), initLuFilesStatus(botName, luFiles, dialogs));
- set(lgFilesState(projectId), lgFiles);
- set(dialogsState(projectId), verifiedDialogs);
- set(dialogSchemasState(projectId), dialogSchemas);
- set(botEnvironmentState(projectId), botEnvironment);
- set(botNameState(projectId), botName);
- set(qnaFilesState(projectId), initQnaFilesStatus(botName, qnaFiles, dialogs));
- if (location !== curLocation) {
- set(botStatusState(projectId), BotStatus.unConnected);
- set(locationState(projectId), location);
+ const { projectId, mainDialog } = await openLocalSkill(callbackHelpers, path, storageId, skillNameIdentifier);
+ if (!mainDialog) {
+ const error = await snapshot.getPromise(botErrorState(projectId));
+ throw error;
}
- set(skillsState(projectId), skills);
- set(schemasState(projectId), schemas);
- set(localeState(projectId), locale);
- set(botDiagnosticsState(projectId), diagnostics);
- refreshLocalStorage(projectId, settings);
- set(settingsState(projectId), mergedSettings);
- set(filePersistenceState(projectId), new FilePersistence(projectId));
- set(undoHistoryState(projectId), new UndoHistory(projectId));
- //TODO: Botprojects space will be populated for now with just the rootbot. Once, BotProjects UI is hookedup this will be refactored to use addToBotProject
- set(botProjectsSpaceState, (current) => [...current, projectId]);
- set(projectMetaDataState(projectId), {
- isRootBot: true,
- });
+ set(botProjectIdsState, (current) => [...current, projectId]);
+ await dispatcher.addLocalSkillToBotProjectFile(projectId);
+ } catch (ex) {
+ handleProjectFailure(callbackHelpers, ex);
+ } finally {
set(botOpeningState, false);
- });
-
- gotoSnapshot(newSnapshot);
+ }
+ }
+ );
- if (jump && projectId) {
- // TODO: Refactor to set it always on init to the root bot
- set(currentProjectIdState, projectId);
- let url = `/bot/${projectId}/dialogs/${mainDialog}`;
- if (templateId === QnABotTemplateId) {
- url = `/bot/${projectId}/knowledge-base/${mainDialog}`;
- navigateTo(url, { state: { qnaKbUrls } });
- return;
+ const addRemoteSkillToBotProject = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async (manifestUrl: string, name: string, endpointName: string) => {
+ const { set, snapshot } = callbackHelpers;
+ try {
+ const dispatcher = await snapshot.getPromise(dispatcherState);
+ const botExists = await checkIfBotExistsInBotProjectFile(callbackHelpers, manifestUrl, true);
+ if (botExists) {
+ throw new Error(
+ formatMessage('This operation cannot be completed. The skill is already part of the Bot Project')
+ );
}
- navigateTo(url);
+ const skillNameIdentifier: string = await getSkillNameIdentifier(callbackHelpers, name);
+ set(botOpeningState, true);
+ const { projectId } = await openRemoteSkill(callbackHelpers, manifestUrl, skillNameIdentifier);
+ set(botProjectIdsState, (current) => [...current, projectId]);
+ await dispatcher.addRemoteSkillToBotProjectFile(projectId, manifestUrl, endpointName);
+ } catch (ex) {
+ handleProjectFailure(callbackHelpers, ex);
+ } finally {
+ set(botOpeningState, false);
}
- } catch (err) {
- callbackHelpers.set(botOpeningState, false);
- setError(callbackHelpers, err);
- navigateTo('/home');
}
- };
+ );
- const removeRecentProject = async (callbackHelpers: CallbackInterface, path: string) => {
- try {
- const {
- set,
- snapshot: { getPromise },
- } = callbackHelpers;
- const currentRecentProjects = await getPromise(recentProjectsState);
- const filtered = currentRecentProjects.filter((p) => p.path !== path);
- set(recentProjectsState, filtered);
- } catch (ex) {
- logMessage(callbackHelpers, `Error removing recent project: ${ex}`);
- }
- };
+ const addNewSkillToBotProject = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async (newProjectData: any) => {
+ const { set, snapshot } = callbackHelpers;
+ const dispatcher = await snapshot.getPromise(dispatcherState);
+ try {
+ const { templateId, name, description, location, schemaUrl, locale, qnaKbUrls } = newProjectData;
+ set(botOpeningState, true);
- const setBotOpeningStatus = async (callbackHelpers: CallbackInterface) => {
- const { set, snapshot } = callbackHelpers;
- set(botOpeningState, true);
- const botProjectSpace = await snapshot.getPromise(botProjectsSpaceState);
- const filePersistenceHandlers: filePersistence[] = [];
- for (const projectId of botProjectSpace) {
- const fp = await snapshot.getPromise(filePersistenceState(projectId));
- filePersistenceHandlers.push(fp);
+ const { projectId, mainDialog } = await createNewBotFromTemplate(
+ callbackHelpers,
+ templateId,
+ name,
+ description,
+ location,
+ schemaUrl,
+ locale
+ );
+ const skillNameIdentifier: string = await getSkillNameIdentifier(callbackHelpers, getFileNameFromPath(name));
+ set(botNameIdentifierState(projectId), skillNameIdentifier);
+ set(projectMetaDataState(projectId), {
+ isRemote: false,
+ isRootBot: false,
+ });
+ set(botProjectIdsState, (current) => [...current, projectId]);
+ await dispatcher.addLocalSkillToBotProjectFile(projectId);
+ navigateToBot(callbackHelpers, projectId, mainDialog, qnaKbUrls, templateId);
+ return projectId;
+ } catch (ex) {
+ handleProjectFailure(callbackHelpers, ex);
+ } finally {
+ set(botOpeningState, false);
+ }
}
- const workers = [lgWorker, luWorker, qnaWorker, ...filePersistenceHandlers];
- return Promise.all(workers.map((w) => w.flush()));
- };
+ );
const openProject = useRecoilCallback(
(callbackHelpers: CallbackInterface) => async (path: string, storageId = 'default') => {
+ const { set } = callbackHelpers;
try {
- await setBotOpeningStatus(callbackHelpers);
- const response = await httpClient.put(`/projects/open`, { path, storageId });
- await initBotState(callbackHelpers, response.data, true, '');
- return response.data.id;
+ set(botOpeningState, true);
+ await flushExistingTasks(callbackHelpers);
+ const { projectId, mainDialog } = await openRootBotAndSkillsByPath(callbackHelpers, path, storageId);
+
+ // Post project creation
+ set(projectMetaDataState(projectId), {
+ isRootBot: true,
+ isRemote: false,
+ });
+ projectIdCache.set(projectId);
+ navigateToBot(callbackHelpers, projectId, mainDialog);
} catch (ex) {
+ set(botProjectIdsState, []);
removeRecentProject(callbackHelpers, path);
handleProjectFailure(callbackHelpers, ex);
+ navigateTo('/home');
+ } finally {
+ set(botOpeningState, false);
}
}
);
const fetchProjectById = useRecoilCallback((callbackHelpers: CallbackInterface) => async (projectId: string) => {
+ const { set } = callbackHelpers;
try {
- const response = await httpClient.get(`/projects/${projectId}`);
- await initBotState(callbackHelpers, response.data, false, '');
+ await flushExistingTasks(callbackHelpers);
+ set(botOpeningState, true);
+ await openRootBotAndSkillsByProjectId(callbackHelpers, projectId);
+
+ // Post project creation
+ set(projectMetaDataState(projectId), {
+ isRootBot: true,
+ isRemote: false,
+ });
+ projectIdCache.set(projectId);
} catch (ex) {
+ set(botProjectIdsState, []);
handleProjectFailure(callbackHelpers, ex);
navigateTo('/home');
+ } finally {
+ set(botOpeningState, false);
}
});
- const createProject = useRecoilCallback(
- (callbackHelpers: CallbackInterface) => async (
- templateId: string,
- name: string,
- description: string,
- location: string,
- schemaUrl?: string,
- locale?: string,
- qnaKbUrls?: string[]
- ) => {
+ const createNewBot = useRecoilCallback((callbackHelpers: CallbackInterface) => async (newProjectData: any) => {
+ const { set } = callbackHelpers;
+ try {
+ await flushExistingTasks(callbackHelpers);
+ set(botOpeningState, true);
+ const { templateId, name, description, location, schemaUrl, locale, qnaKbUrls } = newProjectData;
+ const { projectId, mainDialog } = await createNewBotFromTemplate(
+ callbackHelpers,
+ templateId,
+ name,
+ description,
+ location,
+ schemaUrl,
+ locale
+ );
+ set(botProjectIdsState, [projectId]);
+
+ // Post project creation
+ set(projectMetaDataState(projectId), {
+ isRootBot: true,
+ isRemote: false,
+ });
+ projectIdCache.set(projectId);
+ navigateToBot(callbackHelpers, projectId, mainDialog, qnaKbUrls, templateId);
+ } catch (ex) {
+ set(botProjectIdsState, []);
+ handleProjectFailure(callbackHelpers, ex);
+ navigateTo('/home');
+ } finally {
+ set(botOpeningState, false);
+ }
+ });
+
+ const saveProjectAs = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async (oldProjectId, name, description, location) => {
+ const { set } = callbackHelpers;
try {
- await setBotOpeningStatus(callbackHelpers);
- const response = await httpClient.post(`/projects`, {
- storageId: 'default',
- templateId,
+ await flushExistingTasks(callbackHelpers);
+ set(botOpeningState, true);
+ const { projectId, mainDialog } = await saveProject(callbackHelpers, {
+ oldProjectId,
name,
description,
location,
- schemaUrl,
- locale,
});
- const projectId = response.data.id;
- if (settingStorage.get(projectId)) {
- settingStorage.remove(projectId);
- }
- await initBotState(callbackHelpers, response.data, true, templateId, qnaKbUrls);
- return projectId;
+
+ // Post project creation
+ set(projectMetaDataState(projectId), {
+ isRootBot: true,
+ isRemote: false,
+ });
+ projectIdCache.set(projectId);
+ navigateToBot(callbackHelpers, projectId, mainDialog);
} catch (ex) {
+ set(botProjectIdsState, []);
handleProjectFailure(callbackHelpers, ex);
+ navigateTo('/home');
+ } finally {
+ set(botOpeningState, false);
}
}
);
- const deleteBotProject = useRecoilCallback((callbackHelpers: CallbackInterface) => async (projectId: string) => {
- const { reset } = callbackHelpers;
+ const deleteBot = useRecoilCallback((callbackHelpers: CallbackInterface) => async (projectId: string) => {
try {
+ const { reset } = callbackHelpers;
await httpClient.delete(`/projects/${projectId}`);
luFileStatusStorage.removeAllStatuses(projectId);
qnaFileStatusStorage.removeAllStatuses(projectId);
settingStorage.remove(projectId);
projectIdCache.clear();
- reset(dialogsState(projectId));
- reset(botEnvironmentState(projectId));
- reset(botNameState(projectId));
- reset(botStatusState(projectId));
- reset(locationState(projectId));
- reset(lgFilesState(projectId));
- reset(skillsState(projectId));
- reset(schemasState(projectId));
- reset(luFilesState(projectId));
- reset(settingsState(projectId));
- reset(localeState(projectId));
- reset(skillManifestsState(projectId));
- reset(designPageLocationState(projectId));
- reset(filePersistenceState(projectId));
- reset(undoHistoryState(projectId));
- reset(botProjectsSpaceState);
+ resetBotStates(callbackHelpers, projectId);
+ reset(botProjectIdsState);
reset(currentProjectIdState);
+ reset(botProjectSpaceLoadedState);
} catch (e) {
logMessage(callbackHelpers, e.message);
}
});
- const saveProjectAs = useRecoilCallback(
- (callbackHelpers: CallbackInterface) => async (projectId, name, description, location) => {
- try {
- await setBotOpeningStatus(callbackHelpers);
- const response = await httpClient.post(`/projects/${projectId}/project/saveAs`, {
- storageId: 'default',
- name,
- description,
- location,
- });
- await initBotState(callbackHelpers, response.data, true, '');
- return response.data.id;
- } catch (ex) {
- handleProjectFailure(callbackHelpers, ex);
- logMessage(callbackHelpers, ex.message);
- }
- }
- );
-
const fetchRecentProjects = useRecoilCallback((callbackHelpers: CallbackInterface) => async () => {
const { set } = callbackHelpers;
try {
@@ -401,70 +311,12 @@ export const projectDispatcher = () => {
}
});
- const fetchRuntimeTemplates = useRecoilCallback<[], Promise>(
- (callbackHelpers: CallbackInterface) => async () => {
- const { set } = callbackHelpers;
- try {
- const response = await httpClient.get(`/runtime/templates`);
- if (Array.isArray(response.data)) {
- set(runtimeTemplatesState, [...response.data]);
- }
- } catch (ex) {
- // TODO: Handle exceptions
- logMessage(callbackHelpers, `Error fetching runtime templates: ${ex}`);
- }
- }
- );
-
- const fetchTemplates = useRecoilCallback<[], Promise>((callbackHelpers: CallbackInterface) => async () => {
- try {
- const response = await httpClient.get(`/assets/projectTemplates`);
-
- const data = response && response.data;
-
- if (data && Array.isArray(data) && data.length > 0) {
- callbackHelpers.set(templateProjectsState, data);
- }
- } catch (err) {
- // TODO: Handle exceptions
- logMessage(callbackHelpers, `Error fetching runtime templates: ${err}`);
- }
- });
-
const setBotStatus = useRecoilCallback<[BotStatus, string], void>(
({ set }: CallbackInterface) => (status: BotStatus, projectId: string) => {
set(botStatusState(projectId), status);
}
);
- const createFolder = useRecoilCallback<[string, string], Promise>(
- ({ set }: CallbackInterface) => async (path, name) => {
- const storageId = 'default';
- try {
- await httpClient.post(`/storages/folder`, { path, name, storageId });
- } catch (err) {
- set(applicationErrorState, {
- message: err.message,
- summary: formatMessage('Create Folder Error'),
- });
- }
- }
- );
-
- const updateFolder = useRecoilCallback<[string, string, string], Promise>(
- ({ set }: CallbackInterface) => async (path, oldName, newName) => {
- const storageId = 'default';
- try {
- await httpClient.put(`/storages/folder`, { path, oldName, newName, storageId });
- } catch (err) {
- set(applicationErrorState, {
- message: err.message,
- summary: formatMessage('Update Folder Name Error'),
- });
- }
- }
- );
-
const saveTemplateId = useRecoilCallback<[string], void>(({ set }: CallbackInterface) => (templateId) => {
if (templateId) {
set(templateIdState, templateId);
@@ -490,20 +342,28 @@ export const projectDispatcher = () => {
}
});
+ const reloadProject = async (callbackHelpers: CallbackInterface, response: any) => {
+ const { projectData, botFiles } = loadProjectData(response);
+
+ await initBotState(callbackHelpers, projectData, botFiles);
+ };
+
return {
openProject,
- createProject,
- deleteBotProject,
+ createNewBot,
+ deleteBot,
saveProjectAs,
- fetchTemplates,
fetchProjectById,
fetchRecentProjects,
- fetchRuntimeTemplates,
setBotStatus,
- updateFolder,
- createFolder,
saveTemplateId,
updateBoilerplate,
getBoilerplateVersion,
+ removeSkillFromBotProject,
+ addNewSkillToBotProject,
+ addExistingSkillToBotProject,
+ addRemoteSkillToBotProject,
+ replaceSkillInBotProject,
+ reloadProject,
};
};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/publisher.ts b/Composer/packages/client/src/recoilModel/dispatchers/publisher.ts
index c9eeac9e33..e4ec8f5a2e 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/publisher.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/publisher.ts
@@ -217,6 +217,7 @@ export const publisherDispatcher = () => {
}
}
);
+
return {
getPublishTargetTypes,
publishToTarget,
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/qna.ts b/Composer/packages/client/src/recoilModel/dispatchers/qna.ts
index adbbdedfff..8daac100ab 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/qna.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/qna.ts
@@ -3,9 +3,19 @@
/* eslint-disable react-hooks/rules-of-hooks */
import { QnAFile } from '@bfc/shared';
import { useRecoilCallback, CallbackInterface } from 'recoil';
+import { qnaUtil } from '@bfc/indexers';
import qnaWorker from '../parsers/qnaWorker';
-import { qnaFilesState, localeState, settingsState } from '../atoms/botState';
+import {
+ qnaFilesState,
+ localeState,
+ settingsState,
+ showCreateQnAFromScratchDialogState,
+ showCreateQnAFromUrlDialogState,
+ showCreateQnAFromUrlDialogWithScratchState,
+ onCreateQnAFromScratchDialogCompleteState,
+ onCreateQnAFromUrlDialogCompleteState,
+} from '../atoms/botState';
import qnaFileStatusStorage from '../../utils/qnaFileStatusStorage';
import { getBaseName } from '../../utils/fileUtil';
import { navigateTo } from '../../utils/navigation';
@@ -63,24 +73,205 @@ export const createQnAFileState = async (
set(qnaFilesState(projectId), [...qnaFiles, ...changes]);
};
+/**
+ * id can be
+ * 1. dialogId, no locale
+ * 2. qna file id, with locale
+ * 3. source qna file id, no locale
+ */
export const removeQnAFileState = async (
callbackHelpers: CallbackInterface,
{ id, projectId }: { id: string; projectId: string }
) => {
const { set, snapshot } = callbackHelpers;
let qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const locale = await snapshot.getPromise(localeState(projectId));
+
+ const targetQnAFile =
+ qnaFiles.find((item) => item.id === id) || qnaFiles.find((item) => item.id === `${id}.${locale}`);
+ if (!targetQnAFile) {
+ throw new Error(`remove qna file ${id} not exist`);
+ }
qnaFiles.forEach((file) => {
- if (getBaseName(file.id) === getBaseName(id)) {
- qnaFileStatusStorage.removeFileStatus(projectId, id);
+ if (file.id === targetQnAFile.id) {
+ qnaFileStatusStorage.removeFileStatus(projectId, targetQnAFile.id);
}
});
- qnaFiles = qnaFiles.filter((file) => getBaseName(file.id) !== id);
+ qnaFiles = qnaFiles.filter((file) => file.id !== targetQnAFile.id);
set(qnaFilesState(projectId), qnaFiles);
};
+export const createKBFileState = async (
+ callbackHelpers: CallbackInterface,
+ { id, name, content, projectId }: { id: string; name: string; content: string; projectId: string }
+) => {
+ const { set, snapshot } = callbackHelpers;
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const createdSourceQnAId = `${name}.source`;
+
+ if (qnaFiles.find((qna) => qna.id === createdSourceQnAId)) {
+ throw new Error(`source qna file ${createdSourceQnAId}.qna already exist`);
+ }
+
+ const createdQnAFile = (await qnaWorker.parse(createdSourceQnAId, content)) as QnAFile;
+
+ let newQnAFiles = [...qnaFiles];
+
+ // if created on a dialog, need update this dialog's all locale qna ref
+ if (id.includes('.source') === false) {
+ const updatedQnAId = id;
+ if (!qnaFiles.find((f) => f.id === updatedQnAId)) {
+ throw new Error(`update qna file ${updatedQnAId}.qna not exist`);
+ }
+
+ newQnAFiles = qnaFiles.map((file) => {
+ if (!file.id.endsWith('.source') && getBaseName(file.id) === getBaseName(updatedQnAId)) {
+ return qnaUtil.addImport(file, `${createdSourceQnAId}.qna`);
+ }
+ return file;
+ });
+
+ qnaFileStatusStorage.updateFileStatus(projectId, updatedQnAId);
+ }
+
+ qnaFileStatusStorage.updateFileStatus(projectId, createdSourceQnAId);
+ set(qnaFilesState(projectId), [createdQnAFile, ...newQnAFiles]);
+};
+
+export const removeKBFileState = async (
+ callbackHelpers: CallbackInterface,
+ { id, projectId }: { id: string; projectId: string }
+) => {
+ const { set, snapshot } = callbackHelpers;
+ let qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const locale = await snapshot.getPromise(localeState(projectId));
+
+ const targetQnAFile =
+ qnaFiles.find((item) => item.id === id) || qnaFiles.find((item) => item.id === `${id}.${locale}`);
+ if (!targetQnAFile) {
+ throw new Error(`remove qna container file ${id} not exist`);
+ }
+
+ qnaFiles.forEach((file) => {
+ if (file.id === targetQnAFile.id) {
+ qnaFileStatusStorage.removeFileStatus(projectId, targetQnAFile.id);
+ }
+ });
+
+ qnaFiles = qnaFiles.filter((file) => file.id !== targetQnAFile.id);
+ set(qnaFilesState(projectId), qnaFiles);
+};
+
+export const renameKBFileState = async (
+ callbackHelpers: CallbackInterface,
+ { id, name, projectId }: { id: string; name: string; projectId: string }
+) => {
+ const { set, snapshot } = callbackHelpers;
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const locale = await snapshot.getPromise(localeState(projectId));
+
+ const targetQnAFile =
+ qnaFiles.find((item) => item.id === id) || qnaFiles.find((item) => item.id === `${id}.${locale}`);
+ if (!targetQnAFile) {
+ throw new Error(`rename qna container file ${id} not exist`);
+ }
+
+ const existQnAFile =
+ qnaFiles.find((item) => item.id === name) || qnaFiles.find((item) => item.id === `${name}.${locale}`);
+ if (existQnAFile) {
+ throw new Error(`rename qna container file to ${name} already exist`);
+ }
+ qnaFileStatusStorage.removeFileStatus(projectId, targetQnAFile.id);
+
+ const newQnAFiles = qnaFiles.map((file) => {
+ if (file.id === targetQnAFile.id) {
+ return {
+ ...file,
+ id: name,
+ };
+ }
+ return file;
+ });
+
+ set(qnaFilesState(projectId), newQnAFiles);
+};
+
export const qnaDispatcher = () => {
+ const createQnAFromUrlDialogBegin = useRecoilCallback(
+ ({ set }: CallbackInterface) => async ({
+ onComplete,
+ projectId,
+ showFromScratch,
+ }: {
+ onComplete?: () => void;
+ showFromScratch: boolean;
+ projectId: string;
+ }) => {
+ set(showCreateQnAFromUrlDialogState(projectId), true);
+ if (showFromScratch) {
+ set(showCreateQnAFromUrlDialogWithScratchState(projectId), true);
+ } else {
+ set(showCreateQnAFromUrlDialogWithScratchState(projectId), false);
+ }
+ set(onCreateQnAFromUrlDialogCompleteState(projectId), { func: onComplete });
+ }
+ );
+
+ const createQnAFromUrlDialogCancel = useRecoilCallback(
+ ({ set }: CallbackInterface) => ({ projectId }: { projectId: string }) => {
+ set(showCreateQnAFromUrlDialogState(projectId), false);
+ set(onCreateQnAFromUrlDialogCompleteState(projectId), { func: undefined });
+ }
+ );
+
+ const createQnAFromScratchDialogBegin = useRecoilCallback(
+ ({ set }: CallbackInterface) => async ({
+ onComplete,
+ projectId,
+ }: {
+ onComplete?: () => void;
+ projectId: string;
+ }) => {
+ set(showCreateQnAFromScratchDialogState(projectId), true);
+ set(onCreateQnAFromScratchDialogCompleteState(projectId), { func: onComplete });
+ }
+ );
+
+ const createQnAFromScratchDialogCancel = useRecoilCallback(
+ ({ set }: CallbackInterface) => async ({ projectId }: { projectId: string }) => {
+ set(showCreateQnAFromScratchDialogState(projectId), false);
+ set(onCreateQnAFromScratchDialogCompleteState(projectId), { func: undefined });
+ }
+ );
+
+ const createQnAFromUrlDialogSuccess = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({ projectId }: { projectId: string }) => {
+ const onCreateQnAFromUrlDialogComplete = (
+ await snapshot.getPromise(onCreateQnAFromUrlDialogCompleteState(projectId))
+ ).func;
+ if (typeof onCreateQnAFromUrlDialogComplete === 'function') {
+ onCreateQnAFromUrlDialogComplete();
+ }
+ set(showCreateQnAFromUrlDialogState(projectId), false);
+ set(onCreateQnAFromUrlDialogCompleteState(projectId), { func: undefined });
+ }
+ );
+
+ const createQnAFromScratchDialogSuccess = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({ projectId }: { projectId: string }) => {
+ const onCreateQnAFromScratchDialogComplete = (
+ await snapshot.getPromise(onCreateQnAFromScratchDialogCompleteState(projectId))
+ ).func;
+ if (typeof onCreateQnAFromScratchDialogComplete === 'function') {
+ onCreateQnAFromScratchDialogComplete();
+ }
+ set(showCreateQnAFromScratchDialogState(projectId), false);
+ set(onCreateQnAFromScratchDialogCompleteState(projectId), { func: undefined });
+ }
+ );
+
const updateQnAFile = useRecoilCallback(
(callbackHelpers: CallbackInterface) => async ({
id,
@@ -109,28 +300,43 @@ export const qnaDispatcher = () => {
}
);
- const importQnAFromUrls = useRecoilCallback(
+ const removeQnAFile = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async ({ id, projectId }: { id: string; projectId: string }) => {
+ await removeQnAFileState(callbackHelpers, { id, projectId });
+ }
+ );
+
+ const dismissCreateQnAModal = useRecoilCallback(
+ ({ set }: CallbackInterface) => async ({ projectId }: { projectId: string }) => {
+ set(showCreateQnAFromUrlDialogState(projectId), false);
+ set(showCreateQnAFromScratchDialogState(projectId), false);
+ }
+ );
+
+ const createQnAKBFromUrl = useRecoilCallback(
(callbackHelpers: CallbackInterface) => async ({
id,
- urls,
+ name,
+ url,
+ multiTurn,
projectId,
}: {
- id: string;
- urls: string[];
+ id: string; // dialogId.locale
+ name: string;
+ url: string;
+ multiTurn: boolean;
projectId: string;
}) => {
- const { snapshot } = callbackHelpers;
- const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
- const qnaFile = qnaFiles.find((f) => f.id === id);
-
- const notification = createNotifiction(getQnaPendingNotification(urls));
+ await dismissCreateQnAModal({ projectId });
+ const notification = createNotifiction(getQnaPendingNotification(url));
addNotificationInternal(callbackHelpers, notification);
+ let response;
try {
- const response = await httpClient.get(`/utilities/qna/parse`, {
- params: { urls: encodeURIComponent(urls.join(',')) },
+ response = await httpClient.get(`/utilities/qna/parse`, {
+ params: { url: encodeURIComponent(url), multiTurn },
});
- const content = qnaFile ? qnaFile.content + '\n' + response.data : response.data;
+ const content = response.data;
await updateQnAFileState(callbackHelpers, { id, content, projectId });
const notification = createNotifiction(
@@ -145,15 +351,318 @@ export const qnaDispatcher = () => {
callbackHelpers,
createNotifiction(getQnaFailedNotification(err.response?.data?.message))
);
+ createQnAFromUrlDialogCancel({ projectId });
+ return;
} finally {
deleteNotificationInternal(callbackHelpers, notification.id);
}
+
+ const contentForSourceQnA = `> !# @source.url=${url}
+> !# @source.multiTurn=${multiTurn}
+${response.data}
+`;
+
+ await createKBFileState(callbackHelpers, {
+ id,
+ name,
+ content: contentForSourceQnA,
+ projectId,
+ });
+
+ await createQnAFromUrlDialogSuccess({ projectId });
+ }
+ );
+
+ const createQnAKBFromScratch = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async ({
+ id,
+ name,
+ projectId,
+ content = '',
+ }: {
+ id: string; // dialogId.locale
+ name: string;
+ content?: string;
+ projectId: string;
+ }) => {
+ await dismissCreateQnAModal({ projectId });
+
+ await createKBFileState(callbackHelpers, {
+ id,
+ name,
+ content,
+ projectId,
+ });
+ await createQnAFromScratchDialogSuccess({ projectId });
+
+ const notification = createNotifiction(
+ getQnaSuccessNotification(() => {
+ navigateTo(`/bot/${projectId}/knowledge-base/${getBaseName(id)}`);
+ deleteNotificationInternal(callbackHelpers, notification.id);
+ })
+ );
+ addNotificationInternal(callbackHelpers, notification);
+ }
+ );
+
+ const updateQnAQuestion = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sectionId,
+ questionId,
+ content,
+ projectId,
+ }: {
+ id: string;
+ sectionId: string;
+ questionId: string;
+ content: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ // const updatedFile = await updateQnAFileState(callbackHelpers, { id, content });
+ const updatedFile = qnaUtil.updateQnAQuestion(qnaFile, sectionId, questionId, content);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+
+ const updateQnAAnswer = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sectionId,
+ content,
+ projectId,
+ }: {
+ id: string;
+ sectionId: string;
+ content: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ const updatedFile = qnaUtil.updateQnAAnswer(qnaFile, sectionId, content);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+
+ const createQnAQuestion = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sectionId,
+ content,
+ projectId,
+ }: {
+ id: string;
+ sectionId: string;
+ content: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ const updatedFile = qnaUtil.createQnAQuestion(qnaFile, sectionId, content);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+
+ const removeQnAQuestion = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sectionId,
+ questionId,
+ projectId,
+ }: {
+ id: string;
+ sectionId: string;
+ questionId: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ const updatedFile = qnaUtil.removeQnAQuestion(qnaFile, sectionId, questionId);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+
+ const createQnAPairs = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ content,
+ projectId,
+ }: {
+ id: string;
+ content: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ // insert into head, need investigate
+ const updatedFile = qnaUtil.insertSection(qnaFile, 0, content);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+
+ const removeQnAPairs = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sectionId,
+ projectId,
+ }: {
+ id: string;
+ sectionId: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ const updatedFile = qnaUtil.removeSection(qnaFile, sectionId);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+
+ const createQnAImport = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sourceId,
+ projectId,
+ }: {
+ id: string;
+ sourceId: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ const updatedFile = qnaUtil.addImport(qnaFile, `${sourceId}.qna`);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+ const removeQnAImport = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sourceId,
+ projectId,
+ }: {
+ id: string;
+ sourceId: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ const updatedFile = qnaUtil.removeImport(qnaFile, `${sourceId}.qna`);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+ const updateQnAImport = useRecoilCallback(
+ ({ set, snapshot }: CallbackInterface) => async ({
+ id,
+ sourceId,
+ newSourceId,
+ projectId,
+ }: {
+ id: string;
+ sourceId: string;
+ newSourceId: string;
+ projectId: string;
+ }) => {
+ const qnaFiles = await snapshot.getPromise(qnaFilesState(projectId));
+ const qnaFile = qnaFiles.find((temp) => temp.id === id);
+ if (!qnaFile) return qnaFiles;
+
+ let updatedFile = qnaUtil.removeImport(qnaFile, `${sourceId}.qna`);
+ updatedFile = qnaUtil.addImport(updatedFile, `${newSourceId}.qna`);
+ set(qnaFilesState(projectId), (qnaFiles) => {
+ return qnaFiles.map((file) => {
+ return file.id === id ? updatedFile : file;
+ });
+ });
+ }
+ );
+ const removeQnAKB = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async ({ id, projectId }: { id: string; projectId: string }) => {
+ await removeKBFileState(callbackHelpers, { id, projectId });
+ }
+ );
+ const renameQnAKB = useRecoilCallback(
+ (callbackHelpers: CallbackInterface) => async ({
+ id,
+ name,
+ projectId,
+ }: {
+ id: string;
+ name: string;
+ projectId: string;
+ }) => {
+ await renameKBFileState(callbackHelpers, { id, name, projectId });
}
);
return {
+ createQnAImport,
+ removeQnAImport,
+ updateQnAImport,
+ createQnAPairs,
+ removeQnAPairs,
+ createQnAQuestion,
+ removeQnAQuestion,
+ updateQnAQuestion,
+ updateQnAAnswer,
createQnAFile,
+ removeQnAFile,
updateQnAFile,
- importQnAFromUrls,
+ removeQnAKB,
+ renameQnAKB,
+ createQnAKBFromUrl,
+ createQnAKBFromScratch,
+ createQnAFromScratchDialogBegin,
+ createQnAFromScratchDialogCancel,
+ createQnAFromUrlDialogBegin,
+ createQnAFromUrlDialogCancel,
};
};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/setting.ts b/Composer/packages/client/src/recoilModel/dispatchers/setting.ts
index d13761e46b..df4b388635 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/setting.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/setting.ts
@@ -30,7 +30,7 @@ export const setSettingState = async (
keys(settings.skill).map(async (id) => {
if (settings?.skill?.[id]?.manifestUrl !== previousSettings?.skill?.[id]?.manifestUrl) {
try {
- const { data: content } = await httpClient.get(`/projects/${projectId}/skill/retrieve-skill-manifest`, {
+ const { data: content } = await httpClient.get(`/projects/${projectId}/skill/retrieveSkillManifest`, {
params: {
url: settings?.skill?.[id]?.manifestUrl,
},
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/shared.ts b/Composer/packages/client/src/recoilModel/dispatchers/shared.ts
index 811de1fd41..a930d50b10 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/shared.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/shared.ts
@@ -41,12 +41,18 @@ export const setError = (callbackHelpers: CallbackInterface, payload) => {
),
summary: formatMessage('Modification Rejected'),
});
+ } else if (payload?.response?.data?.message) {
+ callbackHelpers.set(applicationErrorState, payload.response.data);
+ } else if (payload instanceof Error) {
+ callbackHelpers.set(applicationErrorState, {
+ summary: payload.name,
+ message: payload.message,
+ });
} else {
- if (payload?.response?.data?.message) {
- callbackHelpers.set(applicationErrorState, payload.response.data);
- } else {
- callbackHelpers.set(applicationErrorState, payload);
- }
+ callbackHelpers.set(applicationErrorState, payload);
+ }
+ if (payload != null) {
+ const message = JSON.stringify(payload);
+ logMessage(callbackHelpers, `Error: ${message}`);
}
- if (payload != null) logMessage(callbackHelpers, `Error: ${JSON.stringify(payload)}`);
};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/storage.ts b/Composer/packages/client/src/recoilModel/dispatchers/storage.ts
index 39a36ec702..2c8352e52c 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/storage.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/storage.ts
@@ -3,9 +3,17 @@
// Licensed under the MIT License.
import { useRecoilCallback, CallbackInterface } from 'recoil';
import isArray from 'lodash/isArray';
+import formatMessage from 'format-message';
import httpClient from '../../utils/httpUtil';
-import { storagesState, storageFileLoadingStatusState, focusedStorageFolderState } from '../atoms/appState';
+import {
+ storagesState,
+ storageFileLoadingStatusState,
+ focusedStorageFolderState,
+ applicationErrorState,
+ templateProjectsState,
+ runtimeTemplatesState,
+} from '../atoms/appState';
import { FileTypes } from '../../constants';
import { getExtension } from '../../utils/fileUtil';
@@ -101,6 +109,64 @@ export const storageDispatcher = () => {
}
);
+ const createFolder = useRecoilCallback<[string, string], Promise>(
+ ({ set }: CallbackInterface) => async (path, name) => {
+ const storageId = 'default';
+ try {
+ await httpClient.post(`/storages/folder`, { path, name, storageId });
+ } catch (err) {
+ set(applicationErrorState, {
+ message: err.message,
+ summary: formatMessage('Create Folder Error'),
+ });
+ }
+ }
+ );
+
+ const updateFolder = useRecoilCallback<[string, string, string], Promise>(
+ ({ set }: CallbackInterface) => async (path, oldName, newName) => {
+ const storageId = 'default';
+ try {
+ await httpClient.put(`/storages/folder`, { path, oldName, newName, storageId });
+ } catch (err) {
+ set(applicationErrorState, {
+ message: err.message,
+ summary: formatMessage('Update Folder Name Error'),
+ });
+ }
+ }
+ );
+
+ const fetchTemplates = useRecoilCallback<[], Promise>((callbackHelpers: CallbackInterface) => async () => {
+ try {
+ const response = await httpClient.get(`/assets/projectTemplates`);
+
+ const data = response && response.data;
+
+ if (data && Array.isArray(data) && data.length > 0) {
+ callbackHelpers.set(templateProjectsState, data);
+ }
+ } catch (err) {
+ // TODO: Handle exceptions
+ logMessage(callbackHelpers, `Error fetching runtime templates: ${err}`);
+ }
+ });
+
+ const fetchRuntimeTemplates = useRecoilCallback<[], Promise>(
+ (callbackHelpers: CallbackInterface) => async () => {
+ const { set } = callbackHelpers;
+ try {
+ const response = await httpClient.get(`/runtime/templates`);
+ if (Array.isArray(response.data)) {
+ set(runtimeTemplatesState, [...response.data]);
+ }
+ } catch (ex) {
+ // TODO: Handle exceptions
+ logMessage(callbackHelpers, `Error fetching runtime templates: ${ex}`);
+ }
+ }
+ );
+
return {
fetchStorages,
updateCurrentPathForStorage,
@@ -108,5 +174,9 @@ export const storageDispatcher = () => {
fetchStorageByName,
fetchFolderItemsByPath,
setStorageFileLoadingStatus,
+ createFolder,
+ updateFolder,
+ fetchTemplates,
+ fetchRuntimeTemplates,
};
};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts
new file mode 100644
index 0000000000..e0bffa6dd2
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts
@@ -0,0 +1,585 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { indexer, validateDialog } from '@bfc/indexers';
+import {
+ BotProjectFile,
+ BotProjectSpace,
+ BotProjectSpaceSkill,
+ convertFileProtocolToPath,
+ convertSkillsToDictionary,
+ dereferenceDefinitions,
+ DialogInfo,
+ DialogSetting,
+ LuFile,
+ QnAFile,
+ SensitiveProperties,
+} from '@bfc/shared';
+import formatMessage from 'format-message';
+import camelCase from 'lodash/camelCase';
+import objectGet from 'lodash/get';
+import objectSet from 'lodash/set';
+import { stringify } from 'query-string';
+import { CallbackInterface } from 'recoil';
+import { v4 as uuid } from 'uuid';
+
+import { BotStatus, QnABotTemplateId } from '../../../constants';
+import settingStorage from '../../../utils/dialogSettingStorage';
+import { getUniqueName } from '../../../utils/fileUtil';
+import httpClient from '../../../utils/httpUtil';
+import languageStorage from '../../../utils/languageStorage';
+import luFileStatusStorage from '../../../utils/luFileStatusStorage';
+import { getReferredLuFiles } from '../../../utils/luUtil';
+import { navigateTo } from '../../../utils/navigation';
+import qnaFileStatusStorage from '../../../utils/qnaFileStatusStorage';
+import { getReferredQnaFiles, reformQnAToContainerKB } from '../../../utils/qnaUtil';
+import {
+ botDiagnosticsState,
+ botDisplayNameState,
+ botEnvironmentState,
+ botErrorState,
+ botNameIdentifierState,
+ botProjectFileState,
+ botProjectIdsState,
+ botProjectSpaceLoadedState,
+ botStatusState,
+ currentProjectIdState,
+ dialogSchemasState,
+ dialogsState,
+ filePersistenceState,
+ formDialogSchemaIdsState,
+ formDialogSchemaState,
+ jsonSchemaFilesState,
+ lgFilesState,
+ localeState,
+ locationState,
+ luFilesState,
+ projectMetaDataState,
+ qnaFilesState,
+ recentProjectsState,
+ schemasState,
+ settingsState,
+ skillManifestsState,
+ skillsState,
+ showCreateQnAFromUrlDialogState,
+} from '../../atoms';
+import * as botstates from '../../atoms/botState';
+import lgWorker from '../../parsers/lgWorker';
+import luWorker from '../../parsers/luWorker';
+import qnaWorker from '../../parsers/qnaWorker';
+import FilePersistence from '../../persistence/FilePersistence';
+import { rootBotProjectIdSelector } from '../../selectors';
+import { undoHistoryState } from '../../undo/history';
+import UndoHistory from '../../undo/undoHistory';
+import { logMessage, setError } from '../shared';
+
+export const resetBotStates = async ({ reset }: CallbackInterface, projectId: string) => {
+ const botStates = Object.keys(botstates);
+ botStates.forEach((state) => {
+ const currentRecoilAtom: any = botstates[state];
+ reset(currentRecoilAtom(projectId));
+ });
+};
+
+export const setErrorOnBotProject = async (
+ callbackHelpers: CallbackInterface,
+ projectId: string,
+ botName: string,
+ payload: any
+) => {
+ const { set } = callbackHelpers;
+ if (payload?.response?.data?.message) {
+ set(botErrorState(projectId), payload.response.data);
+ } else {
+ set(botErrorState(projectId), payload);
+ }
+ if (payload != null) logMessage(callbackHelpers, `Error loading ${botName}: ${JSON.stringify(payload)}`);
+};
+
+export const flushExistingTasks = async (callbackHelpers) => {
+ const { snapshot, reset } = callbackHelpers;
+ reset(botProjectSpaceLoadedState);
+ const projectIds = await snapshot.getPromise(botProjectIdsState);
+ reset(botProjectIdsState, []);
+ for (const projectId of projectIds) {
+ resetBotStates(callbackHelpers, projectId);
+ }
+ const workers = [lgWorker, luWorker, qnaWorker];
+
+ return Promise.all([workers.map((w) => w.flush())]);
+};
+
+// merge sensitive values in localStorage
+const mergeLocalStorage = (projectId: string, settings: DialogSetting) => {
+ const localSetting = settingStorage.get(projectId);
+ const mergedSettings = { ...settings };
+ if (localSetting) {
+ for (const property of SensitiveProperties) {
+ const value = objectGet(localSetting, property);
+ if (value) {
+ objectSet(mergedSettings, property, value);
+ } else {
+ objectSet(mergedSettings, property, ''); // set those key back, because that were omit after persisited
+ }
+ }
+ }
+ return mergedSettings;
+};
+
+export const getMergedSettings = (projectId, settings): DialogSetting => {
+ const mergedSettings = mergeLocalStorage(projectId, settings);
+ if (Array.isArray(mergedSettings.skill)) {
+ const skillsArr = mergedSettings.skill.map((skillData) => ({ ...skillData }));
+ mergedSettings.skill = convertSkillsToDictionary(skillsArr);
+ }
+ return mergedSettings;
+};
+
+export const navigateToBot = (
+ callbackHelpers: CallbackInterface,
+ projectId: string,
+ mainDialog: string,
+ qnaKbUrls?: string[],
+ templateId?: string
+) => {
+ if (projectId) {
+ const { set } = callbackHelpers;
+ set(currentProjectIdState, projectId);
+ let url = `/bot/${projectId}/dialogs/${mainDialog}`;
+ if (templateId === QnABotTemplateId) {
+ url = `/bot/${projectId}/knowledge-base/${mainDialog}`;
+ navigateTo(url, { state: { qnaKbUrls } });
+ return;
+ }
+ navigateTo(url);
+ }
+};
+
+export const loadProjectData = (response) => {
+ const { files, botName, settings, skills: skillContent, id: projectId } = response.data;
+ const mergedSettings = getMergedSettings(projectId, settings);
+ const storedLocale = languageStorage.get(botName)?.locale;
+ const locale = settings.languages.includes(storedLocale) ? storedLocale : settings.defaultLanguage;
+ const indexedFiles = indexer.index(files, botName, locale, skillContent, mergedSettings);
+
+ // migrate script move qna pairs in *.qna to *-manual.source.qna.
+ // TODO: remove after a period of time.
+ const updateQnAFiles = reformQnAToContainerKB(projectId, indexedFiles.qnaFiles);
+
+ return {
+ botFiles: { ...indexedFiles, qnaFiles: updateQnAFiles, mergedSettings },
+ projectData: response.data,
+ error: undefined,
+ };
+};
+
+export const fetchProjectDataByPath = async (
+ path: string,
+ storageId
+): Promise<{ botFiles: any; projectData: any; error: any }> => {
+ try {
+ const response = await httpClient.put(`/projects/open`, { path, storageId });
+ const projectData = loadProjectData(response);
+ return projectData;
+ } catch (ex) {
+ return {
+ botFiles: undefined,
+ projectData: undefined,
+ error: ex,
+ };
+ }
+};
+
+export const fetchProjectDataById = async (projectId): Promise<{ botFiles: any; projectData: any; error: any }> => {
+ try {
+ const response = await httpClient.get(`/projects/${projectId}`);
+ const projectData = loadProjectData(response);
+ return projectData;
+ } catch (ex) {
+ return {
+ botFiles: undefined,
+ projectData: undefined,
+ error: ex,
+ };
+ }
+};
+
+export const handleProjectFailure = (callbackHelpers: CallbackInterface, ex) => {
+ setError(callbackHelpers, ex);
+};
+
+export const processSchema = (projectId: string, schema: any) => ({
+ ...schema,
+ definitions: dereferenceDefinitions(schema.definitions),
+});
+
+// if user set value in terminal or appsetting.json, it should update the value in localStorage
+export const refreshLocalStorage = (projectId: string, settings: DialogSetting) => {
+ for (const property of SensitiveProperties) {
+ const value = objectGet(settings, property);
+ if (value) {
+ settingStorage.setField(projectId, property, value);
+ }
+ }
+};
+
+export const updateLuFilesStatus = (projectId: string, luFiles: LuFile[]) => {
+ const status = luFileStatusStorage.get(projectId);
+ return luFiles.map((luFile) => {
+ if (typeof status[luFile.id] === 'boolean') {
+ return { ...luFile, published: status[luFile.id] };
+ } else {
+ return { ...luFile, published: false };
+ }
+ });
+};
+
+export const initLuFilesStatus = (projectId: string, luFiles: LuFile[], dialogs: DialogInfo[]) => {
+ luFileStatusStorage.checkFileStatus(
+ projectId,
+ getReferredLuFiles(luFiles, dialogs).map((file) => file.id)
+ );
+ return updateLuFilesStatus(projectId, luFiles);
+};
+
+export const updateQnaFilesStatus = (projectId: string, qnaFiles: QnAFile[]) => {
+ const status = qnaFileStatusStorage.get(projectId);
+ return qnaFiles.map((qnaFile) => {
+ if (typeof status[qnaFile.id] === 'boolean') {
+ return { ...qnaFile, published: status[qnaFile.id] };
+ } else {
+ return { ...qnaFile, published: false };
+ }
+ });
+};
+
+export const initQnaFilesStatus = (projectId: string, qnaFiles: QnAFile[], dialogs: DialogInfo[]) => {
+ qnaFileStatusStorage.checkFileStatus(
+ projectId,
+ getReferredQnaFiles(qnaFiles, dialogs).map((file) => file.id)
+ );
+ return updateQnaFilesStatus(projectId, qnaFiles);
+};
+
+export const initBotState = async (callbackHelpers: CallbackInterface, data: any, botFiles: any) => {
+ const { snapshot, set } = callbackHelpers;
+ const { botName, botEnvironment, location, schemas, settings, id: projectId, diagnostics } = data;
+ const {
+ dialogs,
+ dialogSchemas,
+ luFiles,
+ lgFiles,
+ qnaFiles,
+ jsonSchemaFiles,
+ formDialogSchemas,
+ skillManifestFiles,
+ skills,
+ mergedSettings,
+ } = botFiles;
+ const curLocation = await snapshot.getPromise(locationState(projectId));
+ const storedLocale = languageStorage.get(botName)?.locale;
+ const locale = settings.languages.includes(storedLocale) ? storedLocale : settings.defaultLanguage;
+
+ try {
+ schemas.sdk.content = processSchema(projectId, schemas.sdk.content);
+ } catch (err) {
+ const diagnostics = schemas.diagnostics ?? [];
+ diagnostics.push(err.message);
+ schemas.diagnostics = diagnostics;
+ }
+
+ let mainDialog = '';
+ const verifiedDialogs = dialogs.map((dialog) => {
+ if (dialog.isRoot) {
+ mainDialog = dialog.id;
+ }
+ dialog.diagnostics = validateDialog(dialog, schemas.sdk.content, lgFiles, luFiles);
+ return dialog;
+ });
+
+ await lgWorker.addProject(projectId, lgFiles);
+
+ // Form dialogs
+ set(
+ formDialogSchemaIdsState(projectId),
+ formDialogSchemas.map((f) => f.id)
+ );
+ formDialogSchemas.forEach(({ id, content }) => {
+ set(formDialogSchemaState({ projectId, schemaId: id }), { id, content });
+ });
+
+ set(skillManifestsState(projectId), skillManifestFiles);
+ set(luFilesState(projectId), initLuFilesStatus(botName, luFiles, dialogs));
+ set(lgFilesState(projectId), lgFiles);
+ set(jsonSchemaFilesState(projectId), jsonSchemaFiles);
+ set(dialogsState(projectId), verifiedDialogs);
+ set(dialogSchemasState(projectId), dialogSchemas);
+ set(botEnvironmentState(projectId), botEnvironment);
+ set(botDisplayNameState(projectId), botName);
+ set(qnaFilesState(projectId), initQnaFilesStatus(botName, qnaFiles, dialogs));
+ if (location !== curLocation) {
+ set(botStatusState(projectId), BotStatus.unConnected);
+ set(locationState(projectId), location);
+ }
+ set(skillsState(projectId), skills);
+ set(schemasState(projectId), schemas);
+ set(localeState(projectId), locale);
+ set(botDiagnosticsState(projectId), diagnostics);
+
+ refreshLocalStorage(projectId, settings);
+ set(settingsState(projectId), mergedSettings);
+ set(filePersistenceState(projectId), new FilePersistence(projectId));
+ set(undoHistoryState(projectId), new UndoHistory(projectId));
+ return mainDialog;
+};
+
+export const removeRecentProject = async (callbackHelpers: CallbackInterface, path: string) => {
+ try {
+ const {
+ set,
+ snapshot: { getPromise },
+ } = callbackHelpers;
+ const currentRecentProjects = await getPromise(recentProjectsState);
+ const filtered = currentRecentProjects.filter((p) => p.path !== path);
+ set(recentProjectsState, filtered);
+ } catch (ex) {
+ logMessage(callbackHelpers, `Error removing recent project: ${ex}`);
+ }
+};
+
+export const openRemoteSkill = async (
+ callbackHelpers: CallbackInterface,
+ manifestUrl: string,
+ botNameIdentifier: string
+) => {
+ const { set } = callbackHelpers;
+
+ const response = await httpClient.get(`/projects/generateProjectId`);
+ const projectId = response.data;
+ const stringified = stringify({
+ url: manifestUrl,
+ });
+ const manifestResponse = await httpClient.get(
+ `/projects/${projectId}/skill/retrieveSkillManifest?${stringified}&ignoreProjectValidation=true`
+ );
+ set(projectMetaDataState(projectId), {
+ isRootBot: false,
+ isRemote: true,
+ });
+ set(botNameIdentifierState(projectId), botNameIdentifier);
+ set(botDisplayNameState(projectId), manifestResponse.data.name);
+ set(locationState(projectId), manifestUrl);
+ return { projectId, manifestResponse: manifestResponse.data };
+};
+
+export const openLocalSkill = async (callbackHelpers, pathToBot: string, storageId, botNameIdentifier: string) => {
+ const { set } = callbackHelpers;
+ const { projectData, botFiles, error } = await fetchProjectDataByPath(pathToBot, storageId);
+
+ if (error) {
+ throw error;
+ }
+ const mainDialog = await initBotState(callbackHelpers, projectData, botFiles);
+ set(projectMetaDataState(projectData.id), {
+ isRootBot: false,
+ isRemote: false,
+ });
+ set(botNameIdentifierState(projectData.id), botNameIdentifier);
+
+ return {
+ projectId: projectData.id,
+ mainDialog,
+ };
+};
+
+export const createNewBotFromTemplate = async (
+ callbackHelpers,
+ templateId: string,
+ name: string,
+ description: string,
+ location: string,
+ schemaUrl?: string,
+ locale?: string
+) => {
+ const { set } = callbackHelpers;
+ const response = await httpClient.post(`/projects`, {
+ storageId: 'default',
+ templateId,
+ name,
+ description,
+ location,
+ schemaUrl,
+ locale,
+ });
+ const { botFiles, projectData } = loadProjectData(response);
+ const projectId = response.data.id;
+ if (settingStorage.get(projectId)) {
+ settingStorage.remove(projectId);
+ }
+ const currentBotProjectFileIndexed: BotProjectFile = botFiles.botProjectSpaceFiles[0];
+ set(botProjectFileState(projectId), currentBotProjectFileIndexed);
+
+ const mainDialog = await initBotState(callbackHelpers, projectData, botFiles);
+ // if create from QnATemplate, continue creation flow.
+ if (templateId === QnABotTemplateId) {
+ set(showCreateQnAFromUrlDialogState(projectId), true);
+ }
+
+ return { projectId, mainDialog };
+};
+
+const addProjectToBotProjectSpace = (set, projectId: string, skillCt: number) => {
+ let isBotProjectLoaded = false;
+ set(botProjectIdsState, (current: string[]) => {
+ const botProjectIds = [...current, projectId];
+ if (botProjectIds.length === skillCt) {
+ isBotProjectLoaded = true;
+ }
+ return botProjectIds;
+ });
+ if (isBotProjectLoaded) {
+ set(botProjectSpaceLoadedState, true);
+ }
+};
+
+const handleSkillLoadingFailure = (callbackHelpers, { ex, skillNameIdentifier }) => {
+ const { set } = callbackHelpers;
+ // Generating a dummy project id which will be replaced by the user from the UI.
+ const projectId = uuid();
+ set(botDisplayNameState(projectId), skillNameIdentifier);
+ set(botNameIdentifierState(projectId), skillNameIdentifier);
+ setErrorOnBotProject(callbackHelpers, projectId, skillNameIdentifier, ex);
+ return projectId;
+};
+
+const openRootBotAndSkills = async (callbackHelpers: CallbackInterface, data, storageId = 'default') => {
+ const { projectData, botFiles } = data;
+ const { set } = callbackHelpers;
+
+ const mainDialog = await initBotState(callbackHelpers, projectData, botFiles);
+ const rootBotProjectId = projectData.id;
+ const { name } = projectData;
+ set(botNameIdentifierState(rootBotProjectId), camelCase(name));
+
+ if (botFiles.botProjectSpaceFiles && botFiles.botProjectSpaceFiles.length) {
+ const currentBotProjectFileIndexed: BotProjectFile = botFiles.botProjectSpaceFiles[0];
+ set(botProjectFileState(rootBotProjectId), currentBotProjectFileIndexed);
+ const currentBotProjectFile: BotProjectSpace = currentBotProjectFileIndexed.content;
+
+ const skills: { [skillId: string]: BotProjectSpaceSkill } = {
+ ...currentBotProjectFile.skills,
+ };
+
+ // RootBot loads first + skills load async
+ const totalProjectsCount = Object.keys(skills).length + 1;
+ if (totalProjectsCount > 0) {
+ for (const nameIdentifier in skills) {
+ const skill = skills[nameIdentifier];
+ let skillPromise;
+ if (!skill.remote && skill.workspace) {
+ const skillPath = convertFileProtocolToPath(skill.workspace);
+ skillPromise = openLocalSkill(callbackHelpers, skillPath, storageId, nameIdentifier);
+ } else if (skill.manifest) {
+ skillPromise = openRemoteSkill(callbackHelpers, skill.manifest, nameIdentifier);
+ }
+ if (skillPromise) {
+ skillPromise
+ .then(({ projectId }) => {
+ addProjectToBotProjectSpace(set, projectId, totalProjectsCount);
+ })
+ .catch((ex) => {
+ const projectId = handleSkillLoadingFailure(callbackHelpers, {
+ skillNameIdentifier: nameIdentifier,
+ ex,
+ });
+ addProjectToBotProjectSpace(set, projectId, totalProjectsCount);
+ });
+ }
+ }
+ }
+ } else {
+ // Should never hit here as all projects should have a botproject file
+ throw new Error(formatMessage('Bot project file does not exist.'));
+ }
+ set(botProjectIdsState, [rootBotProjectId]);
+ set(currentProjectIdState, rootBotProjectId);
+ return {
+ mainDialog,
+ projectId: rootBotProjectId,
+ };
+};
+
+export const openRootBotAndSkillsByPath = async (callbackHelpers: CallbackInterface, path: string, storageId) => {
+ const data = await fetchProjectDataByPath(path, storageId);
+ if (data.error) {
+ throw data.error;
+ }
+ return await openRootBotAndSkills(callbackHelpers, data, storageId);
+};
+
+export const openRootBotAndSkillsByProjectId = async (callbackHelpers: CallbackInterface, projectId: string) => {
+ const data = await fetchProjectDataById(projectId);
+ if (data.error) {
+ throw data.error;
+ }
+ return await openRootBotAndSkills(callbackHelpers, data);
+};
+
+export const saveProject = async (callbackHelpers, oldProjectData) => {
+ const { oldProjectId, name, description, location } = oldProjectData;
+ const response = await httpClient.post(`/projects/${oldProjectId}/project/saveAs`, {
+ storageId: 'default',
+ name,
+ description,
+ location,
+ });
+ const data = loadProjectData(response);
+ if (data.error) {
+ throw data.error;
+ }
+ const result = openRootBotAndSkills(callbackHelpers, data);
+ return result;
+};
+
+export const getSkillNameIdentifier = async (
+ callbackHelpers: CallbackInterface,
+ displayName: string
+): Promise => {
+ const { snapshot } = callbackHelpers;
+ const rootBotProjectId = await snapshot.getPromise(rootBotProjectIdSelector);
+ if (rootBotProjectId) {
+ const { content: botProjectFile } = await snapshot.getPromise(botProjectFileState(rootBotProjectId));
+ return getUniqueName(Object.keys(botProjectFile.skills), camelCase(displayName));
+ }
+ return '';
+};
+
+export const checkIfBotExistsInBotProjectFile = async (
+ callbackHelpers: CallbackInterface,
+ pathOrManifest: string,
+ remote?: boolean
+) => {
+ const { snapshot } = callbackHelpers;
+ const rootBotProjectId = await snapshot.getPromise(rootBotProjectIdSelector);
+ if (!rootBotProjectId) {
+ throw new Error(formatMessage('The root bot is not a bot project'));
+ }
+ const { content: botProjectFile } = await snapshot.getPromise(botProjectFileState(rootBotProjectId));
+
+ for (const uniqueSkillName in botProjectFile.skills) {
+ const { manifest, workspace } = botProjectFile.skills[uniqueSkillName];
+ if (remote) {
+ if (manifest === pathOrManifest) {
+ return true;
+ }
+ } else {
+ if (workspace) {
+ const resolvedPath = convertFileProtocolToPath(workspace);
+ if (pathOrManifest === resolvedPath) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+};
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/zoom.ts b/Composer/packages/client/src/recoilModel/dispatchers/zoom.ts
new file mode 100644
index 0000000000..cc1def19d6
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/dispatchers/zoom.ts
@@ -0,0 +1,18 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { CallbackInterface, useRecoilCallback } from 'recoil';
+
+import { rateInfoState } from '../atoms/zoomState';
+
+export const zoomDispatcher = () => {
+ const updateZoomRate = useRecoilCallback(({ set }: CallbackInterface) => async ({ currentRate }) => {
+ set(rateInfoState, (rateInfo) => {
+ return { ...rateInfo, currentRate };
+ });
+ });
+ return {
+ updateZoomRate,
+ };
+};
diff --git a/Composer/packages/client/src/recoilModel/index.ts b/Composer/packages/client/src/recoilModel/index.ts
index 8105c6ee56..b74182652c 100644
--- a/Composer/packages/client/src/recoilModel/index.ts
+++ b/Composer/packages/client/src/recoilModel/index.ts
@@ -3,4 +3,4 @@
export * from './atoms';
export * from './DispatcherWrapper';
-export * from './selectors/';
+export * from './selectors';
diff --git a/Composer/packages/client/src/recoilModel/parsers/__test__/luWorker.test.ts b/Composer/packages/client/src/recoilModel/parsers/__test__/luWorker.test.ts
index db94ae135b..a37cdb70c6 100644
--- a/Composer/packages/client/src/recoilModel/parsers/__test__/luWorker.test.ts
+++ b/Composer/packages/client/src/recoilModel/parsers/__test__/luWorker.test.ts
@@ -5,6 +5,8 @@ import { Range, Position, LuIntentSection } from '@bfc/shared';
import luWorker from '../luWorker';
+const luFeatures = {};
+
jest.mock('./../workers/luParser.worker.ts', () => {
class Test {
onmessage = (data) => data;
@@ -29,7 +31,7 @@ describe('test lu worker', () => {
it('get expected parse result', async () => {
const content = `# Hello
- hi`;
- const result: any = await luWorker.parse('', content);
+ const result: any = await luWorker.parse('', content, luFeatures);
const expected = [
{ Body: '- hi', Entities: [], Name: 'Hello', range: new Range(new Position(1, 0), new Position(2, 4)) },
];
@@ -45,7 +47,7 @@ hi
@ simple friendsName
`;
- const { intents, diagnostics }: any = await luWorker.parse('', content);
+ const { intents, diagnostics }: any = await luWorker.parse('', content, luFeatures);
expect(intents.length).toEqual(1);
expect(diagnostics.length).toEqual(1);
expect(diagnostics[0].range.start.line).toEqual(2);
@@ -55,7 +57,7 @@ hi
});
it('get expected add intent result', async () => {
- const result: any = await luWorker.addIntent(luFile, getLuIntent('New', '-IntentValue'));
+ const result: any = await luWorker.addIntent(luFile, getLuIntent('New', '-IntentValue'), luFeatures);
const expected = {
Body: '-IntentValue',
Entities: [],
@@ -68,10 +70,11 @@ hi
});
it('get expected add intents result', async () => {
- const result: any = await luWorker.addIntents(luFile, [
- getLuIntent('New1', '-IntentValue1'),
- getLuIntent('New2', '-IntentValue2'),
- ]);
+ const result: any = await luWorker.addIntents(
+ luFile,
+ [getLuIntent('New1', '-IntentValue1'), getLuIntent('New2', '-IntentValue2')],
+ luFeatures
+ );
const expected = {
Body: '-IntentValue2',
Entities: [],
@@ -84,7 +87,7 @@ hi
});
it('get expected update intent result', async () => {
- const result: any = await luWorker.updateIntent(luFile, 'New', getLuIntent('New', '-update'));
+ const result: any = await luWorker.updateIntent(luFile, 'New', getLuIntent('New', '-update'), luFeatures);
const expected = {
Body: '-update',
Entities: [],
@@ -97,14 +100,14 @@ hi
});
it('get expected remove intent result', async () => {
- const result: any = await luWorker.removeIntent(luFile, 'New2');
+ const result: any = await luWorker.removeIntent(luFile, 'New2', luFeatures);
expect(result.intents.length).toBe(3);
expect(result.intents[3]).toBeUndefined();
luFile = result;
});
it('get expected remove intent result', async () => {
- const result: any = await luWorker.removeIntents(luFile, ['New1', 'New']);
+ const result: any = await luWorker.removeIntents(luFile, ['New1', 'New'], luFeatures);
expect(result.intents.length).toBe(1);
});
});
diff --git a/Composer/packages/client/src/recoilModel/parsers/luWorker.ts b/Composer/packages/client/src/recoilModel/parsers/luWorker.ts
index 9973a9bab4..fd43f85c8b 100644
--- a/Composer/packages/client/src/recoilModel/parsers/luWorker.ts
+++ b/Composer/packages/client/src/recoilModel/parsers/luWorker.ts
@@ -15,33 +15,33 @@ import {
} from './types';
// Wrapper class
class LuWorker extends BaseWorker {
- parse(id: string, content: string) {
- const payload = { id, content };
+ parse(id: string, content: string, luFeatures) {
+ const payload = { id, content, luFeatures };
return this.sendMsg(LuActionType.Parse, payload);
}
- addIntent(luFile: LuFile, intent: LuIntentSection) {
- const payload = { luFile, intent };
+ addIntent(luFile: LuFile, intent: LuIntentSection, luFeatures) {
+ const payload = { luFile, intent, luFeatures };
return this.sendMsg(LuActionType.AddIntent, payload);
}
- updateIntent(luFile: LuFile, intentName: string, intent?: { Name?: string; Body?: string }) {
- const payload = { luFile, intentName, intent };
+ updateIntent(luFile: LuFile, intentName: string, intent: { Name?: string; Body?: string }, luFeatures) {
+ const payload = { luFile, intentName, intent, luFeatures };
return this.sendMsg(LuActionType.UpdateIntent, payload);
}
- removeIntent(luFile: LuFile, intentName: string) {
- const payload = { luFile, intentName };
+ removeIntent(luFile: LuFile, intentName: string, luFeatures) {
+ const payload = { luFile, intentName, luFeatures };
return this.sendMsg(LuActionType.RemoveIntent, payload);
}
- addIntents(luFile: LuFile, intents: LuIntentSection[]) {
- const payload = { luFile, intents };
+ addIntents(luFile: LuFile, intents: LuIntentSection[], luFeatures) {
+ const payload = { luFile, intents, luFeatures };
return this.sendMsg(LuActionType.AddIntents, payload);
}
- removeIntents(luFile: LuFile, intentNames: string[]) {
- const payload = { luFile, intentNames };
+ removeIntents(luFile: LuFile, intentNames: string[], luFeatures) {
+ const payload = { luFile, intentNames, luFeatures };
return this.sendMsg(LuActionType.RemoveIntents, payload);
}
}
diff --git a/Composer/packages/client/src/recoilModel/parsers/types.ts b/Composer/packages/client/src/recoilModel/parsers/types.ts
index 6c96a2e370..a5e0c484fb 100644
--- a/Composer/packages/client/src/recoilModel/parsers/types.ts
+++ b/Composer/packages/client/src/recoilModel/parsers/types.ts
@@ -1,36 +1,42 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { LuIntentSection, LgFile, LuFile, QnASection, FileInfo, LgTemplate } from '@bfc/shared';
+import { LuIntentSection, LgFile, LuFile, QnASection, FileInfo, LgTemplate, ILUFeaturesConfig } from '@bfc/shared';
export type LuParsePayload = {
id: string;
content: string;
+ luFeatures: ILUFeaturesConfig;
};
export type LuAddIntentPayload = {
luFile: LuFile;
intent: LuIntentSection;
+ luFeatures: ILUFeaturesConfig;
};
export type LuAddIntentsPayload = {
luFile: LuFile;
intents: LuIntentSection[];
+ luFeatures: ILUFeaturesConfig;
};
export type LuUpdateIntentPayload = {
luFile: LuFile;
intentName: string;
intent?: { Name?: string; Body?: string };
+ luFeatures: ILUFeaturesConfig;
};
export type LuRemoveIntentPayload = {
luFile: LuFile;
intentName: string;
+ luFeatures: ILUFeaturesConfig;
};
export type LuRemoveIntentsPayload = {
luFile: LuFile;
intentNames: string[];
+ luFeatures: ILUFeaturesConfig;
};
export type LgParsePayload = {
@@ -98,6 +104,7 @@ export type IndexPayload = {
botName: string;
schemas: any;
locale: string;
+ luFeatures: { key: string; value: boolean };
};
export type QnAPayload = {
diff --git a/Composer/packages/client/src/recoilModel/parsers/workers/luParser.worker.ts b/Composer/packages/client/src/recoilModel/parsers/workers/luParser.worker.ts
index ed4a8b8437..c304e994f9 100644
--- a/Composer/packages/client/src/recoilModel/parsers/workers/luParser.worker.ts
+++ b/Composer/packages/client/src/recoilModel/parsers/workers/luParser.worker.ts
@@ -56,38 +56,38 @@ export const handleMessage = (msg: LuMessageEvent) => {
let result: any = null;
switch (msg.type) {
case LuActionType.Parse: {
- const { id, content } = msg.payload;
- result = luUtil.parse(id, content);
+ const { id, content, luFeatures } = msg.payload;
+ result = luUtil.parse(id, content, luFeatures);
break;
}
case LuActionType.AddIntent: {
- const { luFile, intent } = msg.payload;
- result = luUtil.addIntent(luFile, intent);
+ const { luFile, intent, luFeatures } = msg.payload;
+ result = luUtil.addIntent(luFile, intent, luFeatures);
break;
}
case LuActionType.AddIntents: {
- const { luFile, intents } = msg.payload;
- result = luUtil.addIntents(luFile, intents);
+ const { luFile, intents, luFeatures } = msg.payload;
+ result = luUtil.addIntents(luFile, intents, luFeatures);
break;
}
case LuActionType.UpdateIntent: {
- const { luFile, intentName, intent } = msg.payload;
- result = luUtil.updateIntent(luFile, intentName, intent || null);
+ const { luFile, intentName, intent, luFeatures } = msg.payload;
+ result = luUtil.updateIntent(luFile, intentName, intent || null, luFeatures);
break;
}
case LuActionType.RemoveIntent: {
- const { luFile, intentName } = msg.payload;
- result = luUtil.removeIntent(luFile, intentName);
+ const { luFile, intentName, luFeatures } = msg.payload;
+ result = luUtil.removeIntent(luFile, intentName, luFeatures);
break;
}
case LuActionType.RemoveIntents: {
- const { luFile, intentNames } = msg.payload;
- result = luUtil.removeIntents(luFile, intentNames);
+ const { luFile, intentNames, luFeatures } = msg.payload;
+ result = luUtil.removeIntents(luFile, intentNames, luFeatures);
break;
}
}
diff --git a/Composer/packages/client/src/recoilModel/parsers/workers/qnaParser.worker.ts b/Composer/packages/client/src/recoilModel/parsers/workers/qnaParser.worker.ts
index 7dc3481f4a..cc463d5f9d 100644
--- a/Composer/packages/client/src/recoilModel/parsers/workers/qnaParser.worker.ts
+++ b/Composer/packages/client/src/recoilModel/parsers/workers/qnaParser.worker.ts
@@ -1,15 +1,10 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { qnaIndexer } from '@bfc/indexers';
import * as qnaUtil from '@bfc/indexers/lib/utils/qnaUtil';
import { QnAActionType } from './../types';
const ctx: Worker = self as any;
-const parse = (content: string, id: string) => {
- return { id, content, ...qnaIndexer.parse(content, id) };
-};
-
ctx.onmessage = function (msg) {
const { id: msgId, type, payload } = msg.data;
const { content, id, file, indexId } = payload;
@@ -17,7 +12,7 @@ ctx.onmessage = function (msg) {
try {
switch (type) {
case QnAActionType.Parse: {
- result = parse(content, id);
+ result = qnaUtil.parse(id, content);
break;
}
case QnAActionType.AddSection: {
diff --git a/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts b/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
index 16a098ea40..378842a540 100644
--- a/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
+++ b/Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
@@ -1,13 +1,24 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import keys from 'lodash/keys';
+
import differenceWith from 'lodash/differenceWith';
import isEqual from 'lodash/isEqual';
-import { DialogInfo, DialogSchemaFile, DialogSetting, SkillManifest, BotAssets } from '@bfc/shared';
+import {
+ DialogInfo,
+ DialogSchemaFile,
+ DialogSetting,
+ SkillManifest,
+ BotAssets,
+ BotProjectFile,
+ LuFile,
+ LgFile,
+ QnAFile,
+ FormDialogSchema,
+} from '@bfc/shared';
+import keys from 'lodash/keys';
-import { LuFile, LgFile, QnAFile } from './../../../../lib/shared/src/types/indexers';
import * as client from './http';
-import { IFileChange, ChangeType, FileExtensions } from './types';
+import { ChangeType, FileExtensions, IFileChange } from './types';
class FilePersistence {
private _taskQueue: { [id: string]: IFileChange[] } = {};
@@ -184,6 +195,20 @@ class FilePersistence {
return changes;
}
+ private getBotProjectFileChanges(current: BotProjectFile, previous: BotProjectFile) {
+ if (!isEqual(current, previous)) {
+ return [
+ {
+ id: `${current.id}${FileExtensions.BotProject}`,
+ change: JSON.stringify(current.content, null, 2),
+ type: ChangeType.UPDATE,
+ projectId: this._projectId,
+ },
+ ];
+ }
+ return [];
+ }
+
private getSettingsChanges(current: DialogSetting, previous: DialogSetting) {
if (!isEqual(current, previous)) {
return [
@@ -198,6 +223,12 @@ class FilePersistence {
return [];
}
+ private getFormDialogSchemaFileChanges(current: FormDialogSchema[], previous: FormDialogSchema[]) {
+ const changeItems = this.getDifferenceItems(current, previous);
+ const changes = this.getFileChanges(FileExtensions.FormDialog, changeItems);
+ return changes;
+ }
+
private getAssetsChanges(currentAssets: BotAssets, previousAssets: BotAssets): IFileChange[] {
const dialogChanges = this.getDialogChanges(currentAssets.dialogs, previousAssets.dialogs);
const dialogSchemaChanges = this.getDialogSchemaChanges(currentAssets.dialogSchemas, previousAssets.dialogSchemas);
@@ -209,6 +240,17 @@ class FilePersistence {
previousAssets.skillManifests
);
const settingChanges = this.getSettingsChanges(currentAssets.setting, previousAssets.setting);
+
+ const formDialogChanges = this.getFormDialogSchemaFileChanges(
+ currentAssets.formDialogSchemas,
+ previousAssets.formDialogSchemas
+ );
+
+ const botProjectFileChanges = this.getBotProjectFileChanges(
+ currentAssets.botProjectFile,
+ previousAssets.botProjectFile
+ );
+
const fileChanges: IFileChange[] = [
...dialogChanges,
...dialogSchemaChanges,
@@ -217,6 +259,8 @@ class FilePersistence {
...lgChanges,
...skillManifestChanges,
...settingChanges,
+ ...formDialogChanges,
+ ...botProjectFileChanges,
];
return fileChanges;
}
diff --git a/Composer/packages/client/src/recoilModel/persistence/__test__/FilePersistence.test.ts b/Composer/packages/client/src/recoilModel/persistence/__test__/FilePersistence.test.ts
index 64b27a9cfb..854b2a7591 100644
--- a/Composer/packages/client/src/recoilModel/persistence/__test__/FilePersistence.test.ts
+++ b/Composer/packages/client/src/recoilModel/persistence/__test__/FilePersistence.test.ts
@@ -26,7 +26,7 @@ describe('test persistence layer', () => {
it('test notify update', async () => {
const previous = {
projectId: 'test',
- dialogs: [{ id: 'a', content: { a: 'old' } }] as DialogInfo[],
+ dialogs: ([{ id: 'a', content: { a: 'old' } }] as unknown) as DialogInfo[],
dialogSchemas: [{ id: 'a', content: { a: 'old schema' } }] as DialogSchemaFile[],
lgFiles: [{ id: 'a.en-us', content: '' }] as LgFile[],
luFiles: [{ id: 'a.en-us', content: '' }] as LuFile[],
@@ -34,7 +34,7 @@ describe('test persistence layer', () => {
const current = {
projectId: 'test',
- dialogs: [{ id: 'a', content: { a: 'new' } }] as DialogInfo[],
+ dialogs: ([{ id: 'a', content: { a: 'new' } }] as unknown) as DialogInfo[],
dialogSchemas: [{ id: 'a', content: { a: 'new schema' } }] as DialogSchemaFile[],
lgFiles: [{ id: 'a.en-us', content: 'a.lg' }] as LgFile[],
luFiles: [{ id: 'a.en-us', content: 'a.lu' }] as LuFile[],
@@ -51,7 +51,7 @@ describe('test persistence layer', () => {
it('test notify create', async () => {
const previous = {
projectId: 'test',
- dialogs: [{ id: 'a', content: { a: 'a' } }] as DialogInfo[],
+ dialogs: ([{ id: 'a', content: { a: 'a' } }] as unknown) as DialogInfo[],
dialogSchemas: [{ id: 'a', content: { a: 'a' } }] as DialogSchemaFile[],
lgFiles: [{ id: 'a.en-us', content: 'a' }] as LgFile[],
luFiles: [{ id: 'a.en-us', content: 'a' }] as LuFile[],
@@ -59,10 +59,10 @@ describe('test persistence layer', () => {
const current = {
projectId: 'test',
- dialogs: [
+ dialogs: ([
{ id: 'a', content: { a: 'a' } },
{ id: 'b', content: { b: 'b' } },
- ] as DialogInfo[],
+ ] as unknown) as DialogInfo[],
dialogSchemas: [
{ id: 'a', content: { a: 'a' } },
{ id: 'b', content: { b: 'b' } },
@@ -88,10 +88,10 @@ describe('test persistence layer', () => {
it('test notify remove', async () => {
const previous = {
projectId: 'test',
- dialogs: [
+ dialogs: ([
{ id: 'a', content: { a: 'a' } },
{ id: 'b', content: { b: 'b.pre' } },
- ] as DialogInfo[],
+ ] as unknown) as DialogInfo[],
dialogSchemas: [
{ id: 'a', content: { a: 'a' } },
{ id: 'b', content: { b: 'b.pre' } },
@@ -108,7 +108,7 @@ describe('test persistence layer', () => {
const current = {
projectId: 'test',
- dialogs: [{ id: 'a', content: { a: 'a' } }] as DialogInfo[],
+ dialogs: ([{ id: 'a', content: { a: 'a' } }] as unknown) as DialogInfo[],
dialogSchemas: [{ id: 'a', content: { a: 'a' } }] as DialogSchemaFile[],
lgFiles: [{ id: 'a.en-us', content: 'a' }] as LgFile[],
luFiles: [{ id: 'a.en-us', content: 'a' }] as LuFile[],
diff --git a/Composer/packages/client/src/recoilModel/persistence/types.ts b/Composer/packages/client/src/recoilModel/persistence/types.ts
index d1e344c4d0..941f6a119d 100644
--- a/Composer/packages/client/src/recoilModel/persistence/types.ts
+++ b/Composer/packages/client/src/recoilModel/persistence/types.ts
@@ -9,12 +9,15 @@ export enum ChangeType {
export enum FileExtensions {
Dialog = '.dialog',
+ FormDialog = '.form-dialog',
DialogSchema = '.dialog.schema',
Manifest = '.json',
Lu = '.lu',
Lg = '.lg',
QnA = '.qna',
+ SourceQnA = '.source.qna',
Setting = 'appsettings.json',
+ BotProject = '.botproj',
}
export type FileErrorHandler = (error) => void;
diff --git a/Composer/packages/client/src/recoilModel/selectors/design.ts b/Composer/packages/client/src/recoilModel/selectors/design.ts
deleted file mode 100644
index 7814bdfd45..0000000000
--- a/Composer/packages/client/src/recoilModel/selectors/design.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import { selector } from 'recoil';
-
-import { botNameState, botProjectsSpaceState } from '../atoms';
-
-//TODO: This selector will be used when BotProjects is implemented
-export const botProjectSpaceSelector = selector({
- key: 'botProjectSpaceSelector',
- get: ({ get }) => {
- const botProjects = get(botProjectsSpaceState);
- const result = botProjects.map((botProjectId: string) => {
- const name = get(botNameState(botProjectId));
- return { projectId: botProjectId, name };
- });
- return result;
- },
-});
diff --git a/Composer/packages/client/src/recoilModel/selectors/extensions.ts b/Composer/packages/client/src/recoilModel/selectors/extensions.ts
new file mode 100644
index 0000000000..32ab01aadb
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/selectors/extensions.ts
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { selector } from 'recoil';
+
+import { extensionsState } from '../atoms/appState';
+import { ExtensionPageConfig } from '../../utils/pageLinks';
+
+export const enabledExtensionsSelector = selector({
+ key: 'enabledExtensionsSelector',
+ get: ({ get }) => {
+ const extensions = get(extensionsState);
+
+ return extensions.filter((e) => e.enabled);
+ },
+});
+
+export const pluginPagesSelector = selector({
+ key: 'pluginPagesSelector',
+ get: ({ get }) => {
+ const extensions = get(enabledExtensionsSelector);
+
+ return extensions.reduce((pages, p) => {
+ const pagesConfig = p.contributes?.views?.pages;
+ if (Array.isArray(pagesConfig) && pagesConfig.length > 0) {
+ pages.push(...pagesConfig.map((page) => ({ ...page, id: p.id })));
+ }
+ return pages;
+ }, [] as ExtensionPageConfig[]);
+ },
+});
diff --git a/Composer/packages/client/src/recoilModel/selectors/index.ts b/Composer/packages/client/src/recoilModel/selectors/index.ts
index 2679b02214..2dbb6d83cb 100644
--- a/Composer/packages/client/src/recoilModel/selectors/index.ts
+++ b/Composer/packages/client/src/recoilModel/selectors/index.ts
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-export * from '../selectors/eject';
-export * from '../selectors/design';
-export * from '../selectors/validatedDialogs';
+export * from './project';
+export * from './eject';
+export * from './extensions';
+export * from './validatedDialogs';
diff --git a/Composer/packages/client/src/recoilModel/selectors/project.ts b/Composer/packages/client/src/recoilModel/selectors/project.ts
new file mode 100644
index 0000000000..cebb4de1a9
--- /dev/null
+++ b/Composer/packages/client/src/recoilModel/selectors/project.ts
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { selector, selectorFamily } from 'recoil';
+import isEmpty from 'lodash/isEmpty';
+import { FormDialogSchema } from '@bfc/shared';
+
+import {
+ botErrorState,
+ botDisplayNameState,
+ botProjectFileState,
+ botProjectIdsState,
+ dialogsState,
+ projectMetaDataState,
+ botNameIdentifierState,
+ formDialogSchemaIdsState,
+ formDialogSchemaState,
+} from '../atoms';
+
+// Actions
+export const botsForFilePersistenceSelector = selector({
+ key: 'botsForFilePersistenceSelector',
+ get: ({ get }) => {
+ const botProjectIds = get(botProjectIdsState);
+ return botProjectIds.filter((projectId: string) => {
+ const { isRemote } = get(projectMetaDataState(projectId));
+ const botError = get(botErrorState(projectId));
+ return !botError && !isRemote;
+ });
+ },
+});
+
+// TODO: This selector would be modfied and leveraged by the project tree
+export const botProjectSpaceSelector = selector({
+ key: 'botProjectSpaceSelector',
+ get: ({ get }) => {
+ const botProjects = get(botProjectIdsState);
+ const result = botProjects.map((projectId: string) => {
+ const dialogs = get(dialogsState(projectId));
+ const metaData = get(projectMetaDataState(projectId));
+ const botError = get(botErrorState(projectId));
+ const name = get(botDisplayNameState(projectId));
+ const botNameId = get(botNameIdentifierState(projectId));
+ return { dialogs, projectId, name, ...metaData, error: botError, botNameId };
+ });
+ return result;
+ },
+});
+
+export const rootBotProjectIdSelector = selector({
+ key: 'rootBotProjectIdSelector',
+ get: ({ get }) => {
+ const projectIds = get(botProjectIdsState);
+ const rootBotId = projectIds[0];
+ const botProjectFile = get(botProjectFileState(rootBotId));
+
+ const metaData = get(projectMetaDataState(rootBotId));
+ if (metaData.isRootBot && !isEmpty(botProjectFile)) {
+ return rootBotId;
+ }
+ },
+});
+
+export const formDialogSchemasSelectorFamily = selectorFamily({
+ key: 'formDialogSchemasSelector',
+ get: (projectId: string) => ({ get }) => {
+ const formDialogSchemaIds = get(formDialogSchemaIdsState(projectId));
+ return formDialogSchemaIds.map((schemaId) => get(formDialogSchemaState({ projectId, schemaId })));
+ },
+});
+
+export const formDialogSchemaDialogExistsSelector = selectorFamily({
+ key: 'formDialogSchemasSelector',
+ get: ({ projectId, schemaId }: { projectId: string; schemaId: string }) => ({ get }) => {
+ const dialogs = get(dialogsState(projectId));
+ return !!dialogs.find((d) => d.id === schemaId);
+ },
+});
diff --git a/Composer/packages/client/src/recoilModel/selectors/validatedDialogs.ts b/Composer/packages/client/src/recoilModel/selectors/validatedDialogs.ts
index cf92edf094..131926fbd6 100644
--- a/Composer/packages/client/src/recoilModel/selectors/validatedDialogs.ts
+++ b/Composer/packages/client/src/recoilModel/selectors/validatedDialogs.ts
@@ -4,11 +4,15 @@
import { selectorFamily } from 'recoil';
import { validateDialog } from '@bfc/indexers';
-import { dialogsState, schemasState, lgFilesState, luFilesState } from '../atoms/botState';
+import { botProjectIdsState, dialogsState, schemasState, lgFilesState, luFilesState } from '../atoms';
export const validateDialogSelectorFamily = selectorFamily({
key: 'validateDialogSelectorFamily',
get: (projectId: string) => ({ get }) => {
+ const loadedProjects = get(botProjectIdsState);
+ if (!loadedProjects.includes(projectId)) {
+ return [];
+ }
const dialogs = get(dialogsState(projectId));
const schemas = get(schemasState(projectId));
const lgFiles = get(lgFilesState(projectId));
diff --git a/Composer/packages/client/src/recoilModel/types.ts b/Composer/packages/client/src/recoilModel/types.ts
index 63ddebe513..4659e14df8 100644
--- a/Composer/packages/client/src/recoilModel/types.ts
+++ b/Composer/packages/client/src/recoilModel/types.ts
@@ -30,7 +30,7 @@ export interface StorageFolder extends File {
export interface PublishType {
name: string;
description: string;
- hasView?: boolean;
+ bundleId?: string;
instructions?: string;
schema?: JSONSchema7;
features: {
@@ -41,38 +41,6 @@ export interface PublishType {
};
}
-type ExtensionPublishContribution = {
- bundleId: string;
-};
-
-export type ExtensionPageContribution = {
- /** plugin id */
- id: string;
- bundleId: string;
- label: string;
- icon?: string;
-};
-
-// TODO: move this definition to a shared spot
-export interface ExtensionConfig {
- id: string;
- name: string;
- description: string;
- enabled: boolean;
- version: string;
- /** Special property only used in the in-memory representation of extensions to flag as a built-in. Not written to disk. */
- builtIn?: boolean;
- /** Path where module is installed */
- path: string;
- bundles: any; // TODO: needed?
- contributes?: {
- views?: {
- publish?: ExtensionPublishContribution;
- pages?: ExtensionPageContribution[];
- };
- };
-}
-
export interface RuntimeTemplate {
/** internal use key */
key: string;
@@ -142,10 +110,4 @@ export type BoilerplateVersion = {
updateRequired?: boolean;
};
-export enum QnAAllUpViewStatus {
- Loading,
- Success,
- Failed,
-}
-
export type Notification = CardProps & { id: string };
diff --git a/Composer/packages/client/src/recoilModel/undo/__test__/history.test.tsx b/Composer/packages/client/src/recoilModel/undo/__test__/history.test.tsx
index e64a06987e..b1ce067af0 100644
--- a/Composer/packages/client/src/recoilModel/undo/__test__/history.test.tsx
+++ b/Composer/packages/client/src/recoilModel/undo/__test__/history.test.tsx
@@ -13,14 +13,14 @@ import {
luFilesState,
projectMetaDataState,
currentProjectIdState,
- botProjectsSpaceState,
+ botProjectIdsState,
} from '../../atoms';
import { renderRecoilHook } from '../../../../__tests__/testUtils/react-recoil-hooks-testing-library';
import UndoHistory from '../undoHistory';
const projectId = '123-asd';
export const UndoRedoWrapper = () => {
- const botProjects = useRecoilValue(botProjectsSpaceState);
+ const botProjects = useRecoilValue(botProjectIdsState);
return botProjects.length > 0 ? > = (pro
const { projectId = '' } = props;
const schemas = useRecoilValue(schemasState(projectId));
const { fetchProjectById } = useRecoilValue(dispatcherState);
- const botProjects = useRecoilValue(botProjectsSpaceState);
- const botOpening = useRecoilValue(botOpeningState);
+ const botProjects = useRecoilValue(botProjectIdsState);
useEffect(() => {
if (props.projectId && !botProjects.includes(props.projectId)) {
@@ -107,7 +118,7 @@ const ProjectRouter: React.FC> = (pro
}
}, [schemas, projectId]);
- if (props.projectId && !botOpening && botProjects.includes(props.projectId)) {
+ if (props.projectId && botProjects.includes(props.projectId)) {
return => {
+ if (!lgText) return '';
+ const newLgType = new LgType(hostActionData.$kind, hostFieldName).toString();
+ const newLgTemplateName = new LgMetaData(newLgType, hostActionId).toString();
+ const newLgTemplateRefStr = new LgTemplateRef(newLgTemplateName).toString();
+ await addLgTemplate(lgFileId, newLgTemplateName, lgText);
+ return newLgTemplateRefStr;
+ };
+
+ const readLgTemplate = (lgText: string) => {
+ if (!lgText) return '';
+
+ const inputLgRef = LgTemplateRef.parse(lgText);
+ if (!inputLgRef) return lgText;
+
+ const lgTemplates = getLgTemplates(inputLgRef.name);
+ if (!Array.isArray(lgTemplates) || !lgTemplates.length) return lgText;
+
+ const targetTemplate = lgTemplates.find((x) => x.name === inputLgRef.name);
+ return targetTemplate ? targetTemplate.body : lgText;
+ };
+
+ const createLuIntent = async (
+ luFildId: string,
+ intent: LuIntentSection | undefined,
+ hostResourceId: string,
+ hostResourceData: MicrosoftIDialog
+ ) => {
+ if (!intent) return;
+
+ const newLuIntentType = new LuType(hostResourceData.$kind).toString();
+ const newLuIntentName = new LuMetaData(newLuIntentType, hostResourceId).toString();
+ const newLuIntent: LuIntentSection = { ...intent, Name: newLuIntentName };
+ await addLuIntent(luFildId, newLuIntentName, newLuIntent);
+ return newLuIntentName;
+ };
+
+ const readLuIntent = (luFileId: string, hostResourceId: string, hostResourceData: MicrosoftIDialog) => {
+ const relatedLuIntentType = new LuType(hostResourceData.$kind).toString();
+ const relatedLuIntentName = new LuMetaData(relatedLuIntentType, hostResourceId).toString();
+ return getLuIntent(luFileId, relatedLuIntentName);
+ };
+
+ async function constructActions(dialogId: string, actions: MicrosoftIDialog[]) {
+ // '- hi' -> 'SendActivity_1234'
+ const referenceLgText: FieldProcessorAsync = async (fromId, fromAction, toId, toAction, lgFieldName) =>
+ createLgTemplate(dialogId, fromAction[lgFieldName] as string, toId, toAction, lgFieldName);
+
+ // LuIntentSection -> 'TextInput_Response_1234'
+ const referenceLuIntent: FieldProcessorAsync = async (fromId, fromAction, toId, toAction) => {
+ fromAction[luFieldName] &&
+ (await createLuIntent(dialogId, fromAction[luFieldName] as LuIntentSection, toId, toAction));
+ // during construction, remove the virtual LU field after intents persisted in file
+ delete toAction[luFieldName];
+ };
+
+ return deepCopyActions(actions, referenceLgText, referenceLuIntent);
+ }
+
+ async function copyActions(dialogId: string, actions: MicrosoftIDialog[]) {
+ // 'SendActivity_1234' -> '- hi'
+ const dereferenceLg: FieldProcessorAsync = async (fromId, fromAction, toId, toAction, lgFieldName) =>
+ readLgTemplate(fromAction[lgFieldName] as string);
+
+ // 'TextInput_Response_1234' -> LuIntentSection | undefined
+ const dereferenceLu: FieldProcessorAsync = async (fromId, fromAction, toId, toAction) => {
+ const luValue = readLuIntent(dialogId, fromId, fromAction);
+ // during copy, carry the LU data in virtual field
+ toAction[luFieldName] = luValue;
+ return luValue;
+ };
+
+ return deepCopyActions(actions, dereferenceLg, dereferenceLu);
+ }
+
+ async function constructAction(dialogId: string, action: MicrosoftIDialog) {
+ const [newAction] = await constructActions(dialogId, [action]);
+ return newAction;
+ }
+
+ async function copyAction(dialogId: string, action: MicrosoftIDialog) {
+ const [copiedAction] = await copyActions(dialogId, [action]);
+ return copiedAction;
+ }
+
+ async function deleteAction(dialogId: string, action: MicrosoftIDialog) {
+ return destructAction(
+ action,
+ (templates: string[]) => removeLgTemplates(dialogId, templates),
+ (luIntents: string[]) => Promise.all(luIntents.map((intent) => removeLuIntent(dialogId, intent)))
+ );
+ }
+
+ async function deleteActions(dialogId: string, actions: MicrosoftIDialog[]) {
+ return destructActions(
+ actions,
+ (templates: string[]) => removeLgTemplates(dialogId, templates),
+ (luIntents: string[]) => Promise.all(luIntents.map((intent) => removeLuIntent(dialogId, intent)))
+ );
+ }
+
+ return {
+ constructAction,
+ constructActions,
+ copyAction,
+ copyActions,
+ deleteAction,
+ deleteActions,
+ actionsContainLuIntent,
+ };
+};
diff --git a/Composer/packages/client/src/shell/lgApi.ts b/Composer/packages/client/src/shell/lgApi.ts
index 76168af704..5013c87caf 100644
--- a/Composer/packages/client/src/shell/lgApi.ts
+++ b/Composer/packages/client/src/shell/lgApi.ts
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useEffect, useState } from 'react';
-import { LgFile } from '@bfc/shared';
+import { LgFile, LgContextApi, LgTemplateRef } from '@bfc/shared';
import { useRecoilValue } from 'recoil';
import debounce from 'lodash/debounce';
import formatMessage from 'format-message';
@@ -20,7 +20,7 @@ function createLgApi(
state: { focusPath: string; projectId: string },
actions: Dispatcher,
lgFileResolver: (id: string) => LgFile | undefined
-) {
+): LgContextApi {
const getLgTemplates = (id) => {
if (id === undefined) throw new Error('must have a file id');
const focusedDialogId = state.focusPath.split('#').shift() || id;
@@ -29,6 +29,13 @@ function createLgApi(
return file.templates;
};
+ const updateLgFile = async (id: string, content: string) => {
+ const file = lgFileResolver(id);
+ if (!file) throw new Error(fileNotFound(id));
+
+ await actions.updateLgFile({ id, content, projectId: state.projectId });
+ };
+
const updateLgTemplate = async (id: string, templateName: string, templateBody: string) => {
const file = lgFileResolver(id);
if (!file) throw new Error(fileNotFound(id));
@@ -68,23 +75,31 @@ function createLgApi(
});
};
- const removeLgTemplates = async (id, templateNames) => {
+ const removeLgTemplates = async (id: string, templateNames: string[]) => {
const file = lgFileResolver(id);
if (!file) throw new Error(fileNotFound(id));
if (!templateNames) throw new Error(TEMPLATE_ERROR);
+ const normalizedLgTemplates = templateNames
+ .map((x) => {
+ const lgTemplateRef = LgTemplateRef.parse(x);
+ return lgTemplateRef ? lgTemplateRef.name : x;
+ })
+ .filter((x) => !!x);
+
return await actions.removeLgTemplates({
id: file.id,
- templateNames,
+ templateNames: normalizedLgTemplates,
projectId: state.projectId,
});
};
return {
+ updateLgFile,
addLgTemplate: updateLgTemplate,
getLgTemplates,
updateLgTemplate,
- deboucedUpdateLgTemplate: debounce(updateLgTemplate, 250),
+ debouncedUpdateLgTemplate: debounce(updateLgTemplate, 250),
removeLgTemplate,
removeLgTemplates,
copyLgTemplate,
diff --git a/Composer/packages/client/src/shell/luApi.ts b/Composer/packages/client/src/shell/luApi.ts
index 7581c402ba..e94a6178c4 100644
--- a/Composer/packages/client/src/shell/luApi.ts
+++ b/Composer/packages/client/src/shell/luApi.ts
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useEffect, useState } from 'react';
-import { LuFile, LuIntentSection } from '@bfc/shared';
+import { LuFile, LuIntentSection, LuContextApi } from '@botframework-composer/types';
import { useRecoilValue } from 'recoil';
import formatMessage from 'format-message';
import debounce from 'lodash/debounce';
@@ -20,7 +20,14 @@ function createLuApi(
state: { focusPath: string; projectId: string },
dispatchers: Dispatcher,
luFileResolver: (id: string) => LuFile | undefined
-) {
+): LuContextApi {
+ const updateLuFile = async (id: string, content: string) => {
+ const file = luFileResolver(id);
+ if (!file) throw new Error(fileNotFound(id));
+
+ await dispatchers.updateLuFile({ id, content, projectId: state.projectId });
+ };
+
const addLuIntent = async (id: string, intentName: string, intent: LuIntentSection) => {
const file = luFileResolver(id);
if (!file) throw new Error(fileNotFound(id));
@@ -73,11 +80,12 @@ function createLuApi(
};
return {
+ updateLuFile,
addLuIntent,
getLuIntents,
getLuIntent,
updateLuIntent,
- deboucedUpdateLuIntent: debounce(updateLuIntent, 250),
+ debouncedUpdateLuIntent: debounce(updateLuIntent, 250),
renameLuIntent,
removeLuIntent,
};
diff --git a/Composer/packages/client/src/shell/triggerApi.ts b/Composer/packages/client/src/shell/triggerApi.ts
index 79cc9e64f2..f56b9f62d1 100644
--- a/Composer/packages/client/src/shell/triggerApi.ts
+++ b/Composer/packages/client/src/shell/triggerApi.ts
@@ -2,25 +2,37 @@
// Licensed under the MIT License.
import { useEffect, useState } from 'react';
-import { LuFile, LgFile, DialogInfo, LgTemplateSamples } from '@bfc/shared';
+import {
+ LgTemplate,
+ LuFile,
+ LgFile,
+ DialogInfo,
+ ITriggerCondition,
+ SDKKinds,
+ BaseSchema,
+ MicrosoftIDialog,
+} from '@botframework-composer/types';
import { useRecoilValue } from 'recoil';
-import { LgTemplate } from '@bfc/shared';
+import { LgTemplateSamples } from '@bfc/shared';
import get from 'lodash/get';
import { useResolvers } from '../hooks/useResolver';
import { onChooseIntentKey, generateNewDialog, intentTypeKey, qnaMatcherKey } from '../utils/dialogUtil';
-import { navigateTo } from '../utils/navigation';
import { schemasState, lgFilesState, dialogsState, localeState } from '../recoilModel';
import { Dispatcher } from '../recoilModel/dispatchers';
import { dispatcherState } from './../recoilModel/DispatcherWrapper';
+import { useActionApi } from './actionApi';
+import { useLuApi } from './luApi';
function createTriggerApi(
state: { projectId; schemas; dialogs; locale; lgFiles },
dispatchers: Dispatcher, //TODO
luFileResolver: (id: string) => LuFile | undefined,
lgFileResolver: (id: string) => LgFile | undefined,
- dialogResolver: (id: string) => DialogInfo | undefined
+ dialogResolver: (id: string) => DialogInfo | undefined,
+ deleteActions: (dialogId: string, actions: MicrosoftIDialog[]) => Promise,
+ removeLuIntent: (id: string, intentName: string) => void
) {
const getDesignerIdFromDialogPath = (dialog, path) => {
const value = get(dialog, path, '');
@@ -29,7 +41,7 @@ function createTriggerApi(
return value.substring(startIndex + 1, endIndex);
};
- const createTriggerHandler = async (id, formData, url) => {
+ const createTriggerHandler = async (id, formData, autoSelected = true) => {
const luFile = luFileResolver(id);
const lgFile = lgFileResolver(id);
const dialog = dialogResolver(id);
@@ -90,14 +102,30 @@ function createTriggerApi(
content: newDialog.content,
};
await updateDialog(dialogPayload);
- if (url) {
- navigateTo(url);
- } else {
+ if (autoSelected) {
selectTo(projectId, `triggers[${index}]`);
}
};
+
+ const deleteTrigger = (dialogId: string, trigger: ITriggerCondition) => {
+ if (!trigger) return;
+
+ // Clean the lu resource on intent trigger
+ if (get(trigger, '$kind') === SDKKinds.OnIntent) {
+ const triggerIntent = get(trigger, 'intent', '') as string;
+ removeLuIntent(dialogId, triggerIntent);
+ }
+
+ // Clean action resources
+ const actions = get(trigger, 'actions') as BaseSchema[];
+ if (!actions || !Array.isArray(actions)) return;
+
+ deleteActions(dialogId, actions);
+ };
+
return {
createTrigger: createTriggerHandler,
+ deleteTrigger,
};
}
@@ -106,6 +134,8 @@ export function useTriggerApi(projectId: string) {
const lgFiles = useRecoilValue(lgFilesState(projectId));
const dialogs = useRecoilValue(dialogsState(projectId));
const locale = useRecoilValue(localeState(projectId));
+ const { deleteActions } = useActionApi(projectId);
+ const { removeLuIntent } = useLuApi(projectId);
const dispatchers = useRecoilValue(dispatcherState);
const { luFileResolver, lgFileResolver, dialogResolver } = useResolvers(projectId);
@@ -115,7 +145,9 @@ export function useTriggerApi(projectId: string) {
dispatchers,
luFileResolver,
lgFileResolver,
- dialogResolver
+ dialogResolver,
+ deleteActions,
+ removeLuIntent
)
);
@@ -125,7 +157,9 @@ export function useTriggerApi(projectId: string) {
dispatchers,
luFileResolver,
lgFileResolver,
- dialogResolver
+ dialogResolver,
+ deleteActions,
+ removeLuIntent
);
setApi(newApi);
return () => {
diff --git a/Composer/packages/client/src/shell/useShell.ts b/Composer/packages/client/src/shell/useShell.ts
index cbb8b68da1..772bbfe669 100644
--- a/Composer/packages/client/src/shell/useShell.ts
+++ b/Composer/packages/client/src/shell/useShell.ts
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
import { useMemo, useRef } from 'react';
-import { ShellApi, ShellData, Shell, DialogSchemaFile } from '@bfc/shared';
+import { ShellApi, ShellData, Shell, DialogSchemaFile, DialogInfo } from '@botframework-composer/types';
import { useRecoilValue } from 'recoil';
import formatMessage from 'format-message';
@@ -22,10 +22,11 @@ import {
localeState,
qnaFilesState,
designPageLocationState,
- botNameState,
+ botDisplayNameState,
dialogSchemasState,
lgFilesState,
luFilesState,
+ rateInfoState,
} from '../recoilModel';
import { undoFunctionState } from '../recoilModel/undo/history';
@@ -33,10 +34,30 @@ import { useLgApi } from './lgApi';
import { useLuApi } from './luApi';
import { useQnaApi } from './qnaApi';
import { useTriggerApi } from './triggerApi';
+import { useActionApi } from './actionApi';
const FORM_EDITOR = 'PropertyEditor';
-type EventSource = 'FlowEditor' | 'PropertyEditor' | 'DesignPage';
+type EventSource = 'FlowEditor' | 'PropertyEditor' | 'DesignPage' | 'VaCreation';
+
+const stubDialog = (): DialogInfo => ({
+ content: {
+ $kind: '',
+ },
+ diagnostics: [],
+ displayName: '',
+ id: '',
+ isRoot: true,
+ lgFile: '',
+ lgTemplates: [],
+ luFile: '',
+ qnaFile: '',
+ referredLuIntents: [],
+ referredDialogs: [],
+ triggers: [],
+ intentTriggers: [],
+ skills: [],
+});
export function useShell(source: EventSource, projectId: string): Shell {
const dialogMapRef = useRef({});
@@ -54,8 +75,9 @@ export function useShell(source: EventSource, projectId: string): Shell {
const luFiles = useRecoilValue(luFilesState(projectId));
const lgFiles = useRecoilValue(lgFilesState(projectId));
const dialogSchemas = useRecoilValue(dialogSchemasState(projectId));
- const botName = useRecoilValue(botNameState(projectId));
+ const botName = useRecoilValue(botDisplayNameState(projectId));
const settings = useRecoilValue(settingsState(projectId));
+ const flowZoomRate = useRecoilValue(rateInfoState);
const userSettings = useRecoilValue(userSettingsState);
const clipboardActions = useRecoilValue(clipboardActionsState);
@@ -74,12 +96,14 @@ export function useShell(source: EventSource, projectId: string): Shell {
setMessage,
displayManifestModal,
updateSkill,
+ updateZoomRate,
} = useRecoilValue(dispatcherState);
const lgApi = useLgApi(projectId);
const luApi = useLuApi(projectId);
const qnaApi = useQnaApi(projectId);
const triggerApi = useTriggerApi(projectId);
+ const actionApi = useActionApi(projectId);
const { dialogId, selected, focused, promptTab } = designPageLocation;
const dialogsMap = useMemo(() => {
@@ -133,6 +157,10 @@ export function useShell(source: EventSource, projectId: string): Shell {
focusTo(projectId, dataPath, fragment ?? '');
}
+ function updateFlowZoomRate(currentRate) {
+ updateZoomRate({ currentRate });
+ }
+
dialogMapRef.current = dialogsMap;
const api: ShellApi = {
@@ -163,10 +191,6 @@ export function useShell(source: EventSource, projectId: string): Shell {
updateDialog(payload);
commitChanges();
},
- ...lgApi,
- ...luApi,
- ...qnaApi,
- ...triggerApi,
updateRegExIntent: updateRegExIntentHandler,
renameRegExIntent: renameRegExIntentHandler,
updateIntentTrigger: updateIntentTriggerHandler,
@@ -204,42 +228,50 @@ export function useShell(source: EventSource, projectId: string): Shell {
updateDialogSchema(dialogSchema, projectId);
},
updateSkillSetting: (...params) => updateSkill(projectId, ...params),
+ updateFlowZoomRate,
+ ...lgApi,
+ ...luApi,
+ ...qnaApi,
+ ...triggerApi,
+ ...actionApi,
};
- const currentDialog = useMemo(() => dialogs.find((d) => d.id === dialogId), [dialogs, dialogId]);
+ const currentDialog = useMemo(() => dialogs.find((d) => d.id === dialogId) ?? stubDialog(), [
+ dialogs,
+ dialogId,
+ ]) as DialogInfo;
const editorData = useMemo(() => {
return source === 'PropertyEditor'
? getDialogData(dialogsMap, dialogId, focused || selected || '')
: getDialogData(dialogsMap, dialogId);
}, [source, dialogsMap, dialogId, focused, selected]);
- const data: ShellData = currentDialog
- ? {
- data: editorData,
- locale,
- botName,
- projectId,
- dialogs,
- dialogSchemas,
- dialogId,
- focusPath,
- schemas,
- lgFiles,
- luFiles,
- qnaFiles,
- currentDialog,
- userSettings,
- designerId: editorData?.$designer?.id,
- focusedEvent: selected,
- focusedActions: focused ? [focused] : [],
- focusedSteps: focused ? [focused] : selected ? [selected] : [],
- focusedTab: promptTab,
- clipboardActions,
- hosted: !!isAbsHosted(),
- skills,
- skillsSettings: settings.skill || {},
- }
- : ({} as ShellData);
+ const data: ShellData = {
+ locale,
+ botName,
+ projectId,
+ dialogs,
+ dialogSchemas,
+ dialogId,
+ focusPath,
+ schemas,
+ lgFiles,
+ luFiles,
+ qnaFiles,
+ currentDialog,
+ userSettings,
+ designerId: editorData?.$designer?.id,
+ focusedEvent: selected,
+ focusedActions: focused ? [focused] : [],
+ focusedSteps: focused ? [focused] : selected ? [selected] : [],
+ focusedTab: promptTab,
+ clipboardActions,
+ hosted: !!isAbsHosted(),
+ luFeatures: settings.luFeatures,
+ skills,
+ skillsSettings: settings.skill || {},
+ flowZoomRate,
+ };
return {
api,
diff --git a/Composer/packages/client/src/types/window.d.ts b/Composer/packages/client/src/types/window.d.ts
index 75e2cc6501..18e8c289d8 100644
--- a/Composer/packages/client/src/types/window.d.ts
+++ b/Composer/packages/client/src/types/window.d.ts
@@ -1,19 +1,30 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-interface Window {
- /**
- * Electron mechanism used for communication from renderer to main process.
- */
- ipcRenderer: IPCRenderer;
+import * as ExtensionClient from '@bfc/extension-client';
- /**
- * Flag that is set on the window object when the client is embedded within Electron.
- */
- __IS_ELECTRON__?: boolean;
+declare global {
+ interface Window {
+ /**
+ * Electron mechanism used for communication from renderer to main process.
+ */
+ ipcRenderer: IPCRenderer;
- /**
- * Composer UI Extension API
- */
- Composer: any;
+ /**
+ * Flag that is set on the window object when the client is embedded within Electron.
+ */
+ __IS_ELECTRON__?: boolean;
+
+ /**
+ * Composer UI Extension API
+ */
+ Composer: {
+ __pluginType: string;
+ render: (type: string, shell: Shell, component: React.ReactElement) => void;
+ sync: (shell: Shell) => void;
+ [key: string]: any;
+ };
+
+ ExtensionClient: typeof ExtensionClient;
+ }
}
diff --git a/Composer/packages/client/src/utils/__test__/fileUtil.test.ts b/Composer/packages/client/src/utils/__test__/fileUtil.test.ts
new file mode 100644
index 0000000000..fe5e476715
--- /dev/null
+++ b/Composer/packages/client/src/utils/__test__/fileUtil.test.ts
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { getUniqueName } from '../fileUtil';
+
+describe('File utils', () => {
+ it('should get a unique name', () => {
+ const uniqueName = getUniqueName(['test', 'test-1', 'test-2', 'test-3'], 'test');
+ expect(uniqueName).toBe('test-4');
+ });
+});
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index 235868bd23..1db948b322 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -95,9 +95,8 @@ function createTrigger(dialog: DialogInfo, data: TriggerFormData, factory: Dialo
export function updateIntentTrigger(dialog: DialogInfo, intentName: string, newIntentName: string): DialogInfo {
const dialogCopy = cloneDeep(dialog);
- const trigger = (dialogCopy.content?.triggers ?? []).find(
- (t) => t.$kind === SDKKinds.OnIntent && t.intent === intentName
- );
+ const triggers = dialogCopy.content?.triggers as ITriggerCondition[];
+ const trigger = (triggers ?? []).find((t) => t.$kind === SDKKinds.OnIntent && t.intent === intentName);
if (trigger) {
trigger.intent = newIntentName;
diff --git a/Composer/packages/client/src/utils/fileUtil.ts b/Composer/packages/client/src/utils/fileUtil.ts
index 24f8256f28..6fadad98d1 100644
--- a/Composer/packages/client/src/utils/fileUtil.ts
+++ b/Composer/packages/client/src/utils/fileUtil.ts
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
+import path from 'path';
+
import moment from 'moment';
import formatMessage from 'format-message';
import generate from 'format-message-generate-id';
@@ -103,3 +105,21 @@ export async function loadLocale(locale: string) {
});
}
}
+
+export const getUniqueName = (list: string[], currentName: string, seperator = '-') => {
+ let uniqueName = currentName;
+ let i = 1;
+ while (list.includes(uniqueName)) {
+ uniqueName = `${currentName}${seperator}${i}`;
+ i++;
+ }
+ return uniqueName;
+};
+
+export const getFileNameFromPath = (param: string, ext: string | undefined = undefined) => {
+ return path.basename(param, ext).replace(/\\/g, '/');
+};
+
+export const getAbsolutePath = (basePath: string, relativePath: string) => {
+ return path.resolve(basePath, relativePath);
+};
diff --git a/Composer/packages/client/src/utils/hooks.ts b/Composer/packages/client/src/utils/hooks.ts
index 6e4aa3a1f3..2eaac47ea4 100644
--- a/Composer/packages/client/src/utils/hooks.ts
+++ b/Composer/packages/client/src/utils/hooks.ts
@@ -1,15 +1,14 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useMemo } from 'react';
import { globalHistory } from '@reach/router';
import replace from 'lodash/replace';
import find from 'lodash/find';
import { useRecoilValue } from 'recoil';
-import { ExtensionPageContribution } from '../recoilModel/types';
+import { designPageLocationState, currentProjectIdState, pluginPagesSelector } from '../recoilModel';
-import { designPageLocationState, extensionsState, currentProjectIdState } from './../recoilModel';
import { bottomLinks, topLinks } from './pageLinks';
import routerCache from './routerCache';
import { projectIdCache } from './projectCache';
@@ -26,19 +25,14 @@ export const useLocation = () => {
export const useLinks = () => {
const projectId = useRecoilValue(currentProjectIdState);
const designPageLocation = useRecoilValue(designPageLocationState(projectId));
- const extensions = useRecoilValue(extensionsState);
+ const pluginPages = useRecoilValue(pluginPagesSelector);
const openedDialogId = designPageLocation.dialogId || 'Main';
- // add page-contributing extensions
- const pluginPages = extensions.reduce((pages, p) => {
- const pagesConfig = p.contributes?.views?.pages;
- if (Array.isArray(pagesConfig) && pagesConfig.length > 0) {
- pages.push(...pagesConfig.map((page) => ({ ...page, id: p.id })));
- }
- return pages;
- }, [] as ExtensionPageContribution[]);
+ const pageLinks = useMemo(() => {
+ return topLinks(projectId, openedDialogId, pluginPages);
+ }, [projectId, openedDialogId, pluginPages]);
- return { topLinks: topLinks(projectId, openedDialogId, pluginPages), bottomLinks };
+ return { topLinks: pageLinks, bottomLinks };
};
export const useRouterCache = (to: string) => {
diff --git a/Composer/packages/client/src/utils/notifications.ts b/Composer/packages/client/src/utils/notifications.ts
index b9b5c2df04..aec925bd4f 100644
--- a/Composer/packages/client/src/utils/notifications.ts
+++ b/Composer/packages/client/src/utils/notifications.ts
@@ -3,11 +3,10 @@
import formatMessage from 'format-message';
import { CardProps } from './../components/NotificationCard';
-
-export const getQnaPendingNotification = (urls: string[]): CardProps => {
+export const getQnaPendingNotification = (url: string): CardProps => {
return {
title: formatMessage('Creating your knowledge base'),
- description: formatMessage('Extracting QNA pairs from {urls}', { urls: urls.join(' ') }),
+ description: formatMessage('Extracting QNA pairs from {url}', { url }),
type: 'pending',
};
};
diff --git a/Composer/packages/client/src/utils/pageLinks.ts b/Composer/packages/client/src/utils/pageLinks.ts
index 3573c6993a..7e9deb52e6 100644
--- a/Composer/packages/client/src/utils/pageLinks.ts
+++ b/Composer/packages/client/src/utils/pageLinks.ts
@@ -1,10 +1,11 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
import formatMessage from 'format-message';
+import { ExtensionPageContribution } from '@bfc/extension-client';
-import { ExtensionPageContribution } from '../recoilModel/types';
+export type ExtensionPageConfig = ExtensionPageContribution & { id: string };
-export const topLinks = (projectId: string, openedDialogId: string, pluginPages: ExtensionPageContribution[]) => {
+export const topLinks = (projectId: string, openedDialogId: string, pluginPages: ExtensionPageConfig[]) => {
const botLoaded = !!projectId;
let links = [
{
@@ -63,6 +64,17 @@ export const topLinks = (projectId: string, openedDialogId: string, pluginPages:
exact: true,
disabled: !botLoaded,
},
+ ...(process.env.COMPOSER_ENABLE_FORMS
+ ? [
+ {
+ to: `/bot/${projectId}/forms`,
+ iconName: 'Table',
+ labelName: formatMessage('Forms'),
+ exact: false,
+ disabled: !botLoaded,
+ },
+ ]
+ : []),
];
if (process.env.COMPOSER_AUTH_PROVIDER === 'abs-h') {
@@ -72,11 +84,11 @@ export const topLinks = (projectId: string, openedDialogId: string, pluginPages:
if (pluginPages.length > 0) {
pluginPages.forEach((p) => {
links.push({
- to: `page/${p.id}`,
+ to: `/bot/${projectId}/plugin/${p.id}/${p.bundleId}`,
iconName: p.icon ?? 'StatusCircleQuestionMark',
labelName: p.label,
exact: true,
- disabled: false,
+ disabled: !projectId,
});
});
}
diff --git a/Composer/packages/client/src/utils/qnaUtil.ts b/Composer/packages/client/src/utils/qnaUtil.ts
index 32144f4e07..2d9a484875 100644
--- a/Composer/packages/client/src/utils/qnaUtil.ts
+++ b/Composer/packages/client/src/utils/qnaUtil.ts
@@ -7,17 +7,80 @@
* for more usage detail, please check client/__tests__/utils/luUtil.test.ts
*/
import { QnAFile, DialogInfo } from '@bfc/shared';
+import { qnaUtil } from '@bfc/indexers';
+
+import { createFile, updateFile } from '../recoilModel/persistence/http';
import { getBaseName, getExtension } from './fileUtil';
-export * from '@bfc/indexers/lib/utils/qnaUtil';
-export function getFileLocale(fileName: string) {
+export const getFileLocale = (fileName: string) => {
//file name = 'a.en-us.qna'
return getExtension(getBaseName(fileName));
-}
-export function getReferredQnaFiles(qnaFiles: QnAFile[], dialogs: DialogInfo[]) {
+};
+export const getReferredQnaFiles = (qnaFiles: QnAFile[], dialogs: DialogInfo[]) => {
return qnaFiles.filter((file) => {
const idWithOutLocale = getBaseName(file.id);
return dialogs.some((dialog) => dialog.qnaFile === idWithOutLocale && !!file.content);
});
-}
+};
+// substring text file by lines
+export const substringTextByLine = (text: string, start?: number, end?: number): string => {
+ return text.split('\n').slice(start, end).join('\n');
+};
+/**
+ * Migrate qna pair in
- {
- onCreateNewTemplate();
- actions.setMessage('item added');
- }}
- >
- {formatMessage('Add QnA Pair')}
-
-
- )}
-
+
+ );
+ }
return (
+ 
+ {
+ actions.createQnAFromUrlDialogBegin({ projectId, showFromScratch: true });
+ }}
+ />
+
+ {formatMessage('Create a knowledge base from scratch or import knowledge from a URL or PDF files')}
+{props.children}
;
}
return