fix: align catalog remove with visible entries

Author: Adr1an04

src/specify_cli/integrations/catalog.py

@@ -604,16 +604,26 @@ def remove_catalog(self, index: int) -> str:
         # only to mirror the order shown by ``catalog list``; entries
         # that ``_load_catalog_config`` would have rejected outright
         # would have failed ``catalog list`` already.
+        def _is_removable_catalog_entry(item: Any) -> bool:
+            if not isinstance(item, dict):
+                return False
+            raw_url = item.get("url")
+            return isinstance(raw_url, str) and bool(raw_url.strip())
+
         priority_pairs: List[Tuple[int, int]] = []
         for yaml_idx, item in enumerate(catalogs):
-            if isinstance(item, dict):
-                try:
-                    priority = int(item.get("priority", yaml_idx + 1))
-                except (TypeError, ValueError):
-                    priority = yaml_idx + 1
-            else:
+            if not _is_removable_catalog_entry(item):
+                continue
+
+            try:
+                priority = int(item.get("priority", yaml_idx + 1))
+            except (TypeError, ValueError):
                 priority = yaml_idx + 1
             priority_pairs.append((priority, yaml_idx))
+        if not priority_pairs:
+            raise IntegrationValidationError(
+                "Catalog config contains no removable catalog entries."
+            )
         # Stable sort: ties keep their YAML order, matching list-view ordering.
         priority_pairs.sort(key=lambda p: p[0])
         display_order: List[int] = [yaml_idx for _, yaml_idx in priority_pairs]
@@ -626,7 +636,7 @@ def remove_catalog(self, index: int) -> str:
         target_yaml_idx = display_order[index]
         removed = catalogs.pop(target_yaml_idx)
 
-        if catalogs:
+        if any(_is_removable_catalog_entry(item) for item in catalogs):
             data["catalogs"] = catalogs
             with open(config_path, "w", encoding="utf-8") as f:
                 yaml.dump(

tests/integrations/test_integration_catalog.py

@@ -1082,6 +1082,85 @@ def test_remove_catalog_display_order_with_missing_priorities(
         data = yaml.safe_load(cfg_path.read_text(encoding="utf-8"))
         assert [c["name"] for c in data["catalogs"]] == ["two", "three"]
 
+    def test_remove_catalog_display_order_skips_blank_url_entries(
+        self, tmp_path, monkeypatch
+    ):
+        """Blank-url entries are not shown by catalog list, so remove skips them too."""
+        self._isolate(tmp_path, monkeypatch)
+        cfg_path = tmp_path / ".specify" / "integration-catalogs.yml"
+        cfg_path.parent.mkdir(parents=True, exist_ok=True)
+        cfg_path.write_text(
+            yaml.dump(
+                {
+                    "catalogs": [
+                        {"url": "   ", "name": "blank", "priority": 0},
+                        {"url": "https://one.example.com/c.json", "name": "one"},
+                        {"url": "https://two.example.com/c.json", "name": "two"},
+                    ]
+                }
+            ),
+            encoding="utf-8",
+        )
+        cat = IntegrationCatalog(tmp_path)
+
+        removed = cat.remove_catalog(0)
+        assert removed == "one"
+
+        data = yaml.safe_load(cfg_path.read_text(encoding="utf-8"))
+        assert [c["name"] for c in data["catalogs"]] == ["blank", "two"]
+
+    def test_remove_catalog_deletes_file_when_only_skipped_entries_remain(
+        self, tmp_path, monkeypatch
+    ):
+        self._isolate(tmp_path, monkeypatch)
+        cfg_path = tmp_path / ".specify" / "integration-catalogs.yml"
+        cfg_path.parent.mkdir(parents=True, exist_ok=True)
+        cfg_path.write_text(
+            yaml.dump(
+                {
+                    "catalogs": [
+                        {"url": "   ", "name": "blank", "priority": 0},
+                        {"url": "https://one.example.com/c.json", "name": "one"},
+                    ]
+                }
+            ),
+            encoding="utf-8",
+        )
+        cat = IntegrationCatalog(tmp_path)
+
+        removed = cat.remove_catalog(0)
+        assert removed == "one"
+        assert not cfg_path.exists()
+
+        active = cat.get_active_catalogs()
+        assert [e.name for e in active] == ["default", "community"]
+
+    def test_remove_catalog_errors_when_no_entries_are_removable(
+        self, tmp_path, monkeypatch
+    ):
+        self._isolate(tmp_path, monkeypatch)
+        cfg_path = tmp_path / ".specify" / "integration-catalogs.yml"
+        cfg_path.parent.mkdir(parents=True, exist_ok=True)
+        cfg_path.write_text(
+            yaml.dump(
+                {
+                    "catalogs": [
+                        {"url": "", "name": "empty"},
+                        {"name": "missing"},
+                        "not-a-mapping",
+                    ]
+                }
+            ),
+            encoding="utf-8",
+        )
+        cat = IntegrationCatalog(tmp_path)
+
+        with pytest.raises(
+            IntegrationValidationError,
+            match="no removable catalog entries",
+        ):
+            cat.remove_catalog(0)
+
     def test_remove_catalog_display_order_mixes_explicit_and_default(
         self, tmp_path, monkeypatch
     ):