Draft
Conversation
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/client/package.json # Composer/packages/client/src/pages/publish/index.tsx # Composer/packages/client/src/pages/setting/dialog-settings/index.tsx # Composer/packages/client/src/pages/setting/runtime-settings/index.tsx # Composer/packages/client/src/store/persistence/FilePersistence.ts
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Lg, lu and creation flow tests Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
* fix bug * fix e2e test * fix bug
* Renamed components, hooks, Onboarding only * Reverting changed from yar build * Renamed components, hooks, Onboarding only * Reverting changed from yar build * Fixing lint issues * test import fixes * Have to rename to fix case of file name * Fixing case with another commit. * Renamed components, hooks, Onboarding only * Renamed components, hooks, Onboarding only * Fixing lint issues * test import fixes * Have to rename to fix case of file name * Fixing case with another commit. * Fixing imports * Index file renames Part 2
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/client/__tests__/components/CreationFlow/DefineConversation/index.test.tsx # Composer/packages/client/__tests__/components/CreationFlow/index.test.tsx # Composer/packages/client/src/components/CreationFlow/CreationFlow.tsx # Composer/packages/client/src/components/CreationFlow/LocationBrowser/FileSelector.tsx # Composer/packages/client/src/components/NavTree/NavTree.tsx # Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx # Composer/packages/client/src/components/TestController/TestController.tsx # Composer/packages/client/src/pages/design/DesignPage.tsx # Composer/packages/client/src/pages/design/exportSkillModal/content/SelectManifest.tsx # Composer/packages/client/src/pages/language-understanding/LUPage.tsx # Composer/packages/client/src/pages/language-understanding/table-view.tsx # Composer/packages/client/src/pages/publish/Publish.tsx # Composer/packages/client/src/pages/setting/router.tsx # Composer/packages/client/src/shell/useShell.ts # Composer/packages/client/src/store/action/navigation.ts # Composer/packages/client/src/store/persistence/FilePersistence.ts # Composer/packages/client/src/store/reducer/index.ts
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Lg refactor Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Removed typescript types additional Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
* move bot-deploy to plugins * fix profile edit and save not saving to settings * add dependency to electron-server * update settings file clicking customized runtime toggle Co-authored-by: Wenyi Luo <wenyluo@microsoft.com> Co-authored-by: Dong Lei <donglei@microsoft.com>
…mposer into leilzh-srravich/recoil-spike
* split lubuild and luis publish * polish * change foreach to for, make sure writeFile async fucntion are done * make write file parallel
* fix: show the detail error messages from worker * fix test
* fix: UI text in 'new bot' should start upper case * UI: run prettier Co-authored-by: Andy Brown <asbrown002@gmail.com>
* update bl for security reasons * update more bl versions
…osoft#4034) Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](http-party/node-http-proxy@1.17.0...1.18.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#3981) * nodejs runtime: merge settings from generated files * update bl version in yarn.lock to solve CVE-2020-8244 * fix CVE-2020-8244 * Revert "fix CVE-2020-8244" This reverts commit 5a9cb46. * Revert "update bl version in yarn.lock to solve CVE-2020-8244" This reverts commit 81b0b66. Co-authored-by: Zichuan Ma <zim@microsoft.com> Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com>
* Improved plugin infrastructure -- render custom UI * Aligned sample publish plugin with new publish api * client-plugin-lib improvements * Minor fixes for clarity and polish * Updated sample-ui-plugin package with docs * Removed logs * Updated sample-ui-plugin docs * Guarded against removing / disabling built-in plugins * Minor fixes * Linting * Comment update * More linting * Added licenses and removed a comment. * minor cleanup * hide plugins page in client * rename extension-manifest to just extensions * run npm commands in a safe manner * prettify extensions.json * make PluginManager a singleton * only spawn npm commands Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* Added form dialog generation controller * Improved project not found error message. * PR fixes * Added generate comments
* Updated owners for PRs * Update CODEOWNERS Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
* rename plugins to extensions where it makes sense * move packages out of extensions directory * rename extension to editor-extension * merge editor-extension and extension-client * fix type name * fix up remaining references to extensions directory * rename plugin-loader to extension * Aligned electron remote plugin dir with server remote plugin dir. * Fixed tests. * Typecheck fix Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
…soft#4089) Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](node-fetch/node-fetch@v2.6.0...v2.6.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* create l10n-extract script * Update l10n-extract.js * clean up code and move files into own directory * rename files * Update l10n-extract.js * refactor utils and fix small bug * add pseudol10n for client locales file * add pseudolocalization * Update index.tsx * Update botProject.ts * transform other files * move locales into src * unify .json files * move format-message and other fixes * merge in settings dropdown * almost-working locale serverside locale swap * Update App.tsx * fix server silliness * move locale-loading to dispatcher * Update user.ts * fix scripts * remove stray files * make serverside schemas mostly work * Update dialogUtil.ts * use override files * WIP on schema override reading * fix filename typo * Update botProject.ts * move loadLocale out and use for init * fix l10n script * fix typo * delay concept labels * Update viewUtils.ts * Update package.json * update tests (still WIP) * Update fileUtil.test.js * fix loadLocale tests * Update .gitignore * remove pseudo files * fix design of settings * Update AppSettings.tsx * Update en-US.json * fix CR issues and move schema files * add l10n to build scripts This might be why the e2e step is failing; it wasn't creating the schema files that get copied over into new projects by default. * Update botProject.ts * resolve node-forge to 0.10 for security thing * Update LuisDeploy.spec.ts * fixes from CR * Update botProject.ts * rebuild files * post-merge fixes
…4050) * Fixes various issue in the web app deployment script deploy improvements fixes missing empty models; removes accidentally committed yarn.lock * Deletes obsolete scripts * Optimises deployment script for CI/CD pipeline; readme
Pull Request Test Coverage Report for Build 275915429
💛 - Coveralls |
yeze322
pushed a commit
that referenced
this pull request
Jan 27, 2021
* fix: Fixed object array border conflict * Modified getUISchema function * Resolve build errors * Fixed uiOptions in SchemaField * Reverted changes to getUISchema
yeze322
pushed a commit
that referenced
this pull request
Jul 20, 2021
* extract visual editor from design page * bump shared packages * add botframework-ui dependencies * extract property editor from design page * don't pass rootPath as a prop * [wip] use adaptive form package * don't hoist botframework-ui packages * start stubbing out sync based new shell api * bump prompts plugin * revert to using shell extension container to render new form * add extension and adaptive form packages * update jest config to include display name * import json and prompts plugins * convert code editor to @monaco-editor package * render string field for expressions * remove height transition when there is an error * feat: Added select dialog ui plugin (#1) * feat: Added select dialog ui plugin * Apply suggestions from code review * Added tests * Clean up * Updated tests * renamed directory to select-dialog Co-authored-by: Andy Brown <asbrown002@gmail.com> * enable json ui plugin * allow customization of $role and $kind fields * [wip] begin lg editor field * fix height calculation * fix: Set default value in StringField to an empty string (#2) * use field name for lg fields * ignore lg lib * refactor plugin config add roleSchema and kindSchema * clean up lg plugin dependencies * drop ui prefix for ui options * bump @types/react and @types/react-dom * initial support of recognizers in plugin config * initial lu ui plugin * fix: Fixed object array border conflict (#3) * fix: Fixed object array border conflict * Modified getUISchema function * Resolve build errors * Fixed uiOptions in SchemaField * Reverted changes to getUISchema * [wip] start work on rendering better descriptions and help links * finish rendering description and help links * re-renable custom keybinding * clean up old bfcomposer monaco editor bits * fix build errors * do not enable minimap by default * feat: Add Select Dialog Plugin * Updated defaultUiSchema * Added select dialog plugin * fixed issue in uiSchema * Fixed luIntentOptions * Added help link * Modified tests * Fixed tests * move shared types from indexers to shared * fix merge issue * fix lint error * do not compile with test files * move prompt settings to 'Other' tab * fix: Moved prompt settings to 'Other' tab * fix: prompt settings styling and description * wrap labels in formatMessage Co-authored-by: Andy Brown <asbrown002@gmail.com> * move globally hidden fields to getOrderedProperties * [wip] add ability to have multi field rows * make sure to pass value to form rows * use json schema version 7 for base typings * add one of field * begin work on expression editor * update prompt plugin to use json schema v 7 * feat: Updated FormRow to support multiple fields in a row * feat: Updated FormRow to support multiple fields in a row * Updated FormRow * Updated FormRow * fix problem with yarn install * bump react versions * fix merge conflicts * correctly hide placeholder in code editor * remove inline recognizer editor * remove select intent plugin * add key to editor to force remounting * handle type and oneOf expression schemas * port inline luis intent editor * memoize initial value * rename lu plugin to luis * port regex intent editor * fix: Moved type selector to be inline with label (#7) * fix: Fixed warning related to link navigation styling (#8) * rename handleChange to handleRecognizerChange * add method to recognizer config to determine if selected * refactor code editors to not have dependency on monaco-editor package directly * downgrade monaco-languageclient There is an error initializing the language services * export OnInit type * clean up monaco dependencies * update sample schema * render all other fields on single row sets up support for defaultValue exression editor * render json editor with selected schema for complex types * feat: Added custom array field for set properties * feat: Added stackArrayItems to UiOptions * fix: Fixed array item borders * add designerId to ShellData formContext.dialogId is actually data.$designer.id which is confusing when there is dialogId in the ShellData. * feat: Updated ObjectArrayField to display complex arrays in a stacked layout * fix: Filtered object array properties to reflect ui order * removed console.log * fix: Fixed ExpressionField flicker * feat: Added add button for stacked array items * add schema prop to json editor * updated defautUiSchema.ts * register schemas on a per-model basis * fix merge build issue * trigger intent field change when editor changes * fix: Added 'expression' to expression type dropdown. * add disabled item actions for new array item * reduce height of lg field * pass raw errors to schema field child * plumb errors through the prompt form * fix array item styles when an error is present * use label overrides from ConceptLabels in form title * pass project id to lg editor * fix: Added 'expression' to type selector * implement arrayitem wrapper for array fields * fix: Added helpLinks to defaultUiSchema * add useArrayItems hook for array fields * fix: Added 'expression' to type selector * fix: added 'expression' to type dropdown * fix: combined 'selectedSchema' and 'selectedKey' into 'selectedOption' * feat: Added inline lu to prompts * do not override descriptions for prompt fields * fix array item usage * support expression fields with object properties * add subtitle to uiSchema * add titles to choices and confirmChoices * do not use label overrides in form title * [wip] use schema field to render all input fields * update ui schema * correctly set selected option * fix: fixed array item styles * feat: added formatData to uiOptions * fix: Added formatData to ObjectArrayField * default to correct type in expression editor * start case the fallback labels * allow labels for objects with properties * combine choice input and confirm input components * handle enum expressions * feat: Removed formatData in favor of serializer * fix: Fixed serializer labeling * Updated jest.config.js * fix: fixed recognizer in prompts * fix: fixed getSelectedOption returning expression option for strings * fix unit tests * Removed select intent * Fixed luis handleRecognizerChange method * fix merge issue * fixed error message displaying next to field in an array * removed kindSchema comments * update error message when recognizer can't be determined * add testid to expression dropdown * fix todo spec * fix notifications page spec * remove obiformeditor package * fix new LGTM alerts * incorporate locale when setting lg file name * fix selecting correct lu file with locale * sync data with shell to support undo/redo * update oneOf field to handle array of types * do not use transparent border for one of fields * do not have transparent border for expression editor It looks weird with the prefix icon * fix: Fixed dropdownWidth in expressions * fix: Fixed inline array styling * fix: removed unused variable * fix: Fixed lint issue * get localize lu file for inline intent editor * fix: Fixed error rendering issue * fix: Fixed schema field styles Co-authored-by: TJ Durnford <tjdford@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.
If this is a bug fix, please describe the root cause and analysis of this problem.
Task Item
Please include a link to the related issue. Ex.
Closes #<issue #>Type of change
Please delete options that are not relevant.
Checklist
Screenshots
Please include screenshots or gifs if your PR include UX changes.