From ae0069fa5d0106f0331d247823b0e35b0821cc12 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 7 Oct 2020 22:30:51 +0100
Subject: [PATCH] RecordDetail & NewRecord now baseComponents

---
 .../standard-components/src/NewRecord.svelte  | 25 +++++++++++++++++++
 .../src/RecordDetail.svelte                   | 13 +++++-----
 packages/standard-components/src/index.js     |  1 +
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 packages/standard-components/src/NewRecord.svelte

diff --git a/packages/standard-components/src/NewRecord.svelte b/packages/standard-components/src/NewRecord.svelte
new file mode 100644
index 0000000000..923611d760
--- /dev/null
+++ b/packages/standard-components/src/NewRecord.svelte
@@ -0,0 +1,25 @@
+<script>
+  import { onMount } from "svelte"
+  import { isEmpty } from "lodash/fp"
+
+  export let _bb
+  export let model
+
+  let record = {}
+
+  $: {
+    record.modelId = model
+  }
+
+  let target
+
+  onMount(async () => {
+    if (!isEmpty(record) && record.model) {
+      _bb.attachChildren(target, {
+        context: record,
+      })
+    }
+  })
+</script>
+
+<section bind:this={target} />
diff --git a/packages/standard-components/src/RecordDetail.svelte b/packages/standard-components/src/RecordDetail.svelte
index 95723782bd..30ab336427 100644
--- a/packages/standard-components/src/RecordDetail.svelte
+++ b/packages/standard-components/src/RecordDetail.svelte
@@ -8,6 +8,7 @@
   let store = _bb.store
   let target
 
+  // this function should only get called when in builder preview mode
   async function fetchFirstRecord() {
     const FETCH_RECORDS_URL = `/api/views/all_${model}`
     const response = await _bb.api.get(FETCH_RECORDS_URL)
@@ -24,22 +25,22 @@
     // if srcdoc, then we assume this is the builder preview
     if (pathParts.length === 0 || pathParts[0] === "srcdoc") {
       record = await fetchFirstRecord()
-    } else {
-      const id = pathParts[pathParts.length - 1]
-      const GET_RECORD_URL = `/api/${model}/records/${id}`
+    } else if (_bb.routeParams().id) {
+      const GET_RECORD_URL = `/api/${model}/records/${_bb.routeParams().id}`
       const response = await _bb.api.get(GET_RECORD_URL)
       if (response.status === 200) {
         record = await response.json()
+      } else {
+        throw new Error("Failed to fetch record.", response)
       }
+    } else {
+      throw new Exception("Record ID was not supplied to RecordDetail")
     }
 
     if (record) {
       _bb.attachChildren(target, {
-        hydrate: false,
         context: record,
       })
-    } else {
-      throw new Error("Failed to fetch record.", response)
     }
   }
 
diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js
index 0ce5088cb8..2ad0db166b 100644
--- a/packages/standard-components/src/index.js
+++ b/packages/standard-components/src/index.js
@@ -27,6 +27,7 @@ export { default as stackedlist } from "./StackedList.svelte"
 export { default as card } from "./Card.svelte"
 export { default as cardhorizontal } from "./CardHorizontal.svelte"
 export { default as recorddetail } from "./RecordDetail.svelte"
+export { default as newrecord } from "./NewRecord.svelte"
 export { default as datepicker } from "./DatePicker.svelte"
 export * from "./Chart"
 export { default as icon } from "./Icon.svelte"