From 897a3177c35f0e0c02699dde68d9219cdc27b1fa Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Fri, 21 Aug 2020 17:55:02 +0200
Subject: [PATCH 01/11] optimized query input bar

---
 IHP/IDE/Data/View/EditRow.hs       | 2 +-
 IHP/IDE/Data/View/EditValue.hs     | 2 +-
 IHP/IDE/Data/View/Layout.hs        | 2 +-
 IHP/IDE/Data/View/NewRow.hs        | 2 +-
 IHP/IDE/Data/View/ShowDatabase.hs  | 2 +-
 IHP/IDE/Data/View/ShowQuery.hs     | 2 +-
 IHP/IDE/Data/View/ShowTableRows.hs | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index dac26ecf9..4bb627648 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -23,13 +23,13 @@ data EditRowView = EditRowView
 instance View EditRowView ViewContext where
     html EditRowView { .. } = [hsx|
         <div class="container pt-5">
-            {customQuery ""}
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
                     {renderRows rows tableBody tableName}
                 </div>
             </div>
+            {customQuery ""}
         </div>
         {Just modal}
     |]
diff --git a/IHP/IDE/Data/View/EditValue.hs b/IHP/IDE/Data/View/EditValue.hs
index 193338a4e..37146a88b 100644
--- a/IHP/IDE/Data/View/EditValue.hs
+++ b/IHP/IDE/Data/View/EditValue.hs
@@ -22,13 +22,13 @@ data EditValueView = EditValueView
 instance View EditValueView ViewContext where
     html EditValueView { .. } = [hsx|
         <div class="container pt-5">
-            {customQuery ""}
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
                     {renderRows rows tableBody tableName}
                 </div>
             </div>
+            {customQuery ""}
         </div>
         {script}
     |]
diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index a0081f5f4..c621fa368 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -6,7 +6,7 @@ import IHP.IDE.ToolServer.Types
 import IHP.IDE.ToolServer.Layout
 
 customQuery :: Text -> Html
-customQuery input = [hsx|<div class="p-2 rounded mb-2" style="background-color: #002B36;"><div id="queryInput">{input}</div></div>|]
+customQuery input = [hsx|<div class="p-2 rounded mt-2" style="background-color: #002B36;"><div id="queryInput" style="height:16px">{input}</div></div>|]
 
 tableHead :: [[DynamicField]] -> Text -> Html
 tableHead rows tableName = [hsx|<thead><tr>{forEach (columnNames rows) renderColumnHead}
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index 14ecafc68..c7637f44f 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -21,13 +21,13 @@ data NewRowView = NewRowView
 instance View NewRowView ViewContext where
     html NewRowView { .. } = [hsx|
         <div class="container pt-5">
-            {customQuery ""}
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
                     {renderRows rows tableBody tableName}
                 </div>
             </div>
+            {customQuery ""}
         </div>
         {Just modal}
     |]
diff --git a/IHP/IDE/Data/View/ShowDatabase.hs b/IHP/IDE/Data/View/ShowDatabase.hs
index 702691134..ece7e3bb4 100644
--- a/IHP/IDE/Data/View/ShowDatabase.hs
+++ b/IHP/IDE/Data/View/ShowDatabase.hs
@@ -15,10 +15,10 @@ data ShowDatabaseView = ShowDatabaseView {
 instance View ShowDatabaseView ViewContext where
     html ShowDatabaseView { .. } = [hsx|
         <div class="container pt-5">
-            {customQuery ""}
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames ""}
             </div>
+            {customQuery ""}
         </div>
     |]
 
diff --git a/IHP/IDE/Data/View/ShowQuery.hs b/IHP/IDE/Data/View/ShowQuery.hs
index a8015e6ef..5bb64992a 100644
--- a/IHP/IDE/Data/View/ShowQuery.hs
+++ b/IHP/IDE/Data/View/ShowQuery.hs
@@ -18,12 +18,12 @@ data ShowQueryView = ShowQueryView
 instance View ShowQueryView ViewContext where
     html ShowQueryView { .. } = [hsx|
         <div class="container pt-5">
-            {customQuery query}
             <div class="row no-gutters bg-white">
                 <div class="col" style="overflow: scroll; max-height: 80vh">
                     {renderRows}
                 </div>
             </div>
+            {customQuery query}
         </div>
     |]
         where
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index 1ef655fa5..5eaa23ceb 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -20,13 +20,13 @@ data ShowTableRowsView = ShowTableRowsView
 instance View ShowTableRowsView ViewContext where
     html ShowTableRowsView { .. } = [hsx|
         <div class="container pt-5">
-            {customQuery ""}
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
                     {renderRows rows tableBody tableName}
                 </div>
             </div>
+            {customQuery ""}
         </div>
     |]
         where

From 305e9ccfedcb2c3a0af9256cf073973375f56ba8 Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Fri, 21 Aug 2020 18:07:40 +0200
Subject: [PATCH 02/11] fieldValues are displayed without quotes

---
 IHP/IDE/Data/View/EditRow.hs       |  2 +-
 IHP/IDE/Data/View/EditValue.hs     |  2 +-
 IHP/IDE/Data/View/Layout.hs        | 10 +++++++---
 IHP/IDE/Data/View/NewRow.hs        |  2 +-
 IHP/IDE/Data/View/ShowQuery.hs     |  2 +-
 IHP/IDE/Data/View/ShowTableRows.hs |  2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index 4bb627648..027fdcbac 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -36,7 +36,7 @@ instance View EditRowView ViewContext where
         where
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
             renderRow fields = [hsx|<tr>{forEach fields renderField}</tr>|]
-            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{fieldValue}</span></td>|]
+            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{cleanValue fieldValue}</span></td>|]
 
 
             modalContent = [hsx|
diff --git a/IHP/IDE/Data/View/EditValue.hs b/IHP/IDE/Data/View/EditValue.hs
index 37146a88b..bd3aa07d2 100644
--- a/IHP/IDE/Data/View/EditValue.hs
+++ b/IHP/IDE/Data/View/EditValue.hs
@@ -55,7 +55,7 @@ instance View EditValueView ViewContext where
                     <input type="hidden" name="tableName" value={tableName}/>
                     <button type="submit" class="d-none">Edit</button>
                 </form></td>|]
-                else [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{fieldValue}</a></span></td>|]
+                else [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
             renderValue DynamicField { .. } = [hsx|<input type="hidden" name={fieldName} value={"'" <> fromMaybe "" fieldValue <> "'"}/>|]
             script = preEscapedToHtml [plain|
                 <script>
diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index c621fa368..a6c232496 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -1,4 +1,4 @@
-module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows) where
+module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows, cleanValue) where
 
 import IHP.ViewPrelude
 import IHP.IDE.SchemaDesigner.Types hiding (columnNames)
@@ -10,7 +10,7 @@ customQuery input = [hsx|<div class="p-2 rounded mt-2" style="background-color:
 
 tableHead :: [[DynamicField]] -> Text -> Html
 tableHead rows tableName = [hsx|<thead><tr>{forEach (columnNames rows) renderColumnHead}
-        <td><a href={NewRowAction tableName} class="btn btn-primary btn-sm">Add</a></td>
+        <td></td>
     </tr></thead>|]
 renderColumnHead name = [hsx|<th>{name}</th>|]
 
@@ -22,4 +22,8 @@ renderRows rows body tableName = [hsx|
         {tableHead rows tableName}
         {body}
     </table>
-|]
\ No newline at end of file
+|]
+
+cleanValue :: Maybe ByteString -> Text
+cleanValue (Just value) = cs value
+cleanValue Nothing = "NULL"
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index c7637f44f..6da4496b5 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -34,7 +34,7 @@ instance View NewRowView ViewContext where
         where
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
             renderRow fields = [hsx|<tr>{forEach fields renderField}</tr>|]
-            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{fieldValue}</span></td>|]
+            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{cleanValue fieldValue}</span></td>|]
 
             modalContent = [hsx|
                 <form method="POST" action={CreateRowAction}>
diff --git a/IHP/IDE/Data/View/ShowQuery.hs b/IHP/IDE/Data/View/ShowQuery.hs
index 5bb64992a..0c972bbcd 100644
--- a/IHP/IDE/Data/View/ShowQuery.hs
+++ b/IHP/IDE/Data/View/ShowQuery.hs
@@ -39,6 +39,6 @@ instance View ShowQueryView ViewContext where
 
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
             renderRow fields = [hsx|<tr>{forEach fields renderField}</tr>|]
-            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{fieldValue}</span></td>|]
+            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{cleanValue fieldValue}</span></td>|]
 
             columnNames = map (get #fieldName) (fromMaybe [] (head rows))
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index 5eaa23ceb..180a093ed 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -42,6 +42,6 @@ instance View ShowTableRowsView ViewContext where
                 where
                     contextMenuId = "context-menu-column-" <> tshow id
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
-            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{fieldValue}</a></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
 
             columnNames = map (get #fieldName) (fromMaybe [] (head rows))
\ No newline at end of file

From 75266ddaa010bd77deea71acb5ce18fe01527208 Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Sat, 22 Aug 2020 18:22:18 +0200
Subject: [PATCH 03/11] id beautify; boolean toggle (checkbox)

---
 IHP/IDE/Data/Controller.hs         | 14 ++++++++++++++
 IHP/IDE/Data/View/Layout.hs        |  6 ++++--
 IHP/IDE/Data/View/ShowTableRows.hs | 15 ++++++++++++++-
 IHP/IDE/ToolServer/Types.hs        |  1 +
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/IHP/IDE/Data/Controller.hs b/IHP/IDE/Data/Controller.hs
index 114b5d5a4..861ccd12a 100644
--- a/IHP/IDE/Data/Controller.hs
+++ b/IHP/IDE/Data/Controller.hs
@@ -30,6 +30,8 @@ instance Controller DataController where
 
         rows :: [[DynamicField]] <- PG.query connection "SELECT * FROM ? ORDER BY id" (PG.Only (PG.Identifier tableName))
 
+        tableCols <- fetchTableCols connection tableName
+
         PG.close connection
         render ShowTableRowsView { .. }
 
@@ -109,6 +111,18 @@ instance Controller DataController where
         let targetId = cs id
         PG.close connection
         render EditValueView { .. }
+
+    action ToggleBooleanFieldAction { tableName, targetName, id } = do
+        let id :: String = cs (param @Text "id")
+        let tableName = param "tableName"
+        connection <- connectToAppDb
+        tableNames <- fetchTableNames connection
+        tableCols <- fetchTableCols connection tableName
+        let query = "UPDATE " <> tableName <> " SET " <> targetName <> " = NOT " <> targetName <> " WHERE id = '" <> cs id <> "'"
+        putStrLn (query)
+        PG.execute_ connection (PG.Query . cs $! query)
+        PG.close connection
+        redirectTo ShowTableRowsAction { .. }
         
 
 connectToAppDb = do
diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index a6c232496..8d2425174 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -1,4 +1,4 @@
-module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows, cleanValue) where
+module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows, cleanValue, renderId) where
 
 import IHP.ViewPrelude
 import IHP.IDE.SchemaDesigner.Types hiding (columnNames)
@@ -26,4 +26,6 @@ renderRows rows body tableName = [hsx|
 
 cleanValue :: Maybe ByteString -> Text
 cleanValue (Just value) = cs value
-cleanValue Nothing = "NULL"
\ No newline at end of file
+cleanValue Nothing = "NULL"
+
+renderId id = take 4 (cs id) <> ".." <> reverse (take 4 (reverse (cs id)))
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index 180a093ed..996bb2c98 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -15,6 +15,7 @@ data ShowTableRowsView = ShowTableRowsView
     { tableNames :: [Text]
     , tableName :: Text
     , rows :: [[DynamicField]]
+    , tableCols :: [ColumnDefinition]
     }
 
 instance View ShowTableRowsView ViewContext where
@@ -42,6 +43,18 @@ instance View ShowTableRowsView ViewContext where
                 where
                     contextMenuId = "context-menu-column-" <> tshow id
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (cleanValue fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
+            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
             renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
 
-            columnNames = map (get #fieldName) (fromMaybe [] (head rows))
\ No newline at end of file
+            columnNames = map (get #fieldName) (fromMaybe [] (head rows))
+
+            
+            isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
+                Just columnDef -> if get #columnType columnDef == "boolean"
+                    then True
+                    else False
+                Nothing -> False
+
+            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
diff --git a/IHP/IDE/ToolServer/Types.hs b/IHP/IDE/ToolServer/Types.hs
index 9719e0ac8..354897e0e 100644
--- a/IHP/IDE/ToolServer/Types.hs
+++ b/IHP/IDE/ToolServer/Types.hs
@@ -82,6 +82,7 @@ data DataController
     | EditRowAction { tableName :: Text, id :: Text }
     | UpdateRowAction
     | EditRowValueAction { tableName :: Text, targetName :: Text, id :: Text }
+    | ToggleBooleanFieldAction { tableName :: Text, targetName :: Text, id :: Text }
     deriving (Eq, Show, Data)
 
 data LogsController

From e7f19b23218b7df4dfa11203f559af9e7fc80558 Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Sun, 23 Aug 2020 13:10:23 +0200
Subject: [PATCH 04/11] data explorer width optimization

---
 IHP/IDE/Data/View/EditRow.hs       | 2 +-
 IHP/IDE/Data/View/EditValue.hs     | 2 +-
 IHP/IDE/Data/View/NewRow.hs        | 2 +-
 IHP/IDE/Data/View/ShowDatabase.hs  | 2 +-
 IHP/IDE/Data/View/ShowQuery.hs     | 2 +-
 IHP/IDE/Data/View/ShowTableRows.hs | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index 027fdcbac..2a989936e 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -22,7 +22,7 @@ data EditRowView = EditRowView
 
 instance View EditRowView ViewContext where
     html EditRowView { .. } = [hsx|
-        <div class="container pt-5">
+        <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
diff --git a/IHP/IDE/Data/View/EditValue.hs b/IHP/IDE/Data/View/EditValue.hs
index bd3aa07d2..d093c21db 100644
--- a/IHP/IDE/Data/View/EditValue.hs
+++ b/IHP/IDE/Data/View/EditValue.hs
@@ -21,7 +21,7 @@ data EditValueView = EditValueView
 
 instance View EditValueView ViewContext where
     html EditValueView { .. } = [hsx|
-        <div class="container pt-5">
+        <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index 6da4496b5..acabce0b3 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -20,7 +20,7 @@ data NewRowView = NewRowView
 
 instance View NewRowView ViewContext where
     html NewRowView { .. } = [hsx|
-        <div class="container pt-5">
+        <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">
diff --git a/IHP/IDE/Data/View/ShowDatabase.hs b/IHP/IDE/Data/View/ShowDatabase.hs
index ece7e3bb4..eb0e142e2 100644
--- a/IHP/IDE/Data/View/ShowDatabase.hs
+++ b/IHP/IDE/Data/View/ShowDatabase.hs
@@ -14,7 +14,7 @@ data ShowDatabaseView = ShowDatabaseView {
 
 instance View ShowDatabaseView ViewContext where
     html ShowDatabaseView { .. } = [hsx|
-        <div class="container pt-5">
+        <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames ""}
             </div>
diff --git a/IHP/IDE/Data/View/ShowQuery.hs b/IHP/IDE/Data/View/ShowQuery.hs
index 0c972bbcd..34df55815 100644
--- a/IHP/IDE/Data/View/ShowQuery.hs
+++ b/IHP/IDE/Data/View/ShowQuery.hs
@@ -17,7 +17,7 @@ data ShowQueryView = ShowQueryView
 
 instance View ShowQueryView ViewContext where
     html ShowQueryView { .. } = [hsx|
-        <div class="container pt-5">
+        <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 <div class="col" style="overflow: scroll; max-height: 80vh">
                     {renderRows}
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index 996bb2c98..641abbaed 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -20,7 +20,7 @@ data ShowTableRowsView = ShowTableRowsView
 
 instance View ShowTableRowsView ViewContext where
     html ShowTableRowsView { .. } = [hsx|
-        <div class="container pt-5">
+        <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
                 <div class="col" style="overflow: scroll; max-height: 80vh">

From d96e5b600a24c5390f005aceaff410dc81832112 Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Sun, 23 Aug 2020 13:25:04 +0200
Subject: [PATCH 05/11] fixed context menus; added root cm; fixed all views

---
 IHP/IDE/Data/View/EditRow.hs       | 19 ++++++++++++++++---
 IHP/IDE/Data/View/NewRow.hs        | 19 ++++++++++++++++---
 IHP/IDE/Data/View/ShowTableRows.hs |  7 +++++--
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index 2a989936e..fac80df3e 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -35,8 +35,13 @@ instance View EditRowView ViewContext where
     |]
         where
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
-            renderRow fields = [hsx|<tr>{forEach fields renderField}</tr>|]
-            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{cleanValue fieldValue}</span></td>|]
+            renderRow fields = [hsx|<tr>{forEach fields (renderField id)}</tr>|]
+                where
+                    id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (cleanValue fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
+            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
 
 
             modalContent = [hsx|
@@ -66,4 +71,12 @@ instance View EditRowView ViewContext where
                             class="form-control"
                             value={"'" <> (fromMaybe "" (get #fieldValue (snd col))) <> "'"}
                             />
-                    </div>|]
\ No newline at end of file
+                    </div>|]
+
+            isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
+                Just columnDef -> if get #columnType columnDef == "boolean"
+                    then True
+                    else False
+                Nothing -> False
+
+            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index acabce0b3..ca7cf3481 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -33,8 +33,13 @@ instance View NewRowView ViewContext where
     |]
         where
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
-            renderRow fields = [hsx|<tr>{forEach fields renderField}</tr>|]
-            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{cleanValue fieldValue}</span></td>|]
+            renderRow fields = [hsx|<tr>{forEach fields (renderField id)}</tr>|]
+                where
+                    id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (cleanValue fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
+            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
 
             modalContent = [hsx|
                 <form method="POST" action={CreateRowAction}>
@@ -63,4 +68,12 @@ instance View NewRowView ViewContext where
                             class="form-control"
                             value={fromMaybe "''" (get #columnDefault col)}
                             />
-                    </div>|]
\ No newline at end of file
+                    </div>|]
+
+            isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
+                Just columnDef -> if get #columnType columnDef == "boolean"
+                    then True
+                    else False
+                Nothing -> False
+
+            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index 641abbaed..ed273c816 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -23,17 +23,20 @@ instance View ShowTableRowsView ViewContext where
         <div class="mx-2 pt-5">
             <div class="row no-gutters bg-white">
                 {renderTableSelector tableNames tableName}
-                <div class="col" style="overflow: scroll; max-height: 80vh">
+                <div class="col" style="overflow: scroll; max-height: 80vh" oncontextmenu="showContextMenu('context-menu-data-root')">
                     {renderRows rows tableBody tableName}
                 </div>
             </div>
             {customQuery ""}
         </div>
+        <div class="custom-menu menu-for-column shadow backdrop-blur" id="context-menu-data-root">
+            <a href={NewRowAction tableName}>Add Row</a>
+        </div>
     |]
         where
 
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
-            renderRow fields = [hsx|<tr oncontextmenu={"showContextMenu('" <> contextMenuId <> "');"}>{forEach fields (renderField id)}</tr>
+            renderRow fields = [hsx|<tr oncontextmenu={"showContextMenu('" <> contextMenuId <> "'); event.stopPropagation();"}>{forEach fields (renderField id)}</tr>
             <div class="custom-menu menu-for-column shadow backdrop-blur" id={contextMenuId}>
                 <a href={EditRowAction tableName id}>Edit Row</a>
                 <a href={DeleteEntryAction id tableName} class="js-delete">Delete Row</a>

From 5dd09174ead3885bba76a68a3530eb08d51a306c Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Sun, 23 Aug 2020 13:31:41 +0200
Subject: [PATCH 06/11] added cm notice; removed emtpy td in thead

---
 IHP/IDE/Data/View/Layout.hs       | 4 +---
 IHP/IDE/Data/View/ShowDatabase.hs | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index 8d2425174..d14d81609 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -9,9 +9,7 @@ customQuery :: Text -> Html
 customQuery input = [hsx|<div class="p-2 rounded mt-2" style="background-color: #002B36;"><div id="queryInput" style="height:16px">{input}</div></div>|]
 
 tableHead :: [[DynamicField]] -> Text -> Html
-tableHead rows tableName = [hsx|<thead><tr>{forEach (columnNames rows) renderColumnHead}
-        <td></td>
-    </tr></thead>|]
+tableHead rows tableName = [hsx|<thead><tr>{forEach (columnNames rows) renderColumnHead}</tr></thead>|]
 renderColumnHead name = [hsx|<th>{name}</th>|]
 
 columnNames rows = map (get #fieldName) (fromMaybe [] (head rows))
diff --git a/IHP/IDE/Data/View/ShowDatabase.hs b/IHP/IDE/Data/View/ShowDatabase.hs
index eb0e142e2..3e68b9ee4 100644
--- a/IHP/IDE/Data/View/ShowDatabase.hs
+++ b/IHP/IDE/Data/View/ShowDatabase.hs
@@ -29,6 +29,7 @@ renderTableSelector tableNames activeTableName = [hsx|
             <h5>Tables</h5>
         </div>
         {forEach tableNames renderTable}
+        <div class="text-muted context-menu-notice">Right click to open context menu</div>
     </div>
 |]
     where

From 40b1bc801b36c88cea7a7c3889a5f71d188286e1 Mon Sep 17 00:00:00 2001
From: Daniel <34544060+nezbite@users.noreply.github.com>
Date: Wed, 26 Aug 2020 13:36:33 +0200
Subject: [PATCH 07/11] Update IHP/IDE/Data/View/ShowTableRows.hs

Co-authored-by: Marc Scholten <marc@digitallyinduced.com>
---
 IHP/IDE/Data/View/ShowTableRows.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index ed273c816..cec9d5f34 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -55,9 +55,7 @@ instance View ShowTableRowsView ViewContext where
 
             
             isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
-                Just columnDef -> if get #columnType columnDef == "boolean"
-                    then True
-                    else False
+                Just columnDef -> get #columnType columnDef == "boolean"
                 Nothing -> False
 
-            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
+            onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"

From 26e40f0863ecf3b771003f64ba87ac38628703c3 Mon Sep 17 00:00:00 2001
From: Daniel <34544060+nezbite@users.noreply.github.com>
Date: Wed, 26 Aug 2020 13:41:07 +0200
Subject: [PATCH 08/11] Update IHP/IDE/Data/View/Layout.hs

Co-authored-by: Marc Scholten <marc@digitallyinduced.com>
---
 IHP/IDE/Data/View/Layout.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index d14d81609..488f0bb54 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -22,8 +22,8 @@ renderRows rows body tableName = [hsx|
     </table>
 |]
 
-cleanValue :: Maybe ByteString -> Text
+sqlValueToText :: Maybe ByteString -> Text
 cleanValue (Just value) = cs value
 cleanValue Nothing = "NULL"
 
-renderId id = take 4 (cs id) <> ".." <> reverse (take 4 (reverse (cs id)))
\ No newline at end of file
+renderId id = take 4 (cs id) <> ".." <> reverse (take 4 (reverse (cs id)))

From 614f3d968ec241ed8854bf203c518c6628e07aea Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Wed, 26 Aug 2020 13:51:03 +0200
Subject: [PATCH 09/11] fixed issues

---
 IHP/IDE/Data/View/EditRow.hs       | 14 ++++----------
 IHP/IDE/Data/View/EditValue.hs     |  2 +-
 IHP/IDE/Data/View/Layout.hs        | 10 +++++++---
 IHP/IDE/Data/View/NewRow.hs        | 14 ++++----------
 IHP/IDE/Data/View/ShowQuery.hs     |  2 +-
 IHP/IDE/Data/View/ShowTableRows.hs | 13 ++++---------
 6 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index fac80df3e..60265d1fe 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -38,10 +38,10 @@ instance View EditRowView ViewContext where
             renderRow fields = [hsx|<tr>{forEach fields (renderField id)}</tr>|]
                 where
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
-            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (cleanValue fieldValue)}</a></span></td>|]
-            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
-            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
-            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
 
 
             modalContent = [hsx|
@@ -73,10 +73,4 @@ instance View EditRowView ViewContext where
                             />
                     </div>|]
 
-            isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
-                Just columnDef -> if get #columnType columnDef == "boolean"
-                    then True
-                    else False
-                Nothing -> False
-
             onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/EditValue.hs b/IHP/IDE/Data/View/EditValue.hs
index d093c21db..eac280f4d 100644
--- a/IHP/IDE/Data/View/EditValue.hs
+++ b/IHP/IDE/Data/View/EditValue.hs
@@ -55,7 +55,7 @@ instance View EditValueView ViewContext where
                     <input type="hidden" name="tableName" value={tableName}/>
                     <button type="submit" class="d-none">Edit</button>
                 </form></td>|]
-                else [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
+                else [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
             renderValue DynamicField { .. } = [hsx|<input type="hidden" name={fieldName} value={"'" <> fromMaybe "" fieldValue <> "'"}/>|]
             script = preEscapedToHtml [plain|
                 <script>
diff --git a/IHP/IDE/Data/View/Layout.hs b/IHP/IDE/Data/View/Layout.hs
index 488f0bb54..b81e011a9 100644
--- a/IHP/IDE/Data/View/Layout.hs
+++ b/IHP/IDE/Data/View/Layout.hs
@@ -1,4 +1,4 @@
-module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows, cleanValue, renderId) where
+module IHP.IDE.Data.View.Layout (customQuery, tableHead, renderColumnHead, columnNames, renderRows, sqlValueToText, renderId, isBoolField) where
 
 import IHP.ViewPrelude
 import IHP.IDE.SchemaDesigner.Types hiding (columnNames)
@@ -23,7 +23,11 @@ renderRows rows body tableName = [hsx|
 |]
 
 sqlValueToText :: Maybe ByteString -> Text
-cleanValue (Just value) = cs value
-cleanValue Nothing = "NULL"
+sqlValueToText (Just value) = cs value
+sqlValueToText Nothing = "NULL"
 
 renderId id = take 4 (cs id) <> ".." <> reverse (take 4 (reverse (cs id)))
+
+isBoolField fieldName tableCols = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
+    Just columnDef -> (get #columnType columnDef) == "boolean"
+    Nothing -> False
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index ca7cf3481..28ca83f49 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -36,10 +36,10 @@ instance View NewRowView ViewContext where
             renderRow fields = [hsx|<tr>{forEach fields (renderField id)}</tr>|]
                 where
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
-            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (cleanValue fieldValue)}</a></span></td>|]
-            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
-            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
-            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
 
             modalContent = [hsx|
                 <form method="POST" action={CreateRowAction}>
@@ -70,10 +70,4 @@ instance View NewRowView ViewContext where
                             />
                     </div>|]
 
-            isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
-                Just columnDef -> if get #columnType columnDef == "boolean"
-                    then True
-                    else False
-                Nothing -> False
-
             onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/ShowQuery.hs b/IHP/IDE/Data/View/ShowQuery.hs
index 34df55815..9289bd14a 100644
--- a/IHP/IDE/Data/View/ShowQuery.hs
+++ b/IHP/IDE/Data/View/ShowQuery.hs
@@ -39,6 +39,6 @@ instance View ShowQueryView ViewContext where
 
             tableBody = [hsx|<tbody>{forEach rows renderRow}</tbody>|]
             renderRow fields = [hsx|<tr>{forEach fields renderField}</tr>|]
-            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{cleanValue fieldValue}</span></td>|]
+            renderField DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}>{sqlValueToText fieldValue}</span></td>|]
 
             columnNames = map (get #fieldName) (fromMaybe [] (head rows))
\ No newline at end of file
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index cec9d5f34..d84123b80 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -46,16 +46,11 @@ instance View ShowTableRowsView ViewContext where
                 where
                     contextMenuId = "context-menu-column-" <> tshow id
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
-            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (cleanValue fieldValue)}</a></span></td>|]
-            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
-            renderField id DynamicField { .. } | isBoolField (fieldName) && not (isNothing fieldValue) && cleanValue fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
-            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{cleanValue fieldValue}</a></span></td>|]
+            renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
 
             columnNames = map (get #fieldName) (fromMaybe [] (head rows))
 
-            
-            isBoolField fieldName = case (find (\c -> get #columnName c == (cs fieldName)) tableCols) of
-                Just columnDef -> get #columnType columnDef == "boolean"
-                Nothing -> False
-
             onClick tableName fieldName id = "window.location.assign(" <> tshow (pathTo (ToggleBooleanFieldAction tableName (cs fieldName) id)) <> ")"

From 0ed77731c6bf2b7f5843027c5d5c87cdadb7c2bc Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Thu, 27 Aug 2020 11:03:33 +0200
Subject: [PATCH 10/11] less quirky patternmatch

---
 IHP/IDE/Data/View/EditRow.hs       | 3 +--
 IHP/IDE/Data/View/NewRow.hs        | 3 +--
 IHP/IDE/Data/View/ShowTableRows.hs | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/IHP/IDE/Data/View/EditRow.hs b/IHP/IDE/Data/View/EditRow.hs
index 60265d1fe..c2c9e56c0 100644
--- a/IHP/IDE/Data/View/EditRow.hs
+++ b/IHP/IDE/Data/View/EditRow.hs
@@ -39,8 +39,7 @@ instance View EditRowView ViewContext where
                 where
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
             renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
-            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
-            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked={sqlValueToText fieldValue == "t"} /></span></td>|]
             renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
 
 
diff --git a/IHP/IDE/Data/View/NewRow.hs b/IHP/IDE/Data/View/NewRow.hs
index 28ca83f49..a225c448e 100644
--- a/IHP/IDE/Data/View/NewRow.hs
+++ b/IHP/IDE/Data/View/NewRow.hs
@@ -37,8 +37,7 @@ instance View NewRowView ViewContext where
                 where
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
             renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
-            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
-            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked={sqlValueToText fieldValue == "t"} /></span></td>|]
             renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
 
             modalContent = [hsx|
diff --git a/IHP/IDE/Data/View/ShowTableRows.hs b/IHP/IDE/Data/View/ShowTableRows.hs
index d84123b80..036fccbc7 100644
--- a/IHP/IDE/Data/View/ShowTableRows.hs
+++ b/IHP/IDE/Data/View/ShowTableRows.hs
@@ -47,8 +47,7 @@ instance View ShowTableRowsView ViewContext where
                     contextMenuId = "context-menu-column-" <> tshow id
                     id = (cs (fromMaybe "" (get #fieldValue (fromJust (headMay fields)))))
             renderField id DynamicField { .. } | fieldName == "id" = [hsx|<td><span data-fieldname={fieldName}><a class="no-link border rounded p-1" href={EditRowValueAction tableName (cs fieldName) id}>{renderId (sqlValueToText fieldValue)}</a></span></td>|]
-            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "t" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked="checked" /></span></td>|]
-            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) && sqlValueToText fieldValue == "f" = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id}/></span></td>|]
+            renderField id DynamicField { .. } | isBoolField fieldName tableCols && not (isNothing fieldValue) = [hsx|<td><span data-fieldname={fieldName}><input type="checkbox" onclick={onClick tableName fieldName id} checked={sqlValueToText fieldValue == "t"} /></span></td>|]
             renderField id DynamicField { .. } = [hsx|<td><span data-fieldname={fieldName}><a class="no-link" href={EditRowValueAction tableName (cs fieldName) id}>{sqlValueToText fieldValue}</a></span></td>|]
 
             columnNames = map (get #fieldName) (fromMaybe [] (head rows))

From bbd264bf3962c7850be70749690e6bcafcaf4387 Mon Sep 17 00:00:00 2001
From: nezbite <daniel@digitallyinduced.com>
Date: Sat, 29 Aug 2020 18:01:54 +0200
Subject: [PATCH 11/11] changed query_ to query; removed debug prints

---
 IHP/IDE/Data/Controller.hs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/IHP/IDE/Data/Controller.hs b/IHP/IDE/Data/Controller.hs
index 861ccd12a..1a503f088 100644
--- a/IHP/IDE/Data/Controller.hs
+++ b/IHP/IDE/Data/Controller.hs
@@ -72,7 +72,6 @@ instance Controller DataController where
         tableCols <- fetchTableCols connection tableName
         let values :: [Text] = map (\col -> param @Text (cs (get #columnName col))) tableCols
         let query = "INSERT INTO " <> tableName <> " VALUES (" <> intercalate "," values <> ")"
-        putStrLn (query)
         PG.execute_ connection (PG.Query . cs $! query)
         PG.close connection
         redirectTo ShowTableRowsAction { .. }
@@ -118,9 +117,9 @@ instance Controller DataController where
         connection <- connectToAppDb
         tableNames <- fetchTableNames connection
         tableCols <- fetchTableCols connection tableName
-        let query = "UPDATE " <> tableName <> " SET " <> targetName <> " = NOT " <> targetName <> " WHERE id = '" <> cs id <> "'"
-        putStrLn (query)
-        PG.execute_ connection (PG.Query . cs $! query)
+        let query = PG.Query ("UPDATE ? SET ? = NOT ? WHERE id = ?")
+        let params = (PG.Identifier tableName, PG.Identifier targetName, PG.Identifier targetName, id)
+        PG.execute connection query params
         PG.close connection
         redirectTo ShowTableRowsAction { .. }