Merge branch 'master' into fix/icon-borders

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -220,7 +220,18 @@
   const stepStore = writable({})
   $: stepState = $stepStore?.[block.id]
 
-  $: customStepLayouts($memoBlock, schemaProperties, stepState, fetchedRows)
+  const updateSelectedRow = testData => {
+    selectedRow = testData?.row
+  }
+  $: updateSelectedRow(testData)
+
+  $: customStepLayouts(
+    $memoBlock,
+    schemaProperties,
+    stepState,
+    fetchedRows,
+    selectedRow
+  )
 
   const customStepLayouts = block => {
     if (
@@ -387,32 +398,11 @@
         ]
       }
 
-      stepLayouts[block.stepId] = {
+      const getTestDataSelector = () => {
-        row: {
+        if (!isTestModal) {
-          schema: schema["row"],
+          return []
-          //?layout: RowLayoutStepComponent.
-          content: [
-            {
-              type: TableSelector,
-              title: "Table",
-              props: {
-                isTrigger,
-                value: inputData["row"]?.tableId ?? "",
-                onChange: e => {
-                  const rowKey = $stepStore?.[block.id]?.rowType || "row"
-                  onChange({
-                    _tableId: e.detail,
-                    meta: {},
-                    [rowKey]: e.detail
-                      ? {
-                          tableId: e.detail,
         }
-                      : {},
+        return [
-                  })
-                },
-                disabled: isTestModal,
-              },
-            },
           {
             type: CoreSelect,
             title: "Row",
@@ -456,6 +446,36 @@
               noMargin: true,
             },
           },
+        ]
+      }
+
+      stepLayouts[block.stepId] = {
+        row: {
+          schema: schema["row"],
+          //?layout: RowLayoutStepComponent.
+          content: [
+            {
+              type: TableSelector,
+              title: "Table",
+              props: {
+                isTrigger,
+                value: inputData["row"]?.tableId ?? "",
+                onChange: e => {
+                  const rowKey = $stepStore?.[block.id]?.rowType || "row"
+                  onChange({
+                    _tableId: e.detail,
+                    meta: {},
+                    [rowKey]: e.detail
+                      ? {
+                          tableId: e.detail,
+                        }
+                      : {},
+                  })
+                },
+                disabled: isTestModal,
+              },
+            },
+            ...getTestDataSelector(),
             ...getIdConfig(),
             ...getRevConfig(),
             ...getRowTypeConfig(),

packages/client/src/components/app/forms/SignatureField.svelte

@@ -31,10 +31,12 @@
         let attachRequest = new FormData()
         attachRequest.append("file", signatureFile)
 
-        const resp = await API.uploadAttachment(
+        let sourceId = formContext?.dataSource?.tableId
-          formContext?.dataSource?.tableId,
+        if (formContext?.dataSource?.type === "viewV2") {
-          attachRequest
+          sourceId = formContext.dataSource.id
-        )
+        }
+
+        const resp = await API.uploadAttachment(sourceId, attachRequest)
         const [signatureAttachment] = resp
         updateValue = signatureAttachment
       } else {