Fixed includeActivity default value wrong type & use original compone…

…nt replace customObjectArrayField
microsoft · Dec 17, 2019 · 18c1e5b · 18c1e5b
1 parent 3c8d3de
commit 18c1e5b
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 7 deletions.
diff --git a/Composer/packages/extensions/obiformeditor/src/schema/uischema.ts b/Composer/packages/extensions/obiformeditor/src/schema/uischema.ts
@@ -99,7 +99,29 @@ export const uiSchema: { [key in SDKTypes]?: UiSchema } = {
     'ui:hidden': ['actions', 'elseActions', ...globalHidden],
   },
   [SDKTypes.SetProperties]: {
-    'ui:hidden': [...globalHidden],
+    assignments: {
+      'ui:options': {
+        object: true,
+      },
+      items: {
+        'ui:options': {
+          hideDescription: true,
+          inline: true,
+        },
+        property: {
+          'ui:options': {
+            hideLabel: true,
+            transparentBorder: true,
+          },
+        },
+        value: {
+          'ui:options': {
+            hideLabel: true,
+            transparentBorder: true,
+          },
+        },
+      },
+    },
   },
   [SDKTypes.OnActivity]: {
     ...triggerUiSchema,
@@ -174,6 +196,31 @@ export const uiSchema: { [key in SDKTypes]?: UiSchema } = {
     },
     'ui:order': ['connectionName', '*'],
   },
+  [SDKTypes.QnAMakerDialog]: {
+    strictFilters: {
+      'ui:options': {
+        object: true,
+      },
+      items: {
+        'ui:options': {
+          hideDescription: true,
+          inline: true,
+        },
+        name: {
+          'ui:options': {
+            hideLabel: true,
+            transparentBorder: true,
+          },
+        },
+        value: {
+          'ui:options': {
+            hideLabel: true,
+            transparentBorder: true,
+          },
+        },
+      },
+    },
+  },
   [SDKTypes.ReplaceDialog]: {
     dialog: {
       'ui:widget': 'DialogSelectWidget',
@@ -188,6 +235,7 @@ export const uiSchema: { [key in SDKTypes]?: UiSchema } = {
     options: {
       'ui:field': 'CustomObjectField',
     },
+    'ui:hidden': [...globalHidden],
     'ui:order': ['options', 'includeActivity', '*'],
   },
   [SDKTypes.SwitchCondition]: {

diff --git a/Composer/packages/lib/shared/src/appschema.ts b/Composer/packages/lib/shared/src/appschema.ts
@@ -262,8 +262,8 @@ export const appschema: OBISchema = {
           type: 'boolean',
           title: 'Include Activity',
           description: 'When set to true, dialog that is called can process the current activity.',
-          default: 'false',
-          examples: ['false'],
+          default: false,
+          examples: [false],
         },
         resultProperty: {
           $role: 'expression',
@@ -2708,8 +2708,8 @@ export const appschema: OBISchema = {
           type: 'boolean',
           title: 'Include Activity',
           description: 'When set to true, dialog that is called can process the current activity.',
-          default: 'false',
-          examples: ['false'],
+          default: false,
+          examples: [false],
         },
       },
     },
@@ -2736,8 +2736,8 @@ export const appschema: OBISchema = {
           type: 'boolean',
           title: 'Include Activity',
           description: 'When set to true, dialog that is called can process the current activity.',
-          default: 'false',
-          examples: ['false'],
+          default: false,
+          examples: [false],
         },
       },
     },