Merge branch 'bug/server-order-on-creation' into 'dev'

Fix servers being out of order on creation page.

See merge request crafty-controller/crafty-4!407

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fix issue with API Server Instance is not serializable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/401))
 - Fix issue where the motd was not displayed properly on small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/402))
 - Fix log file path issues caused by using relative paths ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/406))
+- Fix servers order on creation page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/407))
 ### Tweaks
 - Remove server.props requirement ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/403))
 - Add platform & crafty version info to support logs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/405))

app/classes/web/panel_handler.py

@@ -36,8 +36,6 @@ class PanelHandler(BaseHandler):
         user_roles = {}
         for user_id in self.controller.users.get_all_user_ids():
             user_roles_list = self.controller.users.get_user_roles_names(user_id)
-            # user_servers =
-            # self.controller.servers.get_authorized_servers(user.user_id)
             user_roles[user_id] = user_roles_list
         return user_roles
 

app/classes/web/server_handler.py

@@ -62,12 +62,31 @@ class ServerHandler(BaseHandler):
                 exec_user_role.add(role["role_name"])
                 list_roles.append(self.controller.roles.get_role(role["role_id"]))
 
+        user_order = self.controller.users.get_user_by_id(exec_user["user_id"])
+        user_order = user_order["server_order"].split(",")
         page_servers = []
+        server_ids = []
+
+        for server_id in user_order[:]:
+            for server in defined_servers[:]:
+                if str(server.server_id) == str(server_id):
+                    page_servers.append(
+                        DatabaseShortcuts.get_data_obj(server.server_object)
+                    )
+                    user_order.remove(server_id)
+                    defined_servers.remove(server)
+
         for server in defined_servers:
+            server_ids.append(str(server.server_id))
             if server not in page_servers:
                 page_servers.append(
                     DatabaseShortcuts.get_data_obj(server.server_object)
                 )
+
+        for server_id in user_order[:]:
+            # remove IDs in list that user no longer has access to
+            if str(server_id) not in server_ids:
+                user_order.remove(server_id)
         defined_servers = page_servers
 
         template = "public/404.html"
@@ -92,7 +111,7 @@ class ServerHandler(BaseHandler):
                 ),
             },
             "hosts_data": self.controller.management.get_latest_hosts_stats(),
-            "menu_servers": defined_servers,
+            "menu_servers": page_servers,
             "show_contribute": self.helper.get_setting("show_contribute_link", True),
             "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
             "lang_page": Helpers.get_lang_page(