flows: remove receivers

Author: kpsherva

cds/modules/deposit/api.py

@@ -56,14 +56,15 @@
                                        ObjectVersion, ObjectVersionTag,
                                        as_bucket, as_object_version)
 
+from ..flows.api import Flow
 from ..records.api import (CDSFileObject, CDSFilesIterator, CDSRecord,
                            CDSVideosFilesIterator)
 from ..records.minters import doi_minter, is_local_doi, report_number_minter
 from ..records.resolver import record_resolver
 from ..records.tasks import create_symlinks
 from ..records.utils import lowercase_value
 from ..records.validators import PartialDraft4Validator
-from ..webhooks.status import (get_deposit_flows, get_tasks_status_by_task,
+from ..flows.status import (get_deposit_flows, get_tasks_status_by_task,
                                merge_tasks_status)
 from .errors import DiscardConflict
 from .resolver import get_video_pid
@@ -931,9 +932,9 @@ def edit(self, pid=None):
 
     def _clean_tasks(self):
         """Clean all tasks."""
-        events = get_deposit_flows(deposit_id=self['_deposit']['id'])
-        for event in events:
-            event.receiver.delete(event=event)
+        flows = get_deposit_flows(deposit_id=self['_deposit']['id'])
+        for flow in flows:
+            Flow(model=flow).delete()
 
     @mark_as_action
     def delete(self, force=True, pid=None):

cds/modules/deposit/static/js/cds_deposit/avc/avc.module.js

@@ -102,9 +102,9 @@ function cdsDepositsConfig(
     iiif: '/api/iiif/v2/<%=deposit%>:<%=version_id%>:<%=key%>/full/!<%=res%>/0/default.png',
     categories: '/api/categories',
     video: '/deposit/<%=deposit%>/preview/video/<%=key%>',
-    eventInfo: '/hooks/receivers/avc/flows/<%=eventId%>',
-    restartEvent: '/hooks/receivers/avc/flows/<%=eventId%>/tasks/<%=taskId%>',
-    taskFeedback: '/hooks/receivers/avc/flows/<%=eventId%>/feedback',
+    eventInfo: '/flows/<%=eventId%>',
+    restartEvent: '/flows/<%=eventId%>/tasks/<%=taskId%>',
+    taskFeedback: '/flows/<%=eventId%>/feedback',
     selfVideo: '/api/deposits/video/<%=deposit%>',
     bucketVideo: '/api/files/<%=bucket%>',
     actionVideo: '/api/deposits/video/<%=deposit%>/actions/<%=action%>',

cds/modules/deposit/static/js/cds_deposit/avc/components/cdsDeposit.js

@@ -365,7 +365,7 @@ function cdsDepositCtrl(
                 return task.info;
               }).map(function(task) {
                 var payload = task.info.payload;
-                if (payload.percentage === 100 || task.status === 'SUCCESS') {
+                if (task.status === 'SUCCESS') {
                   payload.completed = true;
                 } else if (task.status === 'FAILURE') {
                   payload.errored = true;

cds/modules/deposit/static/templates/cds_deposit/deposits.html

@@ -100,8 +100,8 @@ <h3>Click here to select videos to upload</h3>
                   dropbox-enabled="true"
                   dropbox-selector=".dropbox-upload"
                   dropbox-app-key="{{ $ctrl.dropboxAppKey }}"
-                  remote-master-receiver="/api/hooks/receivers/avc/flows/"
-                  remote-children-receiver="/api/hooks/receivers/downloader/flows/"
+                  remote-master-receiver="/api/flows/"
+                  remote-children-receiver="/api/flows/"
               >
                 <div class="dropbox-upload"></div>
               </cds-remote-uploader>
@@ -138,15 +138,15 @@ <h3>Click here to select videos to upload</h3>
                     auto-start-upload="true"
                     files="child._files"
                     template="/static/templates/cds_deposit/types/video/uploader.html"
-                    remote-master-receiver="/api/hooks/receivers/avc/flows/"
+                    remote-master-receiver="/api/flows/"
                   >
                     <cds-remote-uploader
                         template="/static/templates/cds_deposit/remote_upload.html"
                         dropbox-enabled="true"
                         dropbox-selector=".dropbox-upload"
                         dropbox-app-key="{{ $ctrl.dropboxAppKey }}"
-                        remote-master-receiver="/api/hooks/receivers/avc/flows/"
-                        remote-children-receiver="/api/hooks/receivers/downloader/flows/"
+                        remote-master-receiver="/api/flows/"
+                        remote-children-receiver="/api/flows/"
                     >
                       <div class="dropbox-upload"></div>
                     </cds-remote-uploader>

cds/modules/deposit/static/templates/cds_deposit/types/video/uploader.html

@@ -68,7 +68,7 @@
         <span ng-show="!f.percentage && !f.completed && !f.errored && !f.revoked"><i class="fa fa-spinner fa-spin"></i></span>
         <span ng-show="f.errored" class="text-danger">Error</span>
         <span ng-show="f.completed && !f.errored" class="text-success">Done</span>
-        <span ng-show="f.revoked && !f.errored" class="text-warning">Not needed</span>
+        <span ng-show="f.revoked && !f.errored" class="text-warning">Not applicable</span>
       </td>
       <td ng-show="f" class="text-center">
         <span ng-show="f.errored || $ctrl.cdsDepositCtrl.cdsDepositsCtrl.showAdminInterface">

cds/modules/flows/__init__.py

@@ -23,12 +23,12 @@
 
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
-"""Invenio-Flow is a module for managing sinple backend workflows."""
+"""Module for managing simple backend workflows."""
 
-from __future__ import absolute_import, print_function
-
-from .api import Flow
-from .decorators import task
+# from __future__ import absolute_import, print_function
 
+# from .api import Flow
+# from .decorators import task
+#
 
-__all__ = ('Flow', 'task')
+# __all__ = ('Flow', 'task')

cds/modules/webhooks/_compat.py renamed to cds/modules/flows/_compat.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2018 CERN.
+# Copyright (C) 2021 CERN.
 #
 # Invenio is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public License as