Two-column layout: org+instances left, services right (collapsible)

site/routes/main.py

@@ -1,7 +1,7 @@
 from flask import Blueprint, current_app, render_template, request, make_response, jsonify
 
 from api.http_client import HttpClient
-from operations.get_instances import get_organization
+from operations.get_instances import get_organization, get_instances
 from operations.get_services import get_services, get_service_detail
 
 bp = Blueprint("main", __name__)
@@ -42,6 +42,7 @@ def index():
         return resp
 
     services = []
+    instances = []
     if active_token:
         try:
             client = HttpClient(
@@ -49,8 +50,11 @@ def index():
                 active_token,
             )
             org = get_organization(client)
-            raw = get_services(client)
-            services = sorted(raw, key=lambda s: (s.get("svcId", 0), s.get("svc", "")))
+            raw_svc = get_services(client)
+            services = sorted(raw_svc, key=lambda s: (s.get("svcId", 0), s.get("svc", "")))
+            instances = get_instances(client)
+            # org first, then rest
+            instances.sort(key=lambda i: (0 if i.get("serviceId") == 19 else 1, i.get("displayName", "")))
         except Exception as e:
             error = str(e)
 
@@ -58,7 +62,8 @@ def index():
         organization=org, error=error,
         env_token_masked=_mask(env_token),
         has_user_token=bool(user_token),
-        services=services)
+        services=services,
+        instances=instances)
 
 
 @bp.route("/api/operations/<int:svc_id>")