Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: State management support for loading mutiple projects #4117

Merged
merged 32 commits into from
Sep 17, 2020

Conversation

srinaath
Copy link
Contributor

@srinaath srinaath commented Sep 14, 2020

This is the first leg of the work to support multiple projects in Composer. This work lets our state management to use atomFamilies in Recoil for botstates. This PR does not add net new functionality but sets up the Bot Project work which wil coming in succesive PR's

Fixes #4031

Srinaath Ravichandran and others added 8 commits September 13, 2020 19:01
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

Renaming functions

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

Shell api updated

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

All unit tests ans integration tests working now

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>
@coveralls
Copy link

coveralls commented Sep 15, 2020

Coverage Status

Coverage decreased (-0.3%) to 55.246% when pulling 2dc1926 on srravich/bot-projects-recoil into f4ba9e8 on main.

srinaath and others added 9 commits September 14, 2020 18:54
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
…oser into srravich/bot-projects-recoil

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

# Conflicts:
#	Composer/packages/lib/shared/src/skillsUtils/index.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>
srinaath and others added 2 commits September 15, 2020 12:08
…oser into srravich/bot-projects-recoil

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

# Conflicts:
#	Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
Srinaath Ravichandran added 4 commits September 16, 2020 11:25
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>
@lei9444
Copy link
Contributor

lei9444 commented Sep 17, 2020

I tested the create bot, delete bot, save as, copy, paste, update dialog, lu, lg and setting. all this parts work well

Srinaath Ravichandran added 5 commits September 17, 2020 01:01
…oser into srravich/bot-projects-recoil

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

# Conflicts:
#	Composer/packages/client/__tests__/components/skill.test.tsx
#	Composer/packages/client/src/pages/design/DesignPage.tsx
#	Composer/packages/client/src/pages/skills/index.tsx
#	Composer/packages/client/src/recoilModel/dispatchers/__tests__/skill.test.ts
#	Composer/packages/client/src/recoilModel/dispatchers/skill.ts
Remove fit, it on tests
Localization reverts

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>
Srinaath Ravichandran added 2 commits September 17, 2020 11:03
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
@srinaath srinaath merged commit 34b7aa6 into main Sep 17, 2020
@srinaath srinaath deleted the srravich/bot-projects-recoil branch September 17, 2020 21:28
yeze322 added a commit to yeze322/BotFramework-Composer that referenced this pull request Sep 24, 2020
@cwhitten cwhitten mentioned this pull request Nov 13, 2020
yeze322 added a commit that referenced this pull request Jan 27, 2021
* chore: move TriggerCreationModal to folder

* chore: move styles into styles.ts

* chore: move validators out

* Extract dropdown options as constants

* remove outdated dropdown option generators

* don't re-declare SDKKinds as type key

* remove initialError, fix tslint

* fix warning icon size

* refactor show warning logic

* move static func outside TriggerModal

* refactor: move trigger widget out of Modal

* replay changes in #4117 'mutiple projects'

* fix a wrong import path

* refactor: extract TriggerDropdownGroup

* define builtinSchema

* TriggerOptionTree

* remove duplicated  $kinds

* link leaf ndoe to parent node

* migrate to option tree

* fix a React grammar

* rename builtinSchema

* refactor the warning icon logic of trigger modal

* remove unreferenced utils

* add a todo

* fix UT by adding data-testid

* declare TriggerUISchema in extension

* use trigger uischema from extension context

* check trigger option existence

* sort trigger dropdown labels

* move root text out of tree utils

* pass in option compare fn

* add UT for triggerOptionTree

* align icon size with main

* migrate 1.2 PVA logic

* use 'Boolean' to filter trigger menus

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* wrap trigger UI Schema with formatMessage

* add 'px' unit to styles

* add trigger menu order

* 'order' property to manage trigger order

* early returning & add comments

* avoid duplicated iteration and add comments

* fix trigger modal UT

* lint

* replay Ben's commit

* CI fix

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
benbrown pushed a commit that referenced this pull request Jun 11, 2021
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
* chore: move TriggerCreationModal to folder

* chore: move styles into styles.ts

* chore: move validators out

* Extract dropdown options as constants

* remove outdated dropdown option generators

* don't re-declare SDKKinds as type key

* remove initialError, fix tslint

* fix warning icon size

* refactor show warning logic

* move static func outside TriggerModal

* refactor: move trigger widget out of Modal

* replay changes in microsoft#4117 'mutiple projects'

* fix a wrong import path

* refactor: extract TriggerDropdownGroup

* define builtinSchema

* TriggerOptionTree

* remove duplicated  $kinds

* link leaf ndoe to parent node

* migrate to option tree

* fix a React grammar

* rename builtinSchema

* refactor the warning icon logic of trigger modal

* remove unreferenced utils

* add a todo

* fix UT by adding data-testid

* declare TriggerUISchema in extension

* use trigger uischema from extension context

* check trigger option existence

* sort trigger dropdown labels

* move root text out of tree utils

* pass in option compare fn

* add UT for triggerOptionTree

* align icon size with main

* migrate 1.2 PVA logic

* use 'Boolean' to filter trigger menus

Co-authored-by: Andy Brown <asbrown002@gmail.com>

* wrap trigger UI Schema with formatMessage

* add 'px' unit to styles

* add trigger menu order

* 'order' property to manage trigger order

* early returning & add comments

* avoid duplicated iteration and add comments

* fix trigger modal UT

* lint

* replay Ben's commit

* CI fix

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: Andy Brown <asbrown002@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FilePersistence and Undo/Redo Support for BotProjects
4 participants