From 274339d94540712644313640ef43c4fed3cc0e21 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 3 Mar 2021 13:51:53 +0000
Subject: [PATCH 1/2] fix space table name grid bug

---
 .../store/screenTemplates/rowListScreen.js    |  2 +-
 .../PropertiesPanel/SettingsView.svelte       |  8 +++----
 packages/standard-components/manifest.json    | 24 +------------------
 .../src/grid/Component.svelte                 |  2 ++
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
index 54a066af9c..c999c22647 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
@@ -82,7 +82,7 @@ const createScreen = table => {
       theme: "alpine",
       height: "540",
       pagination: true,
-      detailUrl: `${table.name.toLowerCase()}/:id`,
+      detailUrl: `${rowListUrl(table)}/:id`,
     })
     .instanceName("Grid")
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
index 771c78948b..447a4f71fc 100644
--- a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
@@ -162,16 +162,16 @@
 
   {#if componentDefinition?.component?.endsWith('/fieldgroup')}
     <Button secondary wide on:click={() => confirmResetFieldsDialog?.show()}>
-      Reset Fields
+      Update Form Fields 
     </Button>
   {/if}
 </div>
 <ConfirmDialog
   bind:this={confirmResetFieldsDialog}
-  body={`All components inside this group will be deleted and replaced with fields to match the schema. Are you sure you want to reset this Field Group?`}
-  okText="Reset"
+  body={`All components inside this group will be deleted and replaced with fields to match the schema. Are you sure you want to update this Field Group?`}
+  okText="Update"
   onOk={resetFormFields}
-  title="Confirm Reset Fields" />
+  title="Confirm Form Field Update" />
 
 <style>
   .settings-view-container {
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index cb321f1bb9..6a359026df 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -5,29 +5,7 @@
     "icon": "ri-layout-column-line",
     "hasChildren": true,
     "styleable": true,
-    "settings": [
-      {
-        "type": "select",
-        "key": "type",
-        "label": "Type",
-        "defaultValue": "div",
-        "options": [
-          "article",
-          "aside",
-          "details",
-          "div",
-          "figure",
-          "figcaption",
-          "footer",
-          "header",
-          "main",
-          "mark",
-          "nav",
-          "paragraph",
-          "summary"
-        ]
-      }
-    ]
+    "settings": []
   },
   "datagrid": {
     "name": "Grid",
diff --git a/packages/standard-components/src/grid/Component.svelte b/packages/standard-components/src/grid/Component.svelte
index 49754a86a5..0348e59208 100644
--- a/packages/standard-components/src/grid/Component.svelte
+++ b/packages/standard-components/src/grid/Component.svelte
@@ -25,6 +25,8 @@
   export let pagination
   export let detailUrl
 
+  $: console.log(detailUrl)
+
   // Add setting height as css var to allow grid to use correct height
   $: gridStyles = {
     ...$component.styles,

From 2fbf64581e1c058f858075862b0ed8f8ec86146c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 3 Mar 2021 14:42:34 +0000
Subject: [PATCH 2/2] tidy up

---
 packages/standard-components/src/grid/Component.svelte | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/standard-components/src/grid/Component.svelte b/packages/standard-components/src/grid/Component.svelte
index 0348e59208..99ce14cf89 100644
--- a/packages/standard-components/src/grid/Component.svelte
+++ b/packages/standard-components/src/grid/Component.svelte
@@ -25,8 +25,6 @@
   export let pagination
   export let detailUrl
 
-  $: console.log(detailUrl)
-
   // Add setting height as css var to allow grid to use correct height
   $: gridStyles = {
     ...$component.styles,
@@ -154,9 +152,7 @@
         {#if selectedRows.length > 0}
           <DeleteButton text small on:click={modal.show()}>
             <Icon name="addrow" />
-            Delete
-            {selectedRows.length}
-            row(s)
+            Delete {selectedRows.length} row(s)
           </DeleteButton>
         {/if}
       </div>