From 928b9ca9a3f6a21c4f2f58d20676ec2b765cd8de Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 22 Mar 2021 12:11:29 +0000
Subject: [PATCH] Update row detail autoscreen to use new data provider and
 safe bindings

---
 .../store/screenTemplates/newRowScreen.js     |  2 +-
 .../store/screenTemplates/rowDetailScreen.js  | 52 ++++++++++++++-----
 .../store/screenTemplates/rowListScreen.js    |  5 +-
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
index aeac80e7c1..7788245d46 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
@@ -37,7 +37,7 @@ const createScreen = table => {
     .customProps({
       theme: "spectrum--lightest",
       size: "spectrum--medium",
-      datasource: {
+      dataSource: {
         label: table.name,
         tableId: table._id,
         type: "table",
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
index 0e48cf307e..486ff76697 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
@@ -25,7 +25,7 @@ export default function(tables) {
 export const ROW_DETAIL_TEMPLATE = "ROW_DETAIL_TEMPLATE"
 export const rowDetailUrl = table => sanitizeUrl(`/${table.name}/:id`)
 
-function generateTitleContainer(table, title, formId) {
+function generateTitleContainer(table, title, formId, repeaterId) {
   // have to override style for this, its missing margin
   const saveButton = makeSaveButton(table, formId).normalStyle({
     background: "#000000",
@@ -61,10 +61,9 @@ function generateTitleContainer(table, title, formId) {
       onClick: [
         {
           parameters: {
-            providerId: formId,
-            rowId: `{{ ${makePropSafe(formId)}._id }}`,
-            revId: `{{ ${makePropSafe(formId)}._rev }}`,
             tableId: table._id,
+            rowId: `{{ ${makePropSafe(repeaterId)}.${makePropSafe("_id")} }}`,
+            revId: `{{ ${makePropSafe(repeaterId)}.${makePropSafe("_rev")} }}`,
           },
           "##eventHandlerType": "Delete Row",
         },
@@ -84,18 +83,33 @@ function generateTitleContainer(table, title, formId) {
 }
 
 const createScreen = table => {
-  const screen = new Screen()
-    .component("@budibase/standard-components/rowdetail")
-    .table(table._id)
-    .instanceName(`${table.name} - Detail`)
-    .route(rowDetailUrl(table))
+  const provider = new Component("@budibase/standard-components/dataprovider")
+    .instanceName(`Data Provider`)
+    .customProps({
+      dataSource: {
+        label: table.name,
+        name: `all_${table._id}`,
+        tableId: table._id,
+        type: "table",
+      },
+      filter: {
+        _id: `{{ ${makePropSafe("url")}.${makePropSafe("id")} }}`,
+      },
+      limit: 1,
+    })
+
+  const repeater = new Component("@budibase/standard-components/list")
+    .instanceName("Repeater")
+    .customProps({
+      dataProvider: `{{ literal ${makePropSafe(provider._json._id)} }}`,
+    })
 
   const form = makeMainForm()
     .instanceName("Form")
     .customProps({
       theme: "spectrum--lightest",
       size: "spectrum--medium",
-      datasource: {
+      dataSource: {
         label: table.name,
         tableId: table._id,
         type: "table",
@@ -116,14 +130,24 @@ const createScreen = table => {
 
   // Add all children to the form
   const formId = form._json._id
-  const rowDetailId = screen._json.props._id
+  const repeaterId = repeater._json._id
   const heading = table.primaryDisplay
-    ? `{{ ${makePropSafe(rowDetailId)}.${makePropSafe(table.primaryDisplay)} }}`
+    ? `{{ ${makePropSafe(repeaterId)}.${makePropSafe(table.primaryDisplay)} }}`
     : null
   form
     .addChild(makeBreadcrumbContainer(table.name, heading || "Edit"))
-    .addChild(generateTitleContainer(table, heading || "Edit Row", formId))
+    .addChild(
+      generateTitleContainer(table, heading || "Edit Row", formId, repeaterId)
+    )
     .addChild(fieldGroup)
 
-  return screen.addChild(form).json()
+  repeater.addChild(form)
+  provider.addChild(repeater)
+
+  return new Screen()
+    .component("@budibase/standard-components/container")
+    .instanceName(`${table.name} - Detail`)
+    .route(rowDetailUrl(table))
+    .addChild(provider)
+    .json()
 }
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
index 092eca0702..8d4dc48a94 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
@@ -2,6 +2,7 @@ import sanitizeUrl from "./utils/sanitizeUrl"
 import { newRowUrl } from "./newRowScreen"
 import { Screen } from "./utils/Screen"
 import { Component } from "./utils/Component"
+import { makePropSafe } from "@budibase/string-templates"
 
 export default function(tables) {
   return tables.map(table => {
@@ -83,7 +84,7 @@ const createScreen = table => {
 
   const grid = new Component("@budibase/standard-components/datagrid")
     .customProps({
-      dataProvider: `{{ literal ${provider._json._id} }}`,
+      dataProvider: `{{ literal ${makePropSafe(provider._json._id)} }}`,
       editable: false,
       theme: "alpine",
       height: "540",
@@ -117,10 +118,8 @@ const createScreen = table => {
 
   return new Screen()
     .component("@budibase/standard-components/container")
-    .mainType("div")
     .route(rowListUrl(table))
     .instanceName(`${table.name} - List`)
-    .name("")
     .addChild(mainContainer)
     .json()
 }