Add redirection at determination stages

opentech/apply/funds/serializers.py

@@ -3,6 +3,7 @@ from rest_framework import serializers
 from django_bleach.templatetags.bleach_tags import bleach_value
 
 from opentech.apply.activity.models import Activity
+from opentech.apply.determinations.views import DeterminationCreateOrUpdateView
 from opentech.apply.review.options import RECOMMENDATION_CHOICES
 from .models import ApplicationSubmission, RoundsAndLabs
 
@@ -12,10 +13,29 @@ markdown = mistune.Markdown()
 class ActionSerializer(serializers.Field):
     def to_representation(self, instance):
         actions = instance.get_actions_for_user(self.context['request'].user)
-        return [
-            {'value': transition, 'display': action}
-            for transition, action in actions
-        ]
+        representation = []
+        for transition, action in actions:
+            action_dict = {
+                'value': transition,
+                'display': action
+            }
+
+            # Sometimes the status does not exist in the
+            # determination matrix.
+            redirect = None
+            try:
+                redirect = DeterminationCreateOrUpdateView.should_redirect(
+                    self.context['request'], instance, transition)
+            except KeyError:
+                pass
+            if redirect:
+                action_dict['type'] = 'redirect'
+                action_dict['target'] = redirect.url
+            else:
+                action_dict['type'] = 'submit'
+
+            representation.append(action_dict)
+        return representation
 
 
 class ReviewSummarySerializer(serializers.Field):

opentech/static_src/src/app/src/containers/StatusActions.js

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import { executeSubmissionAction } from '@actions/submissions';
 import Modal from '@components/Modal';
 import { getSubmissionOfID } from '@selectors/submissions';
+import { redirect } from '@utils';
 
 class StatusActions extends React.Component {
     static propTypes = {
@@ -40,7 +41,21 @@ class StatusActions extends React.Component {
     }
 
     handleStatusChange = () => {
-        this.props.changeStatus(this.state.statusSelectValue).then(this.closeStatusModal());
+        const { changeStatus, submission } = this.props
+        const { statusSelectValue } = this.state
+        const actionObject = submission.actions.find(
+            v => v.value === statusSelectValue
+        )
+
+        switch (actionObject.type) {
+            case 'redirect':
+                return redirect(actionObject.target)
+            case 'submit':
+                return changeStatus(statusSelectValue)
+                        .then(() => this.closeStatusModal())
+            default:
+                throw "Invalid action type"
+        }
     }
 
     renderModal = () => {

opentech/static_src/src/app/src/utils.js

+export function redirect(url) {
+    window.location.href = url;
+}

opentech/static_src/src/app/webpack.base.config.js

@@ -72,7 +72,6 @@ module.exports = (webpackEnv) => {
                 }
             ]
         },
-
         resolve: {
             modules: ['node_modules', './src'],
             extensions: ['.js', '.jsx'],
@@ -85,6 +84,7 @@ module.exports = (webpackEnv) => {
                 '@actions': path.resolve(__dirname, 'src/redux/actions'),
                 '@middleware': path.resolve(__dirname, 'src/redux/middleware'),
                 '@api': path.resolve(__dirname, 'src/api'),
+                '@utils': path.resolve(__dirname, 'src/utils'),
             }
         }
     }