Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fix missing array of choices expression field #6906

Merged
beyackle merged 2 commits into from
Apr 13, 2021
Merged

fix: Fix missing array of choices expression field #6906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40c3ea2
fix: Fix missing array of choices expression field
tdurnford Apr 13, 2021
23e096a
Merge branch 'main' into durnford/fix/array-of-choices
tdurnford Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Composer/packages/adaptive-form/src/components/fields/OneOfField/OneOfField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ const OneOfField: React.FC<FieldProps> = (props) => {
};

const renderField = () => {
if (!selectedSchema || Array.isArray(selectedSchema.type) || !selectedSchema.type) {
return null;
}
// attempt to get a placeholder with the selected schema
const placeholder = getUiPlaceholder({ ...props, schema: selectedSchema }) || props.placeholder;
const enumOptions = selectedSchema?.enum as string[];
Expand Down
59 changes: 28 additions & 31 deletions Composer/packages/server/src/locales/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,8 @@
"bot_framework_composer_is_a_visual_authoring_canva_c3947d91": {
"message": "Bot Framework Composer is a visual authoring canvas for building bots and other types of conversational application with the Microsoft Bot Framework technology stack. With Composer you will find everything you need to build a modern, state-of-the-art conversational experience."
},
"bot_framework_composer_is_an_open_source_visual_au_2be2e02b": {
"message": "Bot Framework Composer is an open-source visual authoring canvas for developers and multi-disciplinary teams to build bots. Composer integrates LUIS and QnA Maker, and allows sophisticated composition of bot replies using language generation."
},
"bot_framework_composer_requires_node_js_in_order_t_a1d3dfb": {
"message": "Bot Framework Composer requires Node.js in order to run. Click “Install Node.js” to install the latest version"
},
"bot_framework_provides_the_most_comprehensive_expe_e34a7f5d": {
"message": "Bot Framework provides the most comprehensive experience for building conversational applications."
"bot_framework_composer_requires_node_js_in_order_t_9c45c226": {
"message": "Bot Framework Composer requires Node.js in order to create and run a new bot. Click “Install Node.js” to install the latest version"
},
"bot_framework_emulator_fefd4a59": {
"message": "Bot Framework Emulator"
Expand Down Expand Up @@ -656,12 +650,15 @@
"collapse_34080b4d": {
"message": "Collapse"
},
"collapse_debug_panel_6f1c5869": {
"message": "Collapse debug panel"
"collapse_debug_panel_2841f8ba": {
"message": "Collapse Debug Panel"
},
"collapse_navigation_17228b95": {
"message": "Collapse Navigation"
},
"collect_service_level_and_conversation_level_data__d486b519": {
"message": "Collect service-level and conversation-level data to help gauge the performance and efficacy of your bot."
},
"comment_7ef1428e": {
"message": "Comment"
},
Expand Down Expand Up @@ -698,6 +695,9 @@
"composer_on_github_1e3782ef": {
"message": "Composer on GitHub"
},
"composer_runtime_error_b0efe05": {
"message": "Composer Runtime Error"
},
"composer_settings_31b04099": {
"message": "Composer Settings"
},
Expand Down Expand Up @@ -1352,6 +1352,9 @@
"enable_6f5d1328": {
"message": "Enable"
},
"enable_insights_e339cf40": {
"message": "Enable Insights"
},
"enable_line_numbers_to_refer_to_code_lines_by_numb_e5ba66ea": {
"message": "Enable line numbers to refer to code lines by number."
},
Expand Down Expand Up @@ -1382,9 +1385,6 @@
"endofconversation_activity_4aa21306": {
"message": "EndOfConversation activity"
},
"endpoint_key_933b60ae": {
"message": "Endpoint Key"
},
"endpoints_ff946539": {
"message": "Endpoints"
},
Expand Down Expand Up @@ -1424,9 +1424,6 @@
"enter_luis_authoring_key_c59f8f1f": {
"message": "Enter LUIS authoring key"
},
"enter_luis_endpoint_key_f8eb30f5": {
"message": "Enter LUIS endpoint key"
},
"enter_luis_region_2316eceb": {
"message": "Enter LUIS region"
},
Expand Down Expand Up @@ -1496,12 +1493,18 @@
"error_occurred_5549a6b4": {
"message": "Error occurred"
},
"error_occurred_building_the_bot_7425aa09": {
"message": "Error occurred building the bot"
},
"error_occurred_ejecting_runtime_8512129e": {
"message": "Error occurred ejecting runtime!"
},
"error_occurred_error_event_3e7f8ad0": {
"message": "Error occurred (Error event)"
},
"error_occurred_trying_to_fetch_runtime_standard_ou_d0677f2d": {
"message": "Error occurred trying to fetch runtime standard output"
},
"error_please_add_unknown_functions_to_setting_s_cu_14b4abf8": {
"message": "{ error } Please add unknown functions to setting''s customFunctions field."
},
Expand Down Expand Up @@ -1544,6 +1547,9 @@
"expand_2f2fadbd": {
"message": "Expand"
},
"expand_debug_panel_6f04e9f2": {
"message": "Expand Debug Panel"
},
"expand_navigation_20330d1d": {
"message": "Expand Navigation"
},
Expand Down Expand Up @@ -2057,6 +2063,9 @@
"learn_about_adaptive_expressions_fb1b6c3c": {
"message": "Learn about Adaptive expressions"
},
"learn_how_to_publish_to_a_dev_ops_pipeline_using_c_9b4577be": {
"message": "Learn how to publish to a Dev Ops pipeline using CI / CD."
},
"learn_more_14816ec": {
"message": "Learn More."
},
Expand Down Expand Up @@ -2246,9 +2255,6 @@
"luis_authoring_region_b142f97b": {
"message": "Luis Authoring Region"
},
"luis_endpoint_key_c685e219": {
"message": "LUIS endpoint key"
},
"luis_key_is_required_with_the_current_recognizer_s_66890a29": {
"message": "LUIS key is required with the current recognizer setting to start your bot locally, and publish"
},
Expand Down Expand Up @@ -2696,9 +2702,6 @@
"output_5023cf84": {
"message": "Output"
},
"outputs_e6f0bfbe": {
"message": "Outputs"
},
"page_number_cdee4179": {
"message": "Page number"
},
Expand Down Expand Up @@ -2753,9 +2756,6 @@
"prebuilt_entity_21ebcdc6": {
"message": "Prebuilt entity"
},
"prediction_key_200e158b": {
"message": "Prediction key"
},
"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"
},
Expand Down Expand Up @@ -2891,6 +2891,9 @@
"publish_target_388f6adf": {
"message": "Publish target"
},
"publish_to_dev_ops_3b8f5a2f": {
"message": "Publish to Dev Ops"
},
"publish_your_bot_to_azure_and_manage_published_bot_67751ca9": {
"message": "Publish your bot to Azure and manage published bots here."
},
Expand Down Expand Up @@ -3491,9 +3494,6 @@
"start_bot_25ecad14": {
"message": "Start Bot"
},
"start_bot_failed_d75647d5": {
"message": "Start bot failed"
},
"start_command_a085f2ec": {
"message": "Start command"
},
Expand Down Expand Up @@ -3959,9 +3959,6 @@
"use_custom_luis_authoring_key_9c71470b": {
"message": "Use custom LUIS authoring key"
},
"use_custom_luis_endpoint_key_572e2c29": {
"message": "Use custom LUIS endpoint key"
},
"use_custom_luis_region_49d31dbf": {
"message": "Use custom LUIS region"
},
Expand Down