✨ Allow to filter apps and sort both apps and teams (fastapilabs#246)

Author: patrick91

src/fastapi_cloud_cli/commands/apps/link.py

@@ -125,8 +125,9 @@ def _link_app_interactively(
             "Select the team:",
             options=[
                 Option({"name": t["name"], "value": {"id": t["id"], "name": t["name"]}})
-                for t in teams_data
+                for t in sorted(teams_data, key=lambda t: t["name"].lower())
             ],
+            allow_filtering=True,
             bullet=False,
         )
 
@@ -152,8 +153,9 @@ def _link_app_interactively(
         "Select the app to link:",
         options=[
             Option({"name": a["slug"], "value": {"id": a["id"], "slug": a["slug"]}})
-            for a in apps_data
+            for a in sorted(apps_data, key=lambda a: a["slug"].lower())
         ],
+        allow_filtering=True,
         bullet=False,
     )
 

src/fastapi_cloud_cli/commands/apps/list.py

@@ -170,7 +170,10 @@ def _prompt_for_team(toolkit: FastAPIRichToolkit, client: APIClient) -> Team:
 
     return toolkit.ask(
         "Select the team:",
-        options=[Option({"name": team.name, "value": team}) for team in teams],
+        options=[
+            Option({"name": team.name, "value": team})
+            for team in sorted(teams, key=lambda team: team.name.lower())
+        ],
         allow_filtering=True,
         bullet=False,
     )

src/fastapi_cloud_cli/commands/deploy/configure.py

@@ -35,7 +35,10 @@ def _configure_app(
 
     team = toolkit.ask(
         "Select the team you want to deploy to:",
-        options=[Option({"name": team.name, "value": team}) for team in teams],
+        options=[
+            Option({"name": team.name, "value": team})
+            for team in sorted(teams, key=lambda team: team.name.lower())
+        ],
         allow_filtering=True,
         emoji="🏢",
     )
@@ -66,7 +69,10 @@ def _configure_app(
 
         selected_app = toolkit.ask(
             "Select the app you want to deploy to:",
-            options=[Option({"name": app.slug, "value": app}) for app in apps],
+            options=[
+                Option({"name": app.slug, "value": app})
+                for app in sorted(apps, key=lambda app: app.slug.lower())
+            ],
             allow_filtering=True,
             emoji="📦",
         )

tests/test_cli_link.py

@@ -324,6 +324,81 @@ def test_shows_error_on_apps_api_failure(
     assert "Error fetching apps" in result.output
 
 
+@pytest.mark.respx
+def test_app_menu_is_ordered_by_slug(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    steps = [Keys.ENTER, Keys.ENTER]
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200, json={"data": [{"id": "team-1", "name": "My Team", "slug": "my-team"}]}
+        )
+    )
+    respx_mock.get("/apps/", params={"team_id": "team-1"}).mock(
+        return_value=Response(
+            200,
+            json={
+                "data": [
+                    {"id": "app-2", "slug": "zebra"},
+                    {"id": "app-1", "slug": "alpha"},
+                ]
+            },
+        )
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 0
+    assert "Successfully linked to app" in result.output
+    assert "alpha" in result.output
+
+    config_path = tmp_path / ".fastapicloud" / "cloud.json"
+    config = AppConfig.model_validate_json(config_path.read_text())
+    assert config.app_id == "app-1"
+
+
+@pytest.mark.respx
+def test_team_menu_is_ordered_by_name(
+    logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path
+) -> None:
+    steps = [Keys.ENTER, Keys.ENTER]
+
+    respx_mock.get("/teams/").mock(
+        return_value=Response(
+            200,
+            json={
+                "data": [
+                    {"id": "team-2", "name": "Zebra Team", "slug": "zebra-team"},
+                    {"id": "team-1", "name": "Alpha Team", "slug": "alpha-team"},
+                ]
+            },
+        )
+    )
+    respx_mock.get("/apps/", params={"team_id": "team-1"}).mock(
+        return_value=Response(200, json={"data": [{"id": "app-1", "slug": "my-app"}]})
+    )
+
+    with (
+        changing_dir(tmp_path),
+        patch("rich_toolkit.container.getchar") as mock_getchar,
+    ):
+        mock_getchar.side_effect = steps
+        result = runner.invoke(app, ["link"])
+
+    assert result.exit_code == 0
+    assert "Successfully linked to app" in result.output
+
+    config_path = tmp_path / ".fastapicloud" / "cloud.json"
+    config = AppConfig.model_validate_json(config_path.read_text())
+    assert config.team_id == "team-1"
+
+
 @pytest.mark.respx
 def test_links_with_multiple_teams_and_apps(
     logged_in_cli: None, respx_mock: respx.MockRouter, tmp_path: Path