From ccb4392a67f75231a4b12770992d44119b7e58e2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 16 Oct 2020 12:55:20 +0100
Subject: [PATCH] Make detail column sticky and left orientated and fix crash
 with options inside grid

---
 packages/standard-components/components.json  |  2 +-
 .../src/DataGrid/Component.svelte             | 48 +++++++++++++------
 .../src/DataGrid/ViewDetails/Cell.svelte      | 19 +++++---
 .../src/DataGrid/customRenderer.js            | 22 +++++----
 4 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json
index 20929de9f4..d19b2ad85f 100644
--- a/packages/standard-components/components.json
+++ b/packages/standard-components/components.json
@@ -240,7 +240,7 @@
 			},
 			"height": {
 				"type": "number",
-				"default": "500"
+				"default": "540"
 			},
 			"pagination": {
 				"type": "bool",
diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index baaebf20aa..4d51da2b4d 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -81,19 +81,29 @@
           autoHeight: true,
         }
       })
-      columnDefs = [...columnDefs, {
-          headerName: 'Details',
-          field: '_id',
-          width: 25,
-          flex: 0,
-          editable: false,
-          sortable: false,
-          cellRenderer: getRenderer({
-            type: '_id',
-            options: detailUrl
-          }),
-          autoHeight: true,
-      }]
+
+      if (detailUrl) {
+        columnDefs = [
+          ...columnDefs,
+          {
+            headerName: "Detail",
+            field: "_id",
+            minWidth: 100,
+            width: 100,
+            flex: 0,
+            editable: false,
+            sortable: false,
+            cellRenderer: getRenderer({
+              type: "_id",
+              options: detailUrl,
+            }),
+            autoHeight: true,
+            pinned: "left",
+            filter: false,
+          },
+        ]
+      }
+
       dataLoaded = true
     }
   })
@@ -148,7 +158,7 @@
     href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" />
 </svelte:head>
 
-<div style="--grid-height: {height}px">
+<div class="container" style="--grid-height: {height}px">
   {#if dataLoaded}
     {#if canAddDelete}
       <div class="controls">
@@ -182,6 +192,16 @@
 </div>
 
 <style>
+  .container :global(.ag-pinned-left-header) {
+    border-right-color: #dde2eb !important;
+  }
+  .container :global(.ag-pinned-left-header .ag-header-cell-label) {
+    justify-content: center;
+  }
+  .container :global(.ag-cell-last-left-pinned) {
+    border-right-color: #dde2eb !important;
+  }
+
   .controls {
     margin-bottom: var(--spacing-s);
     display: grid;
diff --git a/packages/standard-components/src/DataGrid/ViewDetails/Cell.svelte b/packages/standard-components/src/DataGrid/ViewDetails/Cell.svelte
index 58cf2a5408..d17f7425a2 100644
--- a/packages/standard-components/src/DataGrid/ViewDetails/Cell.svelte
+++ b/packages/standard-components/src/DataGrid/ViewDetails/Cell.svelte
@@ -1,12 +1,17 @@
 <script>
-    import { Icon } from '@budibase/bbui'
-    export let url
+  import { createEventDispatcher } from "svelte"
+  import { Icon, Button } from "@budibase/bbui"
+  const dispatch = createEventDispatcher()
+
+  export let url
+  let link
 </script>
 
-<a href={url}><Icon name="view" /></a>
+<a href={url} bind:this={link} />
+<Button small secondary on:click={() => link.click()}>View</Button>
 
 <style>
-    a {
-        color: var(--grey-6)
-    }
-</style>
\ No newline at end of file
+  a {
+    display: none;
+  }
+</style>
diff --git a/packages/standard-components/src/DataGrid/customRenderer.js b/packages/standard-components/src/DataGrid/customRenderer.js
index aca4e7d39e..a399d1ae15 100644
--- a/packages/standard-components/src/DataGrid/customRenderer.js
+++ b/packages/standard-components/src/DataGrid/customRenderer.js
@@ -17,14 +17,18 @@ const renderers = new Map([
 
 export function getRenderer(schema, editable) {
   if (renderers.get(schema.type)) {
-    return renderers.get(schema.type)(schema.options, editable)
+    return renderers.get(schema.type)(
+      schema.options,
+      schema.constraints,
+      editable
+    )
   } else {
     return false
   }
 }
 
 /* eslint-disable no-unused-vars */
-function booleanRenderer(options, editable) {
+function booleanRenderer(options, constraints, editable) {
   return params => {
     const toggle = e => {
       params.value = !params.value
@@ -46,7 +50,7 @@ function booleanRenderer(options, editable) {
   }
 }
 /* eslint-disable no-unused-vars */
-function attachmentRenderer(options, editable) {
+function attachmentRenderer(options, constraints, editable) {
   return params => {
     const container = document.createElement("div")
 
@@ -68,7 +72,7 @@ function attachmentRenderer(options, editable) {
   }
 }
 /* eslint-disable no-unused-vars */
-function dateRenderer(options, editable) {
+function dateRenderer(options, constraints, editable) {
   return function(params) {
     const container = document.createElement("div")
     const toggle = e => {
@@ -88,7 +92,7 @@ function dateRenderer(options, editable) {
   }
 }
 
-function optionsRenderer({ inclusion }, editable) {
+function optionsRenderer(options, constraints, editable) {
   return params => {
     if (!editable) return params.value
     const container = document.createElement("div")
@@ -103,7 +107,7 @@ function optionsRenderer({ inclusion }, editable) {
       target: container,
       props: {
         value: params.value,
-        options: inclusion,
+        options: constraints.inclusion,
       },
     })
 
@@ -113,7 +117,7 @@ function optionsRenderer({ inclusion }, editable) {
   }
 }
 /* eslint-disable no-unused-vars */
-function linkedRowRenderer(options, editable) {
+function linkedRowRenderer(options, constraints, editable) {
   return params => {
     let container = document.createElement("div")
     container.style.display = "grid"
@@ -133,11 +137,11 @@ function linkedRowRenderer(options, editable) {
 }
 
 /* eslint-disable no-unused-vars */
-function viewDetailsRenderer(options) {
+function viewDetailsRenderer(options, constraints, editable) {
   return params => {
     let container = document.createElement("div")
     container.style.display = "grid"
-    container.style.placeItems = "center"
+    container.style.alignItems = "center"
     container.style.height = "100%"
 
     new ViewDetails({