revert feat

Author: MaxNumerique

src/opengeodeweb_back/geode_objects/geode_brep.py

@@ -88,9 +88,6 @@ def internals(self, id: og.uuid) -> list[og.ComponentID]:
     def items(self, id: og.uuid) -> list[og.ComponentID]:
         return self.brep.items(id)
 
-    def component_name(self, id: og.uuid) -> str:
-        return self.brep.brep_component(id).name() or ""
-
     def is_active(self, id: og.uuid) -> bool:
         return self.brep.brep_component(id).is_active()
 

src/opengeodeweb_back/geode_objects/geode_model.py

@@ -36,8 +36,5 @@ def internals(self, id: og.uuid) -> list[og.ComponentID]: ...
     @abstractmethod
     def items(self, id: og.uuid) -> list[og.ComponentID]: ...
 
-    @abstractmethod
-    def component_name(self, id: og.uuid) -> str: ...
-
     @abstractmethod
     def is_active(self, id: og.uuid) -> bool: ...

src/opengeodeweb_back/geode_objects/geode_section.py

@@ -90,9 +90,6 @@ def internals(self, id: og.uuid) -> list[og.ComponentID]:
     def items(self, id: og.uuid) -> list[og.ComponentID]:
         return self.section.items(id)
 
-    def component_name(self, id: og.uuid) -> str:
-        return self.section.section_component(id).name() or ""
-
     def is_active(self, id: og.uuid) -> bool:
         return self.section.section_component(id).is_active()
 

src/opengeodeweb_back/utils_functions.py

@@ -214,9 +214,7 @@ def model_components(
         component_type = mesh_component.get()
         for id in ids:
             geode_id = id.string()
-            component_name = model.component_name(id)
-            if not component_name:
-                component_name = geode_id
+            component_name = geode_id
             viewer_id = uuid_to_flat_index[geode_id]
             boundaries = model.boundaries(id)
             boundaries_uuid = [boundary.id().string() for boundary in boundaries]
@@ -225,7 +223,7 @@ def model_components(
             mesh_component_object = {
                 "viewer_id": viewer_id,
                 "geode_id": geode_id,
-                "name": component_name,
+                "name": geode_id,
                 "type": component_type,
                 "boundaries": boundaries_uuid,
                 "internals": internals_uuid,
@@ -239,14 +237,12 @@ def model_components(
         component_type = collection_component.get()
         for id in ids:
             geode_id = id.string()
-            component_name = model.component_name(id)
-            if not component_name:
-                component_name = geode_id
+            component_name = geode_id
             items = model.items(id)
             items_uuid = [item.id().string() for item in items]
             collection_component_object = {
                 "geode_id": geode_id,
-                "name": component_name,
+                "name": geode_id,
                 "type": component_type,
                 "items": items_uuid,
                 "is_active": model.is_active(id),

tests/test_routes.py

@@ -431,34 +431,26 @@ def get_full_data() -> test_utils.JsonData:
 
 def test_model_components(client: FlaskClient) -> None:
     geode_object_type = "BRep"
-    filename = "LS2.og_brep"
+    filename = "cube.og_brep"
     response = test_save_viewable_file(client, geode_object_type, filename)
     assert response.status_code == 200
     assert "mesh_components" in response.get_json()
     mesh_components = response.get_json()["mesh_components"]
     assert isinstance(mesh_components, list)
     assert len(mesh_components) > 0
-    name_is_uuid = False
-    name_is_not_uuid = False
     for mesh_component in mesh_components:
         assert isinstance(mesh_component, object)
         assert isinstance(mesh_component["geode_id"], str)
         assert isinstance(mesh_component["viewer_id"], int)
         assert isinstance(mesh_component["name"], str)
         assert isinstance(mesh_component["type"], str)
-        if mesh_component["name"] == mesh_component["geode_id"]:
-            name_is_uuid = True
-        else:
-            name_is_not_uuid = True
         assert isinstance(mesh_component["boundaries"], list)
         for boundary_uuid in mesh_component["boundaries"]:
             assert isinstance(boundary_uuid, str)
         assert isinstance(mesh_component["internals"], list)
         for internal_uuid in mesh_component["internals"]:
             assert isinstance(internal_uuid, str)
         assert isinstance(mesh_component["is_active"], bool)
-    assert name_is_uuid is True
-    assert name_is_not_uuid is True
     assert "collection_components" in response.get_json()
     collection_components = response.get_json()["collection_components"]
     assert isinstance(collection_components, list)