Group instances by service type, collapsible lists
This commit is contained in:
+10
-5
@@ -57,9 +57,16 @@ def index():
|
||||
raw_inst = get_instances(client)
|
||||
instances = [i for i in raw_inst
|
||||
if i.get("explainedStatus") not in ("deleted", "not created")
|
||||
and i.get("serviceId") not in (109, 110, 111)] # DNS — не показываем
|
||||
# org first, then rest
|
||||
and i.get("serviceId") not in (109, 110, 111)]
|
||||
instances.sort(key=lambda i: (0 if i.get("serviceId") == 19 else 1, i.get("displayName", "")))
|
||||
|
||||
# group non-org instances by service type
|
||||
instance_groups = {}
|
||||
for i in instances:
|
||||
if i.get("serviceId") == 19:
|
||||
continue
|
||||
svc_name = i.get("svc", "Прочее")
|
||||
instance_groups.setdefault(svc_name, []).append(i)
|
||||
config = load_config()
|
||||
except Exception as e:
|
||||
error = str(e)
|
||||
@@ -68,9 +75,7 @@ def index():
|
||||
organization=org, error=error,
|
||||
env_token_masked=_mask(env_token),
|
||||
has_user_token=bool(user_token),
|
||||
services=services,
|
||||
instances=instances,
|
||||
config=config)
|
||||
instance_groups=instance_groups)
|
||||
|
||||
|
||||
@bp.route("/api/operations/<int:svc_id>")
|
||||
|
||||
Reference in New Issue
Block a user