Skip to content

Commit

Permalink
updated readme.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bob Potterveld committed Dec 12, 2020
1 parent 9e57ca4 commit 87eda27
Show file tree
Hide file tree
Showing 22 changed files with 1,820 additions and 1,802 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [0.17.5] - 2020-12-12
- Fix to allow use of CF template upgrade to disable WebAppConfHelp, WebAppConfPositiveFeedback, and WebAppConfNegativeFeedback
- Fix to improve resizing of lex-web-ui button at bottom of page when text is used in addition to icon

## [0.17.4] - 2020-12-06
- Improved upgrade support
- Chat history can now be preserved and redisplayed when the user comes back to the original parent page.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ and ability to interrupt responses and replay recordings
- Ability to programmatically configure and interact with the chatbot
UI using JavaScript

#### Fixes in version 0.17.5
- Fix to allow use of CF template upgrade to disable WebAppConfHelp, WebAppConfPositiveFeedback, and WebAppConfNegativeFeedback
- Fix to improve resizing of lex-web-ui button at bottom of page when text is used in addition to icon

#### Features in version 0.17.4
- Improved upgrade support.
* The CloudFormation upgrade stack operation from the AWS Console should now be used to
Expand Down
22 changes: 14 additions & 8 deletions config/utils/merge-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@ module.exports = function mergeConfig(baseConfig, srcConfig) {
let mergedConfig = {};
let value = baseConfig[key];
// merge from source if its value is not empty
if (key in srcConfig && !isEmpty(srcConfig[key])) {
value = (typeof(baseConfig[key]) === 'object') ?
// recursively merge sub-objects in both directions
Object.assign(
mergeConfig(srcConfig[key], baseConfig[key]),
mergeConfig(baseConfig[key], srcConfig[key]),
) :
srcConfig[key];
// allow merging of emtpy values from helpIntent, positiveFeedbackIntent, and negativeFeedbackIntent
if (key in srcConfig ) {
if (key==='helpIntent' ||
key==='positiveFeedbackIntent' ||
key=== 'negativeFeedbackIntent' ||
!isEmpty(srcConfig[key]) ) {
value = (typeof (baseConfig[key]) === 'object') ?
// recursively merge sub-objects in both directions
Object.assign(
mergeConfig(srcConfig[key], baseConfig[key]),
mergeConfig(baseConfig[key], srcConfig[key]),
) :
srcConfig[key];
}
}
mergedConfig[key] = value;
return mergedConfig;
Expand Down
6 changes: 5 additions & 1 deletion dist/custom-chatbot-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,8 @@
*/
button.min-button {
border-radius: 60px;
}
}

.message-button {
display: none;
}
8 changes: 4 additions & 4 deletions dist/lex-web-ui-loader.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/lex-web-ui-loader.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 87eda27

Please sign in to comment.