From cafb50bce6d0099e134ec1c86e16ae8aa0da7ccc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 Feb 2021 16:22:25 +0000
Subject: [PATCH] Fixing some UI stuff after discussing with Andrew K - making
 sure auto-columns always appear at end of table.

---
 .../components/backend/DataTable/Table.svelte |  5 +--
 .../DataTable/TableHeader/TableHeader.svelte  | 32 ++++++++++++++-----
 .../buttons/HideAutocolumnButton.svelte       |  4 +--
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 825ed6af7b..959f343546 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -100,6 +100,7 @@
         },
         headerName: value.displayFieldName || key,
         field: key,
+        autocolumn: !!value.autocolumn,
         sortable: true,
         cellRenderer: getRenderer({
           schema: schema[key],
@@ -114,8 +115,8 @@
         minWidth: 200,
       })
     }
-
-    columnDefs = result
+    // sort auto-columns to the end if they are present
+    columnDefs = result.filter(col => !col.autocolumn).concat(result.filter(col => col.autocolumn))
   }
 
   function selectRelationship(row, fieldName) {
diff --git a/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte b/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte
index f6ef036f40..49d342dd71 100644
--- a/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte
@@ -59,8 +59,13 @@
   on:mouseover={() => (hovered = true)}
   on:mouseleave={() => (hovered = false)}>
   <div>
-    <span class="column-header-name">{displayName}</span>
-    <i class={`${SORT_ICON_MAP[sortDirection]} sort-icon`} />
+    <div class="col-icon">
+      {#if field.autocolumn}
+        <i class="auto ri-magic-fill"></i>
+      {/if}
+      <span class="column-header-name">{displayName}</span>
+    </div>
+    <i class={`${SORT_ICON_MAP[sortDirection]} sort-icon icon`} />
   </div>
   <Modal bind:this={modal}>
     <ModalContent
@@ -73,11 +78,11 @@
   <section class:show={hovered || filterActive}>
     {#if editable && hovered}
       <span on:click|stopPropagation={showModal}>
-        <i class="ri-pencil-line" />
+        <i class="ri-pencil-line icon" />
       </span>
     {/if}
     <span on:click|stopPropagation={toggleMenu} bind:this={menuButton}>
-      <i class="ri-filter-line" class:active={filterActive} />
+      <i class="ri-filter-line icon" class:active={filterActive} />
     </span>
   </section>
 </header>
@@ -117,18 +122,29 @@
     top: 2px;
   }
 
-  i {
+  .icon {
     transition: 0.2s all;
     font-size: var(--font-size-m);
     font-weight: 500;
   }
 
-  i:hover {
+  .col-icon {
+    display: flex;
+  }
+
+  .auto {
+    font-size: var(--font-size-xs);
+    transition: none;
+    margin-right: 6px;
+    margin-top: 2px;
+  }
+
+  .icon:hover {
     color: var(--blue);
   }
 
-  i.active,
-  i:hover {
+  .icon.active,
+  .icon:hover {
     color: var(--blue);
   }
 </style>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
index 79fbb15b54..9c114ae436 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
@@ -14,10 +14,10 @@
 <div bind:this={anchor}>
   <TextButton text small on:click={hideOrUnhide}>
     {#if hideAutocolumns}
-      <i class="ri-magic-fill"></i>
+      <i class="ri-magic-line"></i>
       Show Auto Columns
     {:else}
-      <i class="ri-magic-line"></i>
+      <i class="ri-magic-fill"></i>
       Hide Auto Columns
     {/if}
   </TextButton>