coomponents

oarepo · Jan 20, 2025 · 768ef95 · 768ef95
1 parent d22020a
commit 768ef95
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 35 deletions.
diff --git a/oarepo_model_builder_rdm/datatypes/components/__init__.py b/oarepo_model_builder_rdm/datatypes/components/__init__.py
@@ -3,13 +3,12 @@
 from .ext_resource import RDMExtResourceModelComponent
 from .draft_record import RDMDraftParentComponent
 from .marshmallow import RDMMarshmallowModelComponent
-from .published_service import RDMPublishedServiceComponent
+
 
 RDM_COMPONENTS = [
     RDMServiceComponent,
     RDMRecordModelComponent,
     RDMExtResourceModelComponent,
     RDMDraftParentComponent,
-    RDMMarshmallowModelComponent,
-    RDMPublishedServiceComponent
+    RDMMarshmallowModelComponent
 ]
diff --git a/oarepo_model_builder_rdm/datatypes/components/published_service.py b/oarepo_model_builder_rdm/datatypes/components/published_service.py
diff --git a/oarepo_model_builder_rdm/datatypes/components/service.py b/oarepo_model_builder_rdm/datatypes/components/service.py
@@ -8,14 +8,17 @@ class RDMServiceComponent(DataTypeComponent):
     depends_on = [ServiceModelComponent]
 
     def before_model_prepare(self, datatype, *, context, **kwargs):
+
         if not datatype.profile in ["record", "draft"]:
             return
+        components_to_remove = [
+            '{{oarepo_runtime.services.files.FilesComponent}}',
+            '{{invenio_drafts_resources.services.records.components.DraftFilesComponent}}'
+        ]
+        datatype.service_config["components"] = [
+            component for component in datatype.service_config["components"]
+            if component not in components_to_remove
+        ]
         datatype.definition["service"]["base-classes"] = ["invenio_rdm_records.services.services.RDMRecordService"]
         datatype.definition["service-config"]["base-classes"] = ["oarepo_runtime.services.config.service.PermissionsPresetsConfigMixin",
-                                                                 "invenio_rdm_records.services.config.RDMRecordServiceConfig"]
-        # service = set_default(datatype, "service", {})
-        # service.setdefault(
-        #     "base-classes",
-        #     ["invenio_rdm_records.services.services.RDMRecordService"],
-        # )
-        # print("jej")
+                                                                 "invenio_rdm_records.services.config.RDMRecordServiceConfig"]
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder-rdm
-version = 1.0.0
+version = 1.0.1
 description =
 authors = Alzbeta Pokorna <[email protected]>
 readme = README.md
@@ -31,11 +31,11 @@ oarepo_model_builder.datatypes.components =
     rdm = oarepo_model_builder_rdm.datatypes.components:RDM_COMPONENTS
 
 oarepo_model_builder.builders.base =
-    0997-invenio_rdm_record_metadata  = oarepo_model_builder_rdm.invenio.invenio_rdm_record_metadata:InvenioRDMRecordMetadataBuilder
+    9970-invenio_rdm_record_metadata  = oarepo_model_builder_rdm.invenio.invenio_rdm_record_metadata:InvenioRDMRecordMetadataBuilder
 oarepo_model_builder.builders.record =
-    0998-invenio_rdm_record  = oarepo_model_builder_rdm.invenio.invenio_rdm_record:InvenioRDMRecordBuilder
+    9980-invenio_rdm_record  = oarepo_model_builder_rdm.invenio.invenio_rdm_record:InvenioRDMRecordBuilder
 oarepo_model_builder.builders.draft:
-    0990-invenio_rdm_draft_record  = oarepo_model_builder_rdm.invenio.invenio_rdm_draft_record:InvenioRDMDraftRecordBuilder
+    9900-invenio_rdm_draft_record  = oarepo_model_builder_rdm.invenio.invenio_rdm_draft_record:InvenioRDMDraftRecordBuilder
 
 oarepo_model_builder.templates =
-    99-rdm_invenio_templates  = oarepo_model_builder_rdm.invenio
+    9900-rdm_invenio_templates  = oarepo_model_builder_rdm.invenio