Incorrect position while adding a new service when there were pre-existing services (#1820)

3 files changed, 8 insertions, 5 deletions

diff --git a/src/config.ts b/src/config.ts
index 005dd3601..0647b8f52 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -181,3 +181,5 @@ export const DEFAULT_IS_FEATURE_ENABLED_BY_USER = true;
 export const TODOS_PARTITION_ID = 'persist:todos';
 
 export const CUSTOM_WEBSITE_RECIPE_ID = 'franz-custom-website';
+
+export const DEFAULT_SERVICE_ORDER = 99; // something high enough that it gets added to the end of the already-added services on the left sidebar
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index c76a287f7..312306abf 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -5,7 +5,7 @@ const Env = use('Env');
 const uuid = require('uuid/v4');
 const path = require('path');
 const fs = require('fs-extra');
-const { LOCAL_HOSTNAME } = require('../../../../config');
+const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config');
 
 const hostname = LOCAL_HOSTNAME;
 const port = Env.get('PORT');
@@ -54,7 +54,7 @@ class ServiceController {
         isMuted: false,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         spellcheckerLanguage: '',
-        order: 1,
+        order: DEFAULT_SERVICE_ORDER,
         customRecipe: false,
         hasCustomIcon: false,
         workspaces: [],
@@ -83,7 +83,7 @@ class ServiceController {
         isEnabled: true,
         isMuted: false,
         isNotificationEnabled: true,
-        order: 1,
+        order: DEFAULT_SERVICE_ORDER,
         spellcheckerLanguage: '',
         workspaces: [],
         ...JSON.parse(service.settings),
@@ -257,7 +257,7 @@ class ServiceController {
         isEnabled: true,
         isMuted: false,
         isNotificationEnabled: true,
-        order: 1,
+        order: DEFAULT_SERVICE_ORDER,
         spellcheckerLanguage: '',
         workspaces: [],
         ...JSON.parse(service.settings),
diff --git a/src/models/Service.js b/src/models/Service.js
index fe56e5a76..c2b081864 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -7,6 +7,7 @@ import { join } from 'path';
 import { todosStore } from '../features/todos';
 import { isValidExternalURL } from '../helpers/url-helpers';
 import UserAgent from './UserAgent';
+import { DEFAULT_SERVICE_ORDER } from '../config';
 
 const debug = require('debug')('Ferdi:Service');
 
@@ -31,7 +32,7 @@ export default class Service {
 
   @observable unreadIndirectMessageCount = 0;
 
-  @observable order = 99;
+  @observable order = DEFAULT_SERVICE_ORDER;
 
   @observable isEnabled = true;