MC-3865: Content Types With Links Redirect On Storefront If Link Is Empty

danmooney2 · danmooney2 · commit cc953280c55a · 2018-09-17T13:26:40.000-05:00
Use preview converter for link_href to prevent javascript:void(0) from appearing as href on stage
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml
@@ -37,7 +37,7 @@
                     </element>
                     <element name="link">
                         <attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                     </element>
@@ -112,7 +112,7 @@
                     </element>
                     <element name="link">
                         <attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                     </element>
@@ -187,7 +187,7 @@
                     </element>
                     <element name="link">
                         <attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                     </element>
@@ -263,7 +263,7 @@
                     </element>
                     <element name="link">
                         <attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                     </element>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/button_item.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/button_item.xml
@@ -43,7 +43,7 @@
                         <style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
                         <style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
                         <attribute name="button_link" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="button_link" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="button_link" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="button_link" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="button_link" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                         <css name="button_type"/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/image.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/image.xml
@@ -52,7 +52,7 @@
                     </element>
                     <element name="link">
                         <attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                         <attribute name="title_attribute" source="title"/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml
@@ -114,7 +114,7 @@
                     </element>
                     <element name="link">
                         <attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
-                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" persistence_mode="write"/>
+                        <attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
                         <attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
                         <attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
                     </element>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/attribute/link-href.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/attribute/link-href.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/attribute/link-type.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/attribute/link-type.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/attribute/preview/link-href.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/attribute/preview/link-href.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/read/configurable.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/read/configurable.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-href.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-href.ts
@@ -49,6 +49,10 @@ export default class CreateValueForHref implements ConverterInterface {
      * @returns {string | object}
      */
     public fromDom(value: string): string | object {
+        if (value === "") {
+            value = "javascript:void(0)";
+        }
+
         return value;
     }
 
@@ -60,37 +64,49 @@ export default class CreateValueForHref implements ConverterInterface {
      * @returns {string}
      */
     public toDom(name: string, data: DataObject): string {
+        const link = data[name] as any;
+        let href;
 
-        const link = data[name];
-        let href = "javascript:void(0)";
+        if (typeof link === "undefined") {
+            href = "javascript:void(0)";
+        } else if (typeof link.type !== "undefined") {
+            if (typeof link.href !== "undefined" && link.type === "default") {
+                link[link.type] = link.href;
+            }
 
-        if (!link) {
-            return href;
-        }
+            delete link.href;
+
+            if (link[link.type] === "javascript:void(0)") {
+                link[link.type] = "";
+            }
 
-        const linkType = link.type;
-        const isHrefId = !isNaN(parseInt(link[linkType], 10));
+            href = link[link.type];
 
-        if (isHrefId && link) {
-            href = this.convertToWidget(link[linkType], this.widgetParamsByLinkType[linkType]);
-        } else if (link[linkType]) {
-            href = link[linkType];
+            if (!href.length) {
+                href = "javascript:void(0)";
+            }
+
+            const isHrefIdReference = !isNaN(parseInt(href, 10)) && link.type !== "default";
+
+            if (isHrefIdReference) {
+                href = this.convertToWidget(href, link.type);
+            }
         }
+
         return href;
     }
 
     /**
      * @param {string} href
-     * @param {object} widgetAttributes
+     * @param {string} linkType
      * @returns {string}
      */
-    private convertToWidget(href: string, widgetAttributes: object): string {
+    private convertToWidget(href: string, linkType: string): string {
         const attributesString = _.map(
-            widgetAttributes,
+            this.widgetParamsByLinkType[linkType],
             (val: string, key: string) => `${key}='${val.replace(":href", href)}'`,
         ).join(" ");
 
         return `{{widget ${attributesString} }}`;
     }
-
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-type.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-type.ts
@@ -29,7 +29,6 @@ export default class CreateValueForLinkType implements ConverterInterface {
      * @returns {string}
      */
     public toDom(name: string, data: DataObject): string {
-
-        return data[name] ? data[name].type : "";
+        return data[name] && data[name].type ? data[name].type : "default";
     }
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/link-href.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/link-href.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+import _ from "underscore";
+import {DataObject} from "../../../data-store";
+import ConverterInterface from "../../converter-interface";
+
+/**
+ * @api
+ */
+export default class CreateValueForHref implements ConverterInterface {
+    /**
+     * Convert value to internal format
+     *
+     * @param value string
+     * @returns {string | object}
+     */
+    public fromDom(value: string): string | object {
+        return value;
+    }
+
+    /**
+     * Convert value to knockout format
+     *
+     * @param name string
+     * @param data Object
+     * @returns {string}
+     */
+    public toDom(name: string, data: DataObject): string {
+        const link = data[name] as any;
+        let href = "";
+
+        if (!link) {
+            return href;
+        }
+
+        const linkType = link.type;
+
+        if (link[linkType]) {
+            href = link[linkType];
+        }
+
+        return href;
+    }
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts
@@ -111,8 +111,11 @@ export default class Configurable implements ReadInterface {
             if (converterPool.get(attributeConfig.converter)) {
                 value = converterPool.get(attributeConfig.converter).fromDom(value);
             }
-            if (data[attributeConfig.var] === "object") {
-                value = mageUtils.extend(value, data[attributeConfig.var]);
+            if ($.type(result[attributeConfig.var]) === "object") {
+                value = mageUtils.extend(
+                    {[attributeConfig.name]: value},
+                    result[attributeConfig.var],
+                );
             }
             result[attributeConfig.var] = value;
         }
@@ -147,7 +150,7 @@ export default class Configurable implements ReadInterface {
             if (converterPool.get(propertyConfig.converter)) {
                 value = converterPool.get(propertyConfig.converter).fromDom(value);
             }
-            if (typeof result[propertyConfig.var] === "object") {
+            if ($.type(result[propertyConfig.var]) === "object") {
                 value = mageUtils.extend(result[propertyConfig.var], value);
             }
             result[propertyConfig.var] = value;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ export default class CreateValueForLinkType implements ConverterInterface {`
`29`	`29`	`* @returns {string}`
`30`	`30`	`*/`
`31`	`31`	`public toDom(name: string, data: DataObject): string {`
`32`		`-`
`33`		`- return data[name] ? data[name].type : "";`
	`32`	`+ return data[name] && data[name].type ? data[name].type : "default";`
`34`	`33`	`}`
`35`	`34`	`}`