Merge pull request #39 from oarepo/krist/be-377-bridge-workflows-to-o…

…arepo-requests

Payload from previous request not passed through autorequest

oarepo_requests/config.py

@@ -1,8 +1,13 @@
 from oarepo_requests.actions.components import (
     AutoAcceptComponent,
     RequestIdentityComponent,
-    WorkflowTransitionComponent,
 )
+try:
+    import oarepo_workflows # noqa
+    from oarepo_requests.actions.components import WorkflowTransitionComponent
+    workflow_action_components = [WorkflowTransitionComponent]
+except ImportError:
+    workflow_action_components = []
 from oarepo_requests.resolvers.ui import (
     FallbackEntityReferenceUIResolver,
     GroupEntityReferenceUIResolver,
@@ -18,7 +23,6 @@
     DeletePublishedRecordRequestType(),
     EditPublishedRecordRequestType(),
     PublishDraftRequestType(),
-    # StatusChangingPublishDraftRequestType(),
 ]
 
 REQUESTS_ALLOWED_RECEIVERS = ["user", "group", "auto_approve"]
@@ -33,24 +37,24 @@
 
 REQUESTS_ACTION_COMPONENTS = {
     "accepted": [
-        WorkflowTransitionComponent,
+        *workflow_action_components,
         RequestIdentityComponent,
     ],
     "submitted": [
+        *workflow_action_components,
         AutoAcceptComponent,
-        WorkflowTransitionComponent,
         RequestIdentityComponent,
     ],
     "declined": [
-        WorkflowTransitionComponent,
+        *workflow_action_components,
         RequestIdentityComponent,
     ],
     "cancelled": [
-        WorkflowTransitionComponent,
+        *workflow_action_components,
         RequestIdentityComponent,
     ],
     "expired": [
-        WorkflowTransitionComponent,
+        *workflow_action_components,
         RequestIdentityComponent,
     ],
 }

oarepo_requests/services/permissions/requester.py

@@ -22,8 +22,6 @@ def auto_request_state_change_notifier(
         )
         if auto_request_need in needs:
             data = kwargs["data"] if "data" in kwargs else {}
-            if "request" in kwargs and "payload" in kwargs["request"]:
-                data |= {"payload": kwargs["request"]["payload"]}
             creator_ref = ResolverRegistry.reference_identity(identity)
             request_item = current_oarepo_requests_service.create(
                 system_identity,

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-requests
-version = 2.0.0
+version = 2.0.1
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md