form UE fix

Author: ravuthu

.husky/pre-commit.mjs

@@ -4,8 +4,7 @@ const run = (cmd) => new Promise((resolve, reject) => exec(
   cmd,
   (error, stdout, stderr) => {
     if (error) reject(error);
-    if (stderr) reject(new Error(stderr));
-    resolve(stdout);
+    else resolve(stdout);
   },
 ));
 

component-definition.json

@@ -168,17 +168,23 @@
           "model": "form",
           "plugins": {
             "da": {
-              "name": "form",
-              "rows": 2,
-              "columns": 1,
+              "unsafeHTML": "<div class=\"form\"><div><div><p><a href=\"\"></a></p></div></div><div><div><p><a href=\"\"></a></p></div></div></div>",
               "fields": [
                 {
-                  "name": "source",
-                  "selector": "div:nth-child(1)>div>a[href]"
+                  "name": "url",
+                  "selector": "div:nth-child(1)>div>p>a[href]"
+                },
+                {
+                  "name": "urlText",
+                  "selector": "div:nth-child(1)>div>p>a"
                 },
                 {
                   "name": "actionUrl",
-                  "selector": "div:nth-child(2)>div>a[href]"
+                  "selector": "div:nth-child(2)>div>p>a[href]"
+                },
+                {
+                  "name": "actionUrlText",
+                  "selector": "div:nth-child(2)>div>p>a"
                 }
               ]
             }

component-models.json

@@ -257,14 +257,28 @@
     "id": "form",
     "fields": [
       {
-        "component": "reference",
-        "name": "source",
+        "component": "text",
+        "name": "urlText",
+        "label": "Form Source URL Text",
+        "valueType": "string",
+        "required": true,
+        "description": "Text to display for the Form Source URL"
+      },
+      {
+        "component": "text",
+        "name": "url",
         "label": "Form Source URL",
         "valueType": "string",
-        "multi": false,
         "required": true,
         "description": "URL to the JSON form definition"
       },
+      {
+        "component": "text",
+        "name": "actionUrlText",
+        "label": "Submit Endpoint Text",
+        "valueType": "string",
+        "description": "Text to display for the Submit Endpoint"
+      },
       {
         "component": "text",
         "name": "actionUrl",

ue/models/blocks/form.json

@@ -6,12 +6,12 @@
       "model": "form",
       "plugins": {
         "da": {
-          "name": "form",
-          "rows": 2,
-          "columns": 1,
+          "unsafeHTML": "<div class=\"form\"><div><div><p><a href=\"\"></a></p></div></div><div><div><p><a href=\"\"></a></p></div></div></div>",
           "fields": [
-            { "name": "source", "selector": "div:nth-child(1)>div>a[href]" },
-            { "name": "actionUrl", "selector": "div:nth-child(2)>div>a[href]" }
+            { "name": "url", "selector": "div:nth-child(1)>div>p>a[href]"},
+            { "name": "urlText", "selector": "div:nth-child(1)>div>p>a"},
+            { "name": "actionUrl", "selector": "div:nth-child(2)>div>p>a[href]"},
+            { "name": "actionUrlText", "selector": "div:nth-child(2)>div>p>a"}
           ]
         }
       }
@@ -22,14 +22,28 @@
       "id": "form",
       "fields": [
         {
-          "component": "reference",
-          "name": "source",
+          "component": "text",
+          "name": "urlText",
+          "label": "Form Source URL Text",
+          "valueType": "string",
+          "required": true,
+          "description": "Text to display for the Form Source URL"
+        },
+        {
+          "component": "text",
+          "name": "url",
           "label": "Form Source URL",
           "valueType": "string",
-          "multi": false,
           "required": true,
           "description": "URL to the JSON form definition"
         },
+        {
+          "component": "text",
+          "name": "actionUrlText",
+          "label": "Submit Endpoint Text",
+          "valueType": "string",
+          "description": "Text to display for the Submit Endpoint"
+        },
         {
           "component": "text",
           "name": "actionUrl",

ue/scripts/ue.js

@@ -116,4 +116,4 @@ const setupUEEventHandlers = () => {
 export default () => {
   setupObservers();
   setupUEEventHandlers();
-};
+};