diff --git a/Composer/packages/client/src/pages/setting/app-settings/PreviewFeatureToggle.tsx b/Composer/packages/client/src/pages/setting/app-settings/PreviewFeatureToggle.tsx
index 6c1af7b21a..a80179dd09 100644
--- a/Composer/packages/client/src/pages/setting/app-settings/PreviewFeatureToggle.tsx
+++ b/Composer/packages/client/src/pages/setting/app-settings/PreviewFeatureToggle.tsx
@@ -10,7 +10,7 @@ import { useRecoilValue } from 'recoil';
import { dispatcherState, featureFlagsState } from '../../../recoilModel';
-import { featureFlagGroupContainer } from './styles';
+import { featureFlagGroupContainer, noFeatureFlagText } from './styles';
import { SettingToggle } from './SettingToggle';
import * as images from './images';
import { FeatureFlagCheckBox } from './FeatureFlagCheckBox';
@@ -37,6 +37,9 @@ export const PreviewFeatureToggle: React.FC = () => {
);
}
});
+ if (result.length === 0) {
+ result.push({formatMessage('There are no preview features at this time.')});
+ }
return {result}
;
};
diff --git a/Composer/packages/client/src/pages/setting/app-settings/styles.ts b/Composer/packages/client/src/pages/setting/app-settings/styles.ts
index ad31e5354f..e1765f855f 100644
--- a/Composer/packages/client/src/pages/setting/app-settings/styles.ts
+++ b/Composer/packages/client/src/pages/setting/app-settings/styles.ts
@@ -70,3 +70,8 @@ export const featureFlagContainer = css`
export const featureFlagTitle = css`
font-weight: ${FontWeights.semibold};
`;
+
+export const noFeatureFlagText = css`
+ font-size: ${FontSizes.size14};
+ font-style: italic;
+`;
diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index 71b2714dbd..f3080f6c31 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -41,6 +41,9 @@
"a_valid_url_should_start_with_http_or_https_327b1a30": {
"message": "A valid URL should start with http:// or https://"
},
+ "a_valid_url_should_start_with_http_or_https_d24b3591": {
+ "message": "A valid url should start with http:// or https://"
+ },
"about_70c18bba": {
"message": "About"
},
@@ -128,6 +131,9 @@
"add_a_welcome_message_9e1480b2": {
"message": "Add a welcome message"
},
+ "add_additional_url_bdfac25d": {
+ "message": "Add additional URL"
+ },
"add_alternative_phrasing_17e0304c": {
"message": "+ Add alternative phrasing"
},
@@ -227,6 +233,9 @@
"any_string_f22dc2e1": {
"message": "any string"
},
+ "append_choices_35c45a2d": {
+ "message": "Append choices"
+ },
"application_language_87691b6": {
"message": "Application Language"
},
@@ -614,6 +623,9 @@
"could_not_connect_to_storage_50411de0": {
"message": "Could not connect to storage."
},
+ "could_not_init_plugin_1f1c29cd": {
+ "message": "Could not init plugin"
+ },
"couldn_t_complete_the_update_a337a359": {
"message": "Couldn''t complete the update:"
},
@@ -686,6 +698,9 @@
"create_kb_from_url_or_file_49ad6671": {
"message": "Create KB from URL or file"
},
+ "create_knowledge_base_db6d66c4": {
+ "message": "Create knowledge base"
+ },
"create_knowledge_base_from_scratch_afe4d2a2": {
"message": "Create knowledge base from scratch"
},
@@ -1409,6 +1424,9 @@
"learn_more_about_knowledge_base_sources_24369b09": {
"message": "Learn more about knowledge base sources. "
},
+ "learn_more_about_qna_maker_skus_998c567": {
+ "message": "Learn more about QnA Maker SKUs."
+ },
"learn_more_about_title_d1d3edbe": {
"message": "Learn more about { title }"
},
@@ -1805,6 +1823,9 @@
"open_notification_panel_5796edb3": {
"message": "Open notification panel"
},
+ "open_skills_page_for_configuration_details_a2a484ea": {
+ "message": "Open Skills page for configuration details"
+ },
"optional_221bcc9d": {
"message": "Optional"
},
@@ -1895,6 +1916,9 @@
"please_select_an_activity_type_92f4a8a1": {
"message": "Please select an activity type"
},
+ "populate_your_knowledge_base_bb2d3605": {
+ "message": "Populate your Knowledge Base"
+ },
"press_enter_to_add_this_item_or_tab_to_move_to_the_6beb8a14": {
"message": "press Enter to add this item or Tab to move to the next interactive element"
},
@@ -2075,6 +2099,9 @@
"regex_intent_is_already_defined_df095c1f": {
"message": "RegEx { intent } is already defined"
},
+ "regular_expression_855557bf": {
+ "message": "Regular Expression"
+ },
"regular_expression_recognizer_44664557": {
"message": "Regular expression recognizer"
},
@@ -2324,6 +2351,9 @@
"skills_49cccd6a": {
"message": "Skills"
},
+ "skip_this_step_to_add_questions_and_answers_manual_ed1b9f80": {
+ "message": "Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. "
+ },
"sorry_something_went_wrong_with_connecting_bot_run_7d6785e3": {
"message": "Sorry, something went wrong with connecting bot runtime"
},
@@ -2474,6 +2504,9 @@
"there_are_no_notifications_e81eab8d": {
"message": "There are no notifications."
},
+ "there_are_no_preview_features_at_this_time_a5c40953": {
+ "message": "There are no preview features at this time."
+ },
"there_was_an_error_74ed3c58": {
"message": "There was an error"
},
@@ -2522,6 +2555,9 @@
"this_trigger_type_is_not_supported_by_the_regex_re_dc3eefa2": {
"message": "This trigger type is not supported by the RegEx recognizer. To ensure this trigger is fired, change the recognizer type."
},
+ "this_url_is_duplicated_a0768f44": {
+ "message": "This url is duplicated"
+ },
"this_version_of_the_content_is_out_of_date_and_you_5e878f29": {
"message": "This version of the content is out of date, and your last change was rejected. The content will be automatically refreshed."
},
@@ -2633,6 +2669,9 @@
"typing_activity_6b634ae": {
"message": "Typing activity"
},
+ "unable_to_determine_recognizer_type_from_data_valu_2960f526": {
+ "message": "Unable to determine recognizer type from data: { value }"
+ },
"undo_a7be8fef": {
"message": "Undo"
},
@@ -2687,6 +2726,9 @@
"updating_scripts_e17a5722": {
"message": "Updating scripts... "
},
+ "url_22a5f3b8": {
+ "message": "URL"
+ },
"url_8c4ff7d2": {
"message": "Url"
},
diff --git a/Composer/yarn.lock b/Composer/yarn.lock
index 86c3e52b71..009eeed194 100644
--- a/Composer/yarn.lock
+++ b/Composer/yarn.lock
@@ -1718,7 +1718,7 @@
resolve "^1.8.1"
semver "^5.5.1"
-"@babel/plugin-transform-runtime@^7.9.6":
+"@babel/plugin-transform-runtime@7.9.6", "@babel/plugin-transform-runtime@^7.9.6":
version "7.9.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
@@ -2974,6 +2974,17 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"
+"@jest/types@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+ integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+ dependencies:
+ "@types/istanbul-lib-coverage" "^2.0.0"
+ "@types/istanbul-reports" "^3.0.0"
+ "@types/node" "*"
+ "@types/yargs" "^15.0.0"
+ chalk "^4.0.0"
+
"@jsdevtools/ono@^7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
@@ -3736,6 +3747,14 @@
jest-diff "^25.2.1"
pretty-format "^25.2.1"
+"@types/jest@^26.0.15":
+ version "26.0.15"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe"
+ integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==
+ dependencies:
+ jest-diff "^26.0.0"
+ pretty-format "^26.0.0"
+
"@types/json-schema@^7.0.3":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
@@ -6992,14 +7011,6 @@ convert-source-map@^1.6.0, convert-source-map@^1.7.0:
dependencies:
safe-buffer "~5.1.1"
-cookie-parser@^1.4.4:
- version "1.4.4"
- resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.4.tgz#e6363de4ea98c3def9697b93421c09f30cf5d188"
- integrity sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==
- dependencies:
- cookie "0.3.1"
- cookie-signature "1.0.6"
-
cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -8446,6 +8457,11 @@ diff-sequences@^26.0.0:
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==
+diff-sequences@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+ integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
+
diff@3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -12235,6 +12251,16 @@ jest-diff@^25.2.1:
jest-get-type "^25.2.6"
pretty-format "^25.4.0"
+jest-diff@^26.0.0:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+ integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+ dependencies:
+ chalk "^4.0.0"
+ diff-sequences "^26.6.2"
+ jest-get-type "^26.3.0"
+ pretty-format "^26.6.2"
+
jest-diff@^26.0.1:
version "26.0.1"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.0.1.tgz#c44ab3cdd5977d466de69c46929e0e57f89aa1de"
@@ -12296,6 +12322,11 @@ jest-get-type@^26.0.0:
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039"
integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==
+jest-get-type@^26.3.0:
+ version "26.3.0"
+ resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+ integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+
jest-haste-map@^26.0.1:
version "26.0.1"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.0.1.tgz#40dcc03c43ac94d25b8618075804d09cd5d49de7"
@@ -15985,6 +16016,16 @@ pretty-format@^25.5.0:
ansi-styles "^4.0.0"
react-is "^16.12.0"
+pretty-format@^26.0.0, pretty-format@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+ integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ ansi-regex "^5.0.0"
+ ansi-styles "^4.0.0"
+ react-is "^17.0.1"
+
pretty-format@^26.0.1:
version "26.0.1"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.0.1.tgz#a4fe54fe428ad2fd3413ca6bbd1ec8c2e277e197"
@@ -16430,6 +16471,11 @@ react-is@^16.8.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+react-is@^17.0.1:
+ version "17.0.1"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+ integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+
react-lifecycles-compat@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"