This repository was archived by the owner on Jul 9, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 374
feat: Settings page #4456
Merged
liweitian
merged 50 commits into
microsoft:feature/bot-projects
from
liweitian:settingsPage
Nov 16, 2020
Merged
feat: Settings page #4456
liweitian
merged 50 commits into
microsoft:feature/bot-projects
from
liweitian:settingsPage
Nov 16, 2020
Conversation
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
hatpick
previously requested changes
Oct 21, 2020
Contributor
hatpick
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Early feedback
Composer/packages/client/src/components/BotProjectsSettingsIcon.tsx
Outdated
Show resolved
Hide resolved
Composer/packages/client/src/components/ClickOnFocusTextField.tsx
Outdated
Show resolved
Hide resolved
Composer/packages/client/src/components/ClickOnFocusTextField.tsx
Outdated
Show resolved
Hide resolved
Composer/packages/client/src/components/ClickOnFocusTextField.tsx
Outdated
Show resolved
Hide resolved
srinaath
suggested changes
Nov 12, 2020
Composer/packages/client/__tests__/pages/botProjectsSettings/AppIdAndPassword.test.tsx
Show resolved
Hide resolved
srinaath
reviewed
Nov 13, 2020
Signed-off-by: Srinaath Ravichandran <[email protected]>
srinaath
previously approved these changes
Nov 15, 2020
boydc2014
approved these changes
Nov 16, 2020
alanlong9278
added a commit
to alanlong9278/BotFramework-Composer
that referenced
this pull request
Nov 18, 2020
* feature/bot-projects: fix: keep highlight on item with the menu open (microsoft#4835) All tests passed chore: Pull form dialogs feature branch back to main (microsoft#4841) X-platform fix for electron-server "start" script (microsoft#4833) build: add option to force rebuild of extensions (microsoft#4830) fix: remove checkURL call from navTo on dialog clicks (microsoft#4795) fix: export to zip (microsoft#4820) fix: prevent minification of AbortSignal (microsoft#4829) feat: Settings page (microsoft#4456) feat: bot projects skill & context menu (microsoft#4492) fix: repair E2E tests that depended on seeing a single bot name (microsoft#4807) Removed some extraneous characters from the downloaded pva zip name (microsoft#4808) fix: Fixes linux icons on the taskbar (microsoft#4806) Update 1.2.0.md release: 1.2.0 (microsoft#4796) fix: validate bot name when passed via URL params (microsoft#4712) fix async move (microsoft#4799) fix: Await until delete action finishes (microsoft#4792) fix: update debounced update handlers (microsoft#4790)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
This Pr implements the botProjects' settings.
Note about some important issues:
For some property like luis/qna key, these sensitive properties are stored in root bot's localStorage. The structure is like
rootBotId: {
luis:
authoringKey: {
root: rootKey,
skillBot1: '',
skillBot2: skillKey,
}
}
For settingsState, it represents the settings that a bot is using, for example, in the above case, the skillBot1 does not have a custom luis key, so it is using rootKey. if we try to get useRecoil(settingState(skillBot1Id)), the luis key of it is rootKey rather than empty string.
When set skill bot's settings, we need to provide the "merged" settings rather than the settings that a bot is using. Like:
const settings = useRecoilValue(settingsState(projectId));
const mergedSettings = mergePropertiesManagedByRootBot(projectId, rootBotProjectId, settings);
setSettings(projectId, {
...mergedSettings,
MicrosoftAppId: localMicrosoftAppId,
});
The setSettings dispatcher will save the "correct" one in localStorage and generate the one for use in settingsState.
For root bot, the settings and the mergedSettings are the same, so there is no need to do so.
Task Item
Closes #3962
Screenshots