From db66ceb6c9a1025c7a84d34241eac74e1bd922db Mon Sep 17 00:00:00 2001 From: Ze Ye Date: Wed, 26 Feb 2020 15:59:09 +0800 Subject: [PATCH 1/2] disable InitProperty entry --- Composer/packages/lib/shared/src/viewUtils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/Composer/packages/lib/shared/src/viewUtils.ts b/Composer/packages/lib/shared/src/viewUtils.ts index df4b202ea6..923c54b228 100644 --- a/Composer/packages/lib/shared/src/viewUtils.ts +++ b/Composer/packages/lib/shared/src/viewUtils.ts @@ -69,7 +69,6 @@ export const dialogGroups: DialogGroupsMap = { types: [ SDKTypes.SetProperty, SDKTypes.SetProperties, - SDKTypes.InitProperty, SDKTypes.DeleteProperty, SDKTypes.DeleteProperties, SDKTypes.EditArray, From c877f86bc522e535db484dc11d48a9a7746dd0f3 Mon Sep 17 00:00:00 2001 From: Ze Ye Date: Wed, 26 Feb 2020 16:00:21 +0800 Subject: [PATCH 2/2] remove InitProperty definition --- .../obiformeditor/demo/src/editorschema.json | 3 --- .../demo/src/samples/todo/AddToDo.json | 2 +- .../demo/src/stories/VisualSDKDemo.js | 1 - .../visual-designer/src/schema/uischema.tsx | 4 --- Composer/packages/lib/shared/src/appschema.ts | 27 ------------------- Composer/packages/lib/shared/src/labelMap.ts | 3 --- .../packages/lib/shared/src/types/schema.ts | 1 - .../packages/server/schemas/editor.schema | 5 ---- 8 files changed, 1 insertion(+), 45 deletions(-) diff --git a/Composer/packages/extensions/obiformeditor/demo/src/editorschema.json b/Composer/packages/extensions/obiformeditor/demo/src/editorschema.json index 7875250f47..b41d827cdb 100644 --- a/Composer/packages/extensions/obiformeditor/demo/src/editorschema.json +++ b/Composer/packages/extensions/obiformeditor/demo/src/editorschema.json @@ -63,9 +63,6 @@ "Microsoft.IfCondition": { "title": "Branch: If/Else" }, - "Microsoft.InitProperty": { - "title": "Initialize Property" - }, "Microsoft.OnIntent": { "title": "Intent" }, diff --git a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json index f6f7be93f3..390fa63365 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json +++ b/Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json @@ -49,7 +49,7 @@ "condition": "user.todos == null", "actions": [ { - "$type": "Microsoft.InitProperty", + "$type": "Microsoft.SetProperty", "$designer": { "createdAt": "2019-07-16T20:01:05.970Z", "updatedAt": "2019-07-16T20:01:13.866Z", diff --git a/Composer/packages/extensions/visual-designer/demo/src/stories/VisualSDKDemo.js b/Composer/packages/extensions/visual-designer/demo/src/stories/VisualSDKDemo.js index c061775c26..70b1ea7f12 100644 --- a/Composer/packages/extensions/visual-designer/demo/src/stories/VisualSDKDemo.js +++ b/Composer/packages/extensions/visual-designer/demo/src/stories/VisualSDKDemo.js @@ -20,7 +20,6 @@ export class VisualSDKDemo extends Component { const initialTypes = [ SDKTypes.SendActivity, SDKTypes.EditArray, - SDKTypes.InitProperty, SDKTypes.SetProperties, SDKTypes.SetProperty, SDKTypes.DeleteProperties, diff --git a/Composer/packages/extensions/visual-designer/src/schema/uischema.tsx b/Composer/packages/extensions/visual-designer/src/schema/uischema.tsx index 879cce4f58..a2c32b9aa8 100644 --- a/Composer/packages/extensions/visual-designer/src/schema/uischema.tsx +++ b/Composer/packages/extensions/visual-designer/src/schema/uischema.tsx @@ -117,10 +117,6 @@ export const uiSchema: UISchema = { 'ui:widget': ActionCard, content: data => `${data.changeType} {${data.itemsProperty || '?'}}`, }, - [SDKTypes.InitProperty]: { - 'ui:widget': ActionCard, - content: data => `{${data.property || '?'}} = new ${data.type || '?'}`, - }, [SDKTypes.SetProperty]: { 'ui:widget': ActionCard, content: data => `{${data.property || '?'}} = ${data.value || '?'}`, diff --git a/Composer/packages/lib/shared/src/appschema.ts b/Composer/packages/lib/shared/src/appschema.ts index 711f1045dc..5330d03cfa 100644 --- a/Composer/packages/lib/shared/src/appschema.ts +++ b/Composer/packages/lib/shared/src/appschema.ts @@ -1400,11 +1400,6 @@ export const appschema: OBISchema = { description: 'Two-way branch the conversation flow based on a condition.', $ref: '#/definitions/Microsoft.IfCondition', }, - { - title: 'Microsoft.InitProperty', - description: 'Define and initialize a property to be an array or object.', - $ref: '#/definitions/Microsoft.InitProperty', - }, { title: 'Microsoft.LogAction', description: @@ -1700,28 +1695,6 @@ export const appschema: OBISchema = { }, }, }, - 'Microsoft.InitProperty': { - $role: 'unionType(Microsoft.IDialog)', - title: 'Initialize property', - description: 'Define and initialize a property to be an array or object.', - type: 'object', - properties: { - ...$properties(SDKTypes.InitProperty), - property: { - $role: 'expression', - title: 'Property', - description: 'Property (named location to store information).', - examples: ['user.age'], - type: 'string', - }, - type: { - type: 'string', - title: 'Type', - description: 'Type of value.', - enum: ['object', 'array'], - }, - }, - }, 'Microsoft.IpEntityRecognizer': { $role: 'unionType(Microsoft.EntityRecognizers)', title: 'Ip Entity Recognizer', diff --git a/Composer/packages/lib/shared/src/labelMap.ts b/Composer/packages/lib/shared/src/labelMap.ts index 48712512cd..b49e7a4714 100644 --- a/Composer/packages/lib/shared/src/labelMap.ts +++ b/Composer/packages/lib/shared/src/labelMap.ts @@ -91,9 +91,6 @@ export const ConceptLabels: { [key in ConceptLabelKey]?: LabelOverride } = { [SDKTypes.IfCondition]: { title: formatMessage('Branch: if/else'), }, - [SDKTypes.InitProperty]: { - title: formatMessage('Initialize a property'), - }, [SDKTypes.LanguagePolicy]: { title: formatMessage('LanguagePolicy'), }, diff --git a/Composer/packages/lib/shared/src/types/schema.ts b/Composer/packages/lib/shared/src/types/schema.ts index 37221d09c8..6bcd5b2818 100644 --- a/Composer/packages/lib/shared/src/types/schema.ts +++ b/Composer/packages/lib/shared/src/types/schema.ts @@ -49,7 +49,6 @@ export enum SDKTypes { HashtagEntityRecognizer = 'Microsoft.HashtagEntityRecognizer', HttpRequest = 'Microsoft.HttpRequest', IfCondition = 'Microsoft.IfCondition', - InitProperty = 'Microsoft.InitProperty', IpEntityRecognizer = 'Microsoft.IpEntityRecognizer', LanguagePolicy = 'Microsoft.LanguagePolicy', LogAction = 'Microsoft.LogAction', diff --git a/Composer/packages/server/schemas/editor.schema b/Composer/packages/server/schemas/editor.schema index 8bef83d2bb..0f0b4807b4 100644 --- a/Composer/packages/server/schemas/editor.schema +++ b/Composer/packages/server/schemas/editor.schema @@ -115,11 +115,6 @@ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow", "helpLinkText": "Learn more" }, - "Microsoft.InitProperty": { - "title": "Initialize Property", - "helpLink": "https://aka.ms/bfc-using-memory", - "helpLinkText": "Learn more" - }, "Microsoft.LanguagePolicy": { "title": "LanguagePolicy" },