Preparation for custom sorting

client/src/components/Apps/AppTable/AppTable.module.css

@@ -9,4 +9,21 @@
 
 .TableAction:hover {
   cursor: pointer;
+}
+
+.Message {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: baseline;
+  color: var(--color-primary);
+  margin-bottom: 20px;
+}
+
+.Message span {
+  color: var(--color-accent);
+}
+
+.Message span:hover {
+  cursor: pointer;
 }

client/src/components/Apps/Apps.tsx

@@ -44,6 +44,7 @@ const Apps = (props: ComponentProps): JSX.Element => {
     url: 'string',
     icon: 'string',
     isPinned: false,
+    orderId: 0,
     id: 0,
     createdAt: new Date(),
     updatedAt: new Date()

client/src/interfaces/App.ts

@@ -5,6 +5,7 @@ export interface App extends Model {
   url: string;
   icon: string;
   isPinned: boolean;
+  orderId: number;
 }
 
 export interface NewApp {

client/src/interfaces/Forms.ts

@@ -10,4 +10,5 @@ export interface SettingsForm {
   pinAppsByDefault: number;
   pinCategoriesByDefault: number;
   hideHeader: number;
+  useOrdering: string;
 }

client/src/utility/searchConfig.ts

@@ -18,7 +18,7 @@ export const searchConfig = (key: string, _default: any) => {
     } else {
       return pair.value;
     }
-  } else {
-    return _default;
   }
+  
+  return _default;
 }

controllers/apps.js

@@ -36,13 +36,24 @@ exports.createApp = asyncWrapper(async (req, res, next) => {
 // @route     GET /api/apps
 // @access    Public
 exports.getApps = asyncWrapper(async (req, res, next) => {
-  // const apps = await App.findAll({
-  //   order: [[ Sequelize.fn('lower', Sequelize.col('name')), 'ASC' ]]
-  // });
-  const apps = await App.findAll({
-    order: [[ 'orderId', 'ASC' ]]
+  // Get config from database
+  const useOrdering = await Config.findOne({
+    where: { key: 'useOrdering' }
   });
 
+  const orderType = useOrdering ? useOrdering.value : 'createdAt';
+  let apps;
+
+  if (orderType == 'name') {
+    apps = await App.findAll({
+      order: [[ Sequelize.fn('lower', Sequelize.col('name')), 'ASC' ]]
+    });
+  } else {
+    apps = await App.findAll({
+      order: [[ orderType, 'ASC' ]]
+    });
+  }
+
   res.status(200).json({
     success: true,
     data: apps

utils/initialConfig.json

@@ -31,6 +31,10 @@
     {
       "key": "hideHeader",
       "value": false
+    },
+    {
+      "key": "useOrdering",
+      "value": "createdAt"
     }
   ]
 }