From 4e519d75b406e9300f034299864c9151ba0762f4 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 17 Nov 2022 14:18:55 +0000
Subject: [PATCH] Ensure side panel ejection works properly and tidy up table
 block structure

---
 packages/client/manifest.json                 |  4 +-
 .../src/components/app/SidePanel.svelte       |  4 +-
 .../components/app/blocks/TableBlock.svelte   | 80 ++++++++++---------
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index eae7cf4b55..806590f92a 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3667,7 +3667,7 @@
           "Ascending",
           "Descending"
         ],
-        "defaultValue": "Descending"
+        "defaultValue": "Ascending"
       },
       {
         "type": "number",
@@ -4578,7 +4578,7 @@
             "type": "boolean",
             "key": "showTitleButton",
             "label": "Show button above table",
-            "defaultValue": true
+            "defaultValue": false
           },
           {
             "type": "text",
diff --git a/packages/client/src/components/app/SidePanel.svelte b/packages/client/src/components/app/SidePanel.svelte
index 39579bdabb..ffe39a24e3 100644
--- a/packages/client/src/components/app/SidePanel.svelte
+++ b/packages/client/src/components/app/SidePanel.svelte
@@ -39,9 +39,7 @@
   hidden
   class="side-panel"
 >
-  {#if open}
-    <slot />
-  {/if}
+  <slot />
 </div>
 
 <style>
diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte
index f9a125637b..51d004b75c 100644
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@@ -184,7 +184,7 @@
         props={{
           dataSource,
           filter: enrichedFilter,
-          sortColumn: sortColumn || normalFields?.[0],
+          sortColumn,
           sortOrder,
           paginate,
           limit: rowCount,
@@ -206,45 +206,49 @@
           }}
         />
       </BlockComponent>
-      <BlockComponent
-        type="sidepanel"
-        bind:id={detailsSidePanelId}
-        context="details-side-panel"
-        order={2}
-      >
+      {#if clickBehaviour === "details"}
         <BlockComponent
-          type="formblock"
-          props={{
-            dataSource,
-            showSaveButton: true,
-            showDeleteButton: true,
-            actionType: "Update",
-            rowId: `{{ ${safe("state")}.${safe(stateKey)} }}`,
-            fields: normalFields,
-            title: "Row Details",
-            labelPosition: "left",
-          }}
-        />
-      </BlockComponent>
-      <BlockComponent
-        type="sidepanel"
-        bind:id={newRowSidePanelId}
-        context="new-side-panel"
-        order={3}
-      >
+          type="sidepanel"
+          bind:id={detailsSidePanelId}
+          context="details-side-panel"
+          order={2}
+        >
+          <BlockComponent
+            type="formblock"
+            props={{
+              dataSource,
+              showSaveButton: true,
+              showDeleteButton: true,
+              actionType: "Update",
+              rowId: `{{ ${safe("state")}.${safe(stateKey)} }}`,
+              fields: normalFields,
+              title: "Row Details",
+              labelPosition: "left",
+            }}
+          />
+        </BlockComponent>
+      {/if}
+      {#if showTitleButton && titleButtonClickBehaviour === "new"}
         <BlockComponent
-          type="formblock"
-          props={{
-            dataSource,
-            showSaveButton: true,
-            showDeleteButton: false,
-            actionType: "Create",
-            fields: normalFields,
-            title: "Create Row",
-            labelPosition: "left",
-          }}
-        />
-      </BlockComponent>
+          type="sidepanel"
+          bind:id={newRowSidePanelId}
+          context="new-side-panel"
+          order={3}
+        >
+          <BlockComponent
+            type="formblock"
+            props={{
+              dataSource,
+              showSaveButton: true,
+              showDeleteButton: false,
+              actionType: "Create",
+              fields: normalFields,
+              title: "Create Row",
+              labelPosition: "left",
+            }}
+          />
+        </BlockComponent>
+      {/if}
     </BlockComponent>
   </Block>
 {/if}