Merge branch 'master' into liweitian/UIBug1

microsoft · Feb 6, 2020 · a214553 · a214553
2 parents 6041474 + cf2bd0a
commit a214553
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Composer/packages/extensions/visual-designer/src/constants/ElementSizes.ts b/Composer/packages/extensions/visual-designer/src/constants/ElementSizes.ts
@@ -17,8 +17,8 @@ export const LoopIconSize = {
 };
 
 export const IconBrickSize = {
-  width: 16,
-  height: 16,
+  width: 24,
+  height: 24,
 };
 
 export const LoopEdgeMarginLeft = 20;

diff --git a/Composer/packages/tools/language-servers/language-understanding/src/matchingPattern.ts b/Composer/packages/tools/language-servers/language-understanding/src/matchingPattern.ts
@@ -130,7 +130,7 @@ export function getSuggestionEntities(luisJson: any, suggestionEntityTypes: stri
     suggestionEntityTypes.forEach(entityType => {
       if (luisJson[entityType] !== undefined && luisJson[entityType].length > 0) {
         luisJson[entityType].forEach(entity => {
-          if (entity) {
+          if (entity && entity.name) {
             suggestionEntityList.push(entity.name);
           }
         });
@@ -177,7 +177,9 @@ export function getSuggestionRoles(luisJson: any, suggestionEntityTypes: string[
         luisJson[entityType].forEach(entity => {
           if (entity.roles !== undefined && entity.roles.length > 0) {
             entity.roles.forEach(role => {
-              suggestionRolesList.push(role);
+              if (role) {
+                suggestionRolesList.push(role);
+              }
             });
           }
         });