From a02f4876704f13586c90cb6f250d92258ae2adc4 Mon Sep 17 00:00:00 2001
From: dblythy <daniel-blyth@live.com.au>
Date: Tue, 6 Sep 2022 12:53:58 +1000
Subject: [PATCH 1/2] feat: add autosort option to manage columns

---
 .../ColumnConfigurationItem.scss              |  1 -
 .../ColumnsConfiguration.react.js             | 21 +++++++++++++++++++
 .../ColumnsConfiguration.scss                 |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/components/ColumnsConfiguration/ColumnConfigurationItem.scss b/src/components/ColumnsConfiguration/ColumnConfigurationItem.scss
index 68400d4ae6..7622d2e88f 100644
--- a/src/components/ColumnsConfiguration/ColumnConfigurationItem.scss
+++ b/src/components/ColumnsConfiguration/ColumnConfigurationItem.scss
@@ -18,7 +18,6 @@
 }
 
 .columnConfigItemName {
-  width: 110px;
   text-overflow: ellipsis;
   overflow: hidden;
   line-height: 24px;
diff --git a/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js b/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js
index 5a1f7ad0d0..bacc12c2a5 100644
--- a/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js
+++ b/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js
@@ -54,6 +54,23 @@ export default class ColumnsConfiguration extends React.Component {
     this.props.handleColumnsOrder(this.props.order.map(order => ({ ...order, visible: false })));
   }
 
+  autoSort() {
+    const defaultOrder = ['objectId', 'email', 'username', 'password', 'createdAt', 'updatedAt','ACL', 'authData']
+    const order = {
+      default: [],
+      other: []
+    };
+    for (const column of this.props.order) {
+      const index = defaultOrder.indexOf(column.name);
+      if (index !== -1) {
+        order.default[index] = column;
+      } else {
+        order.other.push(column)
+      }
+    }
+    this.props.handleColumnsOrder([...order.default.filter(column => column), ...order.other.sort((a,b) => a.name.localeCompare(b.name))]);
+  }
+
   render() {
     const { handleColumnDragDrop, handleColumnsOrder, order, disabled } = this.props;
     let [ title, entry ] = [styles.title, styles.entry ].map(className => (
@@ -118,6 +135,10 @@ export default class ColumnsConfiguration extends React.Component {
                   color='white'
                   value='Show all'
                   onClick={this.showAll.bind(this)} />
+                <Button
+                  color='white'
+                  value='Autosort'
+                  onClick={this.autoSort.bind(this)} />
               </div>
             </div>
           </div>
diff --git a/src/components/ColumnsConfiguration/ColumnsConfiguration.scss b/src/components/ColumnsConfiguration/ColumnsConfiguration.scss
index eb3220140d..c22e03aa48 100644
--- a/src/components/ColumnsConfiguration/ColumnsConfiguration.scss
+++ b/src/components/ColumnsConfiguration/ColumnsConfiguration.scss
@@ -64,7 +64,7 @@
   right: 0;
   border-radius: 5px 0 5px 5px;
   background: #797691;
-  width: 220px;
+  width: 320px;
   font-size: 14px;
 
   .columnConfigContainer {

From 282f457fdaf2fc4bf748d96d1beb265ccb949ff1 Mon Sep 17 00:00:00 2001
From: dblythy <daniel-blyth@live.com.au>
Date: Wed, 7 Sep 2022 11:00:08 +1000
Subject: [PATCH 2/2] Update ColumnsConfiguration.react.js

---
 .../ColumnsConfiguration/ColumnsConfiguration.react.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js b/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js
index bacc12c2a5..fdc088bea0 100644
--- a/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js
+++ b/src/components/ColumnsConfiguration/ColumnsConfiguration.react.js
@@ -55,7 +55,7 @@ export default class ColumnsConfiguration extends React.Component {
   }
 
   autoSort() {
-    const defaultOrder = ['objectId', 'email', 'username', 'password', 'createdAt', 'updatedAt','ACL', 'authData']
+    const defaultOrder = ['objectId', 'createdAt', 'updatedAt', 'ACL']
     const order = {
       default: [],
       other: []