Minor fix in ComponentComposer

ipselon · ipselon · commit 677d6a7dcb61 · 2019-11-29T23:36:21.000+02:00
diff --git a/src/framework/components/ComponentComposer/ComponentComposer.js b/src/framework/components/ComponentComposer/ComponentComposer.js
@@ -89,10 +89,10 @@ const renderComponent = (userComponents, description, rootProps) => {
           if (propertyValue) {
             rootProps[propertyName] = cloneDeep(propertyValue);
           } else {
-            rootProps[propertyName] = null;
+            rootProps[propertyName] = propertyValue;
           }
         } else {
-          if (propertyValue) {
+          if (typeof propertyValue !== 'undefined') {
             rootProps.push(cloneDeep(propertyValue));
           }
         }
@@ -137,10 +137,14 @@ const renderComponent = (userComponents, description, rootProps) => {
       || type === constants.COMPONENT_PROPERTY_NUMBER_TYPE) {
       if (rootProps) {
         if (propertyName) {
-          rootProps[propertyName] = propertyValue || null;
+          rootProps[propertyName] = propertyValue;
         } else {
-          if (propertyValue) {
-            rootProps.push(propertyValue);
+          if (typeof propertyValue !== 'undefined') {
+            if (rootProps.push) {
+              rootProps.push(propertyValue);
+            } else {
+              console.error('It seems that you missed propertyName in the page component target in the page config.');
+            }
           }
         }
       }
diff --git a/src/framework/components/PageComposer/PageComposer.js b/src/framework/components/PageComposer/PageComposer.js
@@ -103,7 +103,7 @@ const renderComponent = (userComponents, description, serviceComponentOptions, r
           if (propertyValue) {
             rootProps[propertyName] = cloneDeep(propertyValue);
           } else {
-            rootProps[propertyName] = null;
+            rootProps[propertyName] = propertyValue;
           }
         } else {
           if (typeof propertyValue !== 'undefined') {

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,10 @@ const renderComponent = (userComponents, description, rootProps) => {`
`89`	`89`	`if (propertyValue) {`
`90`	`90`	`rootProps[propertyName] = cloneDeep(propertyValue);`
`91`	`91`	`} else {`
`92`		`- rootProps[propertyName] = null;`
	`92`	`+ rootProps[propertyName] = propertyValue;`
`93`	`93`	`}`
`94`	`94`	`} else {`
`95`		`- if (propertyValue) {`
	`95`	`+ if (typeof propertyValue !== 'undefined') {`
`96`	`96`	`rootProps.push(cloneDeep(propertyValue));`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -137,10 +137,14 @@ const renderComponent = (userComponents, description, rootProps) => {`
`137`	`137`	`\|\| type === constants.COMPONENT_PROPERTY_NUMBER_TYPE) {`
`138`	`138`	`if (rootProps) {`
`139`	`139`	`if (propertyName) {`
`140`		`- rootProps[propertyName] = propertyValue \|\| null;`
	`140`	`+ rootProps[propertyName] = propertyValue;`
`141`	`141`	`} else {`
`142`		`- if (propertyValue) {`
`143`		`- rootProps.push(propertyValue);`
	`142`	`+ if (typeof propertyValue !== 'undefined') {`
	`143`	`+ if (rootProps.push) {`
	`144`	`+ rootProps.push(propertyValue);`
	`145`	`+ } else {`
	`146`	`+ console.error('It seems that you missed propertyName in the page component target in the page config.');`
	`147`	`+ }`
`144`	`148`	`}`
`145`	`149`	`}`
`146`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ const renderComponent = (userComponents, description, serviceComponentOptions, r`
`103`	`103`	`if (propertyValue) {`
`104`	`104`	`rootProps[propertyName] = cloneDeep(propertyValue);`
`105`	`105`	`} else {`
`106`		`- rootProps[propertyName] = null;`
	`106`	`+ rootProps[propertyName] = propertyValue;`
`107`	`107`	`}`
`108`	`108`	`} else {`
`109`	`109`	`if (typeof propertyValue !== 'undefined') {`