From 2f5a3104f1f5fc05013cb943cc0ad179e676d4ed Mon Sep 17 00:00:00 2001 From: Hetu Nandu Date: Tue, 21 Apr 2020 07:54:23 +0000 Subject: [PATCH] Fix radio widget default value and Post api save error --- .../src/transformers/RestActionTransformer.ts | 4 ++-- app/client/src/widgets/BaseWidget.tsx | 2 +- app/client/src/widgets/CheckboxWidget.tsx | 2 +- app/client/src/widgets/DropdownWidget.tsx | 2 +- app/client/src/widgets/MapWidget.tsx | 7 +++++++ app/client/src/widgets/RadioGroupWidget.tsx | 2 +- app/client/src/widgets/RichTextEditorWidget.tsx | 16 ---------------- 7 files changed, 13 insertions(+), 22 deletions(-) diff --git a/app/client/src/transformers/RestActionTransformer.ts b/app/client/src/transformers/RestActionTransformer.ts index 95fee8d5a6..f15433fd5d 100644 --- a/app/client/src/transformers/RestActionTransformer.ts +++ b/app/client/src/transformers/RestActionTransformer.ts @@ -21,7 +21,7 @@ export const transformRestAction = (data: any): any => { data.displayFormat && data.displayFormat === POST_BODY_FORMAT_OPTIONS[0].value ) { - if (data.actionConfiguration.body[0]) { + if (data.actionConfiguration.body && data.actionConfiguration.body[0]) { const body = data.actionConfiguration.body[0]; action = { ...data, @@ -36,7 +36,7 @@ export const transformRestAction = (data: any): any => { data.displayFormat && data.displayFormat === POST_BODY_FORMAT_OPTIONS[1].value ) { - if (data.actionConfiguration.body[1]) { + if (data.actionConfiguration.body && data.actionConfiguration.body[1]) { const body = data.actionConfiguration.body[1]; if (typeof data.actionConfiguration.body === "object") { action = { diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx index 12d536d457..d2741d2f94 100644 --- a/app/client/src/widgets/BaseWidget.tsx +++ b/app/client/src/widgets/BaseWidget.tsx @@ -71,7 +71,7 @@ abstract class BaseWidget< return {}; } - static getMetaPropertiesMap(): Record { + static getMetaPropertiesMap(): Record { return {}; } diff --git a/app/client/src/widgets/CheckboxWidget.tsx b/app/client/src/widgets/CheckboxWidget.tsx index b7ea054cb0..1df4d69bbf 100644 --- a/app/client/src/widgets/CheckboxWidget.tsx +++ b/app/client/src/widgets/CheckboxWidget.tsx @@ -34,7 +34,7 @@ class CheckboxWidget extends BaseWidget { static getMetaPropertiesMap(): Record { return { - isChecked: false, + isChecked: undefined, }; } diff --git a/app/client/src/widgets/DropdownWidget.tsx b/app/client/src/widgets/DropdownWidget.tsx index 518c7c1e55..d2c127bbcf 100644 --- a/app/client/src/widgets/DropdownWidget.tsx +++ b/app/client/src/widgets/DropdownWidget.tsx @@ -88,7 +88,7 @@ class DropdownWidget extends BaseWidget { static getMetaPropertiesMap(): Record { return { selectedOptionValue: undefined, - selectedOptionValueArr: [], + selectedOptionValueArr: undefined, }; } diff --git a/app/client/src/widgets/MapWidget.tsx b/app/client/src/widgets/MapWidget.tsx index 58d64e4c09..0450e11da5 100644 --- a/app/client/src/widgets/MapWidget.tsx +++ b/app/client/src/widgets/MapWidget.tsx @@ -37,6 +37,13 @@ class MapWidget extends BaseWidget { }; } + static getMetaPropertiesMap(): Record { + return { + center: undefined, + markers: undefined, + }; + } + updateCenter = (lat: number, lng: number) => { this.updateWidgetMetaProperty("center", { lat, lng }); }; diff --git a/app/client/src/widgets/RadioGroupWidget.tsx b/app/client/src/widgets/RadioGroupWidget.tsx index abe86f24b5..e4ee423877 100644 --- a/app/client/src/widgets/RadioGroupWidget.tsx +++ b/app/client/src/widgets/RadioGroupWidget.tsx @@ -43,7 +43,7 @@ class RadioGroupWidget extends BaseWidget { static getMetaPropertiesMap(): Record { return { - selectedOptionValue: "", + selectedOptionValue: undefined, }; } diff --git a/app/client/src/widgets/RichTextEditorWidget.tsx b/app/client/src/widgets/RichTextEditorWidget.tsx index 0ed38c487d..2c0e85bbf3 100644 --- a/app/client/src/widgets/RichTextEditorWidget.tsx +++ b/app/client/src/widgets/RichTextEditorWidget.tsx @@ -45,22 +45,6 @@ class RichTextEditorWidget extends BaseWidget< }; } - componentDidMount() { - super.componentDidMount(); - if (this.props.defaultText) { - this.updateWidgetMetaProperty("text", this.props.defaultText); - } - } - - componentDidUpdate(prevProps: RichTextEditorWidgetProps) { - super.componentDidUpdate(prevProps); - if (this.props.defaultText) { - if (this.props.defaultText !== prevProps.defaultText) { - this.updateWidgetMetaProperty("text", this.props.defaultText); - } - } - } - onValueChange = (text: string) => { this.updateWidgetMetaProperty("text", text); if (this.props.onTextChange) {