jrrribeiro commited on
Commit
8e2681b
·
1 Parent(s): 457d89f

fix(ui): reorder tabs and correct admin projects table rendering

Browse files

- Move Admin tab to 2nd position and Project Selector to 3rd
- Render projects table as row values instead of dict objects
- Ensure refresh/create flows update table and project dropdown consistently

Files changed (1) hide show
  1. src/ui/app_factory.py +78 -63
src/ui/app_factory.py CHANGED
@@ -1257,6 +1257,21 @@ def create_app() -> gr.Blocks:
1257
  session_state = gr.State(value=None)
1258
  selected_project_state = gr.State(value=None)
1259
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1260
  with gr.Tabs():
1261
  # ===== TAB 1: Login =====
1262
  with gr.Tab("🔐 Login", id="login_tab"):
@@ -1277,62 +1292,7 @@ def create_app() -> gr.Blocks:
1277
  outputs=[session_state],
1278
  )
1279
 
1280
- # ===== TAB 2: Project Selection =====
1281
- with gr.Tab("📁 Selecionar Projeto", id="project_tab"):
1282
- project_info_display = gr.Markdown(
1283
- value="⚠️ Faça login primeiro na aba **Login**"
1284
- )
1285
- project_selector = gr.Dropdown(
1286
- choices=[],
1287
- label="Projeto Autorizado",
1288
- interactive=False,
1289
- )
1290
-
1291
- def update_project_selector(session):
1292
- """Update project dropdown when user logs in."""
1293
- if session is None:
1294
- return (
1295
- gr.Dropdown(choices=[], value=None, interactive=False),
1296
- "❌ Not logged in. Please login first.",
1297
- None,
1298
- )
1299
-
1300
- projects = session.authorized_projects
1301
- if not projects:
1302
- return (
1303
- gr.Dropdown(choices=[], value=None, interactive=False),
1304
- "⚠️ **No Projects Assigned**\n\nYou don't have access to any projects yet. Contact an administrator.",
1305
- None,
1306
- )
1307
-
1308
- selected = projects[0]
1309
- role = auth_service.get_user_role_for_project(session.username, selected)
1310
- role_label = role.value.upper() if role else "UNKNOWN"
1311
- return (
1312
- gr.Dropdown(choices=projects, value=selected, interactive=True),
1313
- f"📁 **Project:** {selected} | **Your Role:** {role_label}",
1314
- selected,
1315
- )
1316
-
1317
- session_state.change(
1318
- fn=update_project_selector,
1319
- inputs=[session_state],
1320
- outputs=[project_selector, project_info_display, selected_project_state],
1321
- )
1322
-
1323
- def update_selected_project(selected: str, session):
1324
- """Update state when project is selected."""
1325
- if session and selected:
1326
- return selected
1327
- return None
1328
-
1329
- project_selector.change(
1330
- fn=update_selected_project,
1331
- inputs=[project_selector, session_state],
1332
- outputs=[selected_project_state],
1333
- )
1334
-
1335
- # ===== TAB 3: Admin Panel =====
1336
  with gr.Tab("⚙️ Admin", id="admin_tab"):
1337
  admin_info = gr.Markdown(value="⚠️ Faça login primeiro")
1338
 
@@ -1393,19 +1353,19 @@ def create_app() -> gr.Blocks:
1393
  if not created:
1394
  return (
1395
  f"⚠️ Projeto '{slug}' já existe.",
1396
- admin_manager.list_projects(),
1397
- gr.update(choices=[p["project_slug"] for p in admin_manager.list_projects()]),
1398
  )
1399
 
1400
  return (
1401
  f"✅ Projeto '{slug}' criado com sucesso.",
1402
- admin_manager.list_projects(),
1403
- gr.update(choices=[p["project_slug"] for p in admin_manager.list_projects()], value=slug),
1404
  )
1405
 
1406
  create_project_btn = gr.Button("➕ Criar Projeto", variant="primary")
1407
  projects_table = gr.Dataframe(
1408
- value=admin_manager.list_projects(),
1409
  headers=["project_slug", "name", "dataset_repo_id", "active"],
1410
  interactive=False,
1411
  )
@@ -1414,7 +1374,7 @@ def create_app() -> gr.Blocks:
1414
  def refresh_projects(session):
1415
  if session is None or session.role.value != "admin":
1416
  return []
1417
- return admin_manager.list_projects()
1418
 
1419
  refresh_projects_btn.click(
1420
  fn=refresh_projects,
@@ -1429,7 +1389,7 @@ def create_app() -> gr.Blocks:
1429
  label="Usuário", placeholder="validator_001"
1430
  )
1431
  admin_project = gr.Dropdown(
1432
- choices=[p["project_slug"] for p in admin_manager.list_projects()],
1433
  label="Projeto",
1434
  )
1435
  admin_role = gr.Dropdown(
@@ -1473,6 +1433,61 @@ def create_app() -> gr.Blocks:
1473
  outputs=[admin_users_controls],
1474
  )
1475
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1476
  # ===== TAB 4: Validation =====
1477
  with gr.Tab("✓ Validação", id="validation_tab"):
1478
  validation_status = gr.Markdown(
 
1257
  session_state = gr.State(value=None)
1258
  selected_project_state = gr.State(value=None)
1259
 
1260
+ def _project_rows() -> list[list[object]]:
1261
+ projects = admin_manager.list_projects()
1262
+ return [
1263
+ [
1264
+ p["project_slug"],
1265
+ p["name"],
1266
+ p["dataset_repo_id"],
1267
+ "yes" if bool(p["active"]) else "no",
1268
+ ]
1269
+ for p in projects
1270
+ ]
1271
+
1272
+ def _project_slugs() -> list[str]:
1273
+ return [p["project_slug"] for p in admin_manager.list_projects()]
1274
+
1275
  with gr.Tabs():
1276
  # ===== TAB 1: Login =====
1277
  with gr.Tab("🔐 Login", id="login_tab"):
 
1292
  outputs=[session_state],
1293
  )
1294
 
1295
+ # ===== TAB 2: Admin Panel =====
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1296
  with gr.Tab("⚙️ Admin", id="admin_tab"):
1297
  admin_info = gr.Markdown(value="⚠️ Faça login primeiro")
1298
 
 
1353
  if not created:
1354
  return (
1355
  f"⚠️ Projeto '{slug}' já existe.",
1356
+ _project_rows(),
1357
+ gr.update(choices=_project_slugs()),
1358
  )
1359
 
1360
  return (
1361
  f"✅ Projeto '{slug}' criado com sucesso.",
1362
+ _project_rows(),
1363
+ gr.update(choices=_project_slugs(), value=slug),
1364
  )
1365
 
1366
  create_project_btn = gr.Button("➕ Criar Projeto", variant="primary")
1367
  projects_table = gr.Dataframe(
1368
+ value=_project_rows(),
1369
  headers=["project_slug", "name", "dataset_repo_id", "active"],
1370
  interactive=False,
1371
  )
 
1374
  def refresh_projects(session):
1375
  if session is None or session.role.value != "admin":
1376
  return []
1377
+ return _project_rows()
1378
 
1379
  refresh_projects_btn.click(
1380
  fn=refresh_projects,
 
1389
  label="Usuário", placeholder="validator_001"
1390
  )
1391
  admin_project = gr.Dropdown(
1392
+ choices=_project_slugs(),
1393
  label="Projeto",
1394
  )
1395
  admin_role = gr.Dropdown(
 
1433
  outputs=[admin_users_controls],
1434
  )
1435
 
1436
+ # ===== TAB 3: Project Selection =====
1437
+ with gr.Tab("📁 Selecionar Projeto", id="project_tab"):
1438
+ project_info_display = gr.Markdown(
1439
+ value="⚠️ Faça login primeiro na aba **Login**"
1440
+ )
1441
+ project_selector = gr.Dropdown(
1442
+ choices=[],
1443
+ label="Projeto Autorizado",
1444
+ interactive=False,
1445
+ )
1446
+
1447
+ def update_project_selector(session):
1448
+ """Update project dropdown when user logs in."""
1449
+ if session is None:
1450
+ return (
1451
+ gr.Dropdown(choices=[], value=None, interactive=False),
1452
+ "❌ Not logged in. Please login first.",
1453
+ None,
1454
+ )
1455
+
1456
+ projects = session.authorized_projects
1457
+ if not projects:
1458
+ return (
1459
+ gr.Dropdown(choices=[], value=None, interactive=False),
1460
+ "⚠️ **No Projects Assigned**\n\nYou don't have access to any projects yet. Contact an administrator.",
1461
+ None,
1462
+ )
1463
+
1464
+ selected = projects[0]
1465
+ role = auth_service.get_user_role_for_project(session.username, selected)
1466
+ role_label = role.value.upper() if role else "UNKNOWN"
1467
+ return (
1468
+ gr.Dropdown(choices=projects, value=selected, interactive=True),
1469
+ f"📁 **Project:** {selected} | **Your Role:** {role_label}",
1470
+ selected,
1471
+ )
1472
+
1473
+ session_state.change(
1474
+ fn=update_project_selector,
1475
+ inputs=[session_state],
1476
+ outputs=[project_selector, project_info_display, selected_project_state],
1477
+ )
1478
+
1479
+ def update_selected_project(selected: str, session):
1480
+ """Update state when project is selected."""
1481
+ if session and selected:
1482
+ return selected
1483
+ return None
1484
+
1485
+ project_selector.change(
1486
+ fn=update_selected_project,
1487
+ inputs=[project_selector, session_state],
1488
+ outputs=[selected_project_state],
1489
+ )
1490
+
1491
  # ===== TAB 4: Validation =====
1492
  with gr.Tab("✓ Validação", id="validation_tab"):
1493
  validation_status = gr.Markdown(