feat: Merge bot-projects feature onto main #5066
Merged
Conversation
This file contains 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
…oser into feature/bot-projects Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/client/src/shell/useShell.ts
…oser into feature/bot-projects
…oser into feature/bot-projects
…oser into feature/bot-projects
…oser into feature/bot-projects
* Update projectTemplates.ts * correct links and reading dialogs * fix typecheck * fixes from CR * unify props shape across LG/LU/QnA pages * fixes from CR
…oser into feature/bot-projects Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # extensions/localPublish/package.json # extensions/localPublish/yarn.lock
* feat: Notifications Page * update the unit tests * fix merge conflict * update the name * fix unit test * Test skill (#2) * Update en-US.json * bring in stuff from the draft branch * make deletion work * add error/warning icons * read notification map for state * fix type-checking and start on unit tests * add sampleDialog and fix more tests * add showAll * rename to onAllSelected because it's a callback * update unit tests * fix onSelect handling in ProjectTree * Update qna.test.tsx * Update design.test.tsx * add unit test * fixes from PR comments * restore multibots to tree * fix links from project tree * fix wrong IDs in URL * yarn.lock rebuild * update yarn.lock files * fix action card links * Update DesignPage.tsx * fix unit test * add unit test to ExpandableNode * update ProjectTree unit tests * Update ExpandableNode.tsx * add rootProjectId to triggerApi * fix creation and deletion bugs * change mocks folder name * Load design page only after skill project is loaded Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * fixes from CR * fix more tests * fix: handle the case when selection is not empty (#4561) Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> * delete fd (#4556) Co-authored-by: Soroush <sorgh@microsoft.com> * fix more unit tests * revert: bf-orchestrator lib integration (#4568) This reverts commit 006a589. Co-authored-by: Andy Brown <asbrown002@gmail.com> * fix test typol * ci: remove code scanning workflow (#4569) * fix: Can not add properties in "SetProperties" action (#4572) * bug fix * pr comment * pr comments Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: zeye <zeye@microsoft.com> Co-authored-by: Soroush <hatpick@gmail.com> Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: taicchoumsft <61705609+taicchoumsft@users.noreply.github.com> Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com> * update url * Revert "Test skill (#2)" This reverts commit c401768. * fix conflict * fix e2e test * fix unit test * update the diagnostic page * update the warning iconm * fix lint * add some unit tests * fix conflict and update the navigation * fix unit test Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: zeye <zeye@microsoft.com> Co-authored-by: Soroush <hatpick@gmail.com> Co-authored-by: Soroush <sorgh@microsoft.com> Co-authored-by: taicchoumsft <61705609+taicchoumsft@users.noreply.github.com> Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
…oser into feature/bot-projects Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/client/src/components/TestController/TestController.tsx # Composer/packages/client/src/pages/setting/app-settings/AppSettings.tsx # Composer/packages/client/src/utils/hooks.ts # Composer/packages/client/src/utils/pageLinks.ts
* Update projectTemplates.ts * Update navigation.test.tsx * Update ProjectTree.tsx
* Update projectTemplates.ts * Update navigation.test.tsx * click last instance of bot/dialog name * Update CreateNewBot.spec.ts * update more tests
* Added schema for bot project support Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Added support to handle botproject space Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * More updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * temp Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Loading multiple projects working effeiciently Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Backup Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> creat new bot Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Bot project file Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * More updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * More updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * update the recoil to 0.0.13 * fix lint * remove @type/recoil * router work Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Bot Project file creation, adding remote/local skills. Populate state management with rootbot and skills * Migrate to old desing page and project tree Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Revert usage of React 16.13.1 to 16.13.0 Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Revert "Revert usage of React 16.13.1 to 16.13.0" This reverts commit 9aa46ca. * Rename api handlers Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Add existing skill tests passing Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Add 1.0 botproject schema Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Fix typo Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Manifest tests updated Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> More updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Revert publish console logs Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> All unit tests added Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Removed code for bot migration Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Server side tests added Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated schema url to the correct one Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Fix lint and update schema url on echobot Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * botstates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> More file util tests added Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Support for exporting .botproj file Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Clean up paths Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Spellings cleanup Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated gitignore Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Typo fixed Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Set project ignore validation to true while opening remote skill Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Following sdk.schema approach to specificy object type using ref Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Runtime start first pass Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> skills update Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Migration of old bot wrapped up Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Runtime start updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Bot load status Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Bot status indicator Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Notification selector Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Update to settings Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Working bot status indicator Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Update to start component Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Stable LocalBotRuntime operations Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * add/remote skill sync to *.botproj file * relative path support bp file Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Path set Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Fix schema Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Removed workspace references. Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Relative path support Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * creation flow of add/open skill bot, remote skill * Update operations on Bot project file Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated runtime code Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * clean up * Start bots panel first pass completed Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated tests for removing workspace reference Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Removed manifest update operation Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Cleared logs Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Remove skill references Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Remove skill references Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Tested Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Remove unused references Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Update references Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated runtime experience Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * repair broken link modal * update the recognizer types generate function * repair broken skill link * Safe removal of skills Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Resolve bugs with $kind Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * check LUIS & QnA key * add diagnostics to botProjectSpaceSelector * diagnostics in projectree * safely remove unused refs Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Handle select skill dialog tests Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> All tests passing Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Removed logs Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Skill utils updated Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * diagnostics style in project tree * context menu in project tree * update * Added more unit tests Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Added back file to get it back to main version Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Bot status tracker operation Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> More test updated Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * More tests added Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Moved test files Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Binding skill host endpoint on bot start Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Added aria labels Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Header tests updated Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * cleaned up tests and rebased main Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * yarn update and header test Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * PR cleanup before moving from draft status Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * package all setting check into botindexer.validate * update * Migration completed Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated yarn.lock on vacore Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Revert azure publish yarn lock Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * remove fit from test Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Update settings on removing a skill Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Logic update for skill deletion Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Add get port to server Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Start root bot if skills are not present Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * trigger dispatcher * context menu button enable * start/stop bot in project tree * edit/create manifest * Create/edit skill manifest modal * clean up qnaKbUrls * creation flow in design page * update broken skill repair modal * feat: local bot controller * fet: Add test in emulator column * Updated select skill dialog to disable controls if no skill Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * open emulator test * Added fnd by role Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * open Emulator test updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Update to skills Utils Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * update error message style * Support skillhost endpoint for remote skills Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * edit skill manifest in edit mode * fix menu flash * Port set Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Update yarn lock Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * remote skill manifest editor * refine broken bot * fixed styles * tests * tests * Unit tests completed Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * resolve merge conflict * navigation and visual editor for remote skill * lint fix * resolve merge conflict * update * update * get bot diagnostics when load bot * update * move skillsProjectIdSelector to selectors/skills * navigate to skill bot, update test * feat: Property Editor Header when botname is selected in Project tree (#4771) * Support undo/redo for skill Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Poprety Editor commits Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Adaptive form updates Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * PropertyEditorHeader test Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Updated tests Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * PropertyEditor wrapped up Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Removed unused props Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com> * clean up * move PropertyEditorHeader.test.tsx to client/design * clean up * clean up qnaKbUrls * resolve merge conflict * clean up * clean * validation from settings * ut for trigger dispatcher * fix e2e tests and update the dialog create logic * fix unit tests * fix create bot error * change the warning and error position * fix navigate error when create a new dialog * update * update link * Header update Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * Adjust styles Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * bot check filter empty qna/lu files * context menu in project tree header * update * Updated styles Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com> Co-authored-by: Leilei Zhang <leilzh@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com> Co-authored-by: Srinaath Ravichandran <srinaath27@gmail.com> Co-authored-by: TJ <tj.durnford@microsoft.com> Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
* setting page UX * update UX * refine css * update url * update css and fix localStorage bug * refactor and refine css * add custom error style and fix bugs of language settings * localstorage migration * fix delete button hidden bug * update css * update Composer Setting page * save tmp code about the callout switching active language in design page * changing locale button on Header * lint fix * lint fix * handle comments * save tmp code * handle comments * save tmp code * add test case * add test cases * add test cases * fix bugs and update router component * handle comments * handle comments * handle comments * update qna end point key after update qna subscription key * code style * set defaultLanguage as active language if active language is deleted * fix UT * remove useless files * save tmp code * sync on root key * fix bug * code refine * fix UT * fix bug * Refactoring function calls Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> * lint fix Co-authored-by: Srinaath Ravichandran <srinaath27@gmail.com> Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com>
* Update projectTemplates.ts * Update navigation.ts * Update navigation.test.tsx
…oser into feature/bot-projects Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/lib/shared/__tests__/skillUtils/index.test.ts
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
* Update projectTemplates.ts * Update navigation.test.tsx * add logic for new highlighting with menu open * fix color logic
* chore: update the navigation link for setting page * clean the code * update the bot diagnostics * fix diagnostic page link error Co-authored-by: Soroush <hatpick@gmail.com>
…oser into feature/bot-projects Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/client/src/recoilModel/atoms/appState.ts # Composer/packages/client/src/recoilModel/dispatchers/project.ts # Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts # Composer/packages/client/src/router.tsx
…otFramework-Composer into feature/bot-projects
* Update projectTemplates.ts * Update navigation.test.tsx * Update treeItem.tsx
…oser into feature/bot-projects Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com> # Conflicts: # Composer/packages/server/src/locales/en-US.json # extensions/vacore/yarn.lock
…oser into feature/bot-projects
…otFramework-Composer into feature/bot-projects
boydc2014
approved these changes
Dec 3, 2020
lei9444
pushed a commit
to lei9444/BotFramework-Composer-1
that referenced
this pull request
Jun 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge bot project work into main
#minor