Merge pull request #1242 from Budibase/083bugfixes

fix space table name grid bug

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")
 

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?`}
+  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="Reset"
+  okText="Update"
   onOk={resetFormFields}
-  title="Confirm Reset Fields" />
+  title="Confirm Form Field Update" />
 
 <style>
   .settings-view-container {

packages/standard-components/manifest.json

@@ -5,29 +5,7 @@
     "icon": "ri-layout-column-line",
     "hasChildren": true,
     "styleable": true,
-    "settings": [
+    "settings": []
-      {
-        "type": "select",
-        "key": "type",
-        "label": "Type",
-        "defaultValue": "div",
-        "options": [
-          "article",
-          "aside",
-          "details",
-          "div",
-          "figure",
-          "figcaption",
-          "footer",
-          "header",
-          "main",
-          "mark",
-          "nav",
-          "paragraph",
-          "summary"
-        ]
-      }
-    ]
   },
   "datagrid": {
     "name": "Grid",

packages/standard-components/src/grid/Component.svelte

@@ -152,9 +152,7 @@
         {#if selectedRows.length > 0}
           <DeleteButton text small on:click={modal.show()}>
             <Icon name="addrow" />
-            Delete
+            Delete {selectedRows.length} row(s)
-            {selectedRows.length}
-            row(s)
           </DeleteButton>
         {/if}
       </div>