Improve code quality

river_admin/views/approval_hook_view.py

@@ -2,10 +2,10 @@
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.status import HTTP_200_OK, HTTP_400_BAD_REQUEST
-from river.models import OnApprovedHook, TransitionApprovalMeta, TransitionApproval
+from river.models import OnApprovedHook
 
-from river_admin.views import post, delete, get
-from river_admin.views.serializers import ApprovalHookDto, CreateApprovalHookDto
+from river_admin.views import post, delete
+from river_admin.views.serializers import CreateApprovalHookDto
 
 
 @post(r'^approval-hook/create/$')

river_admin/views/serializers.py

@@ -1,7 +1,8 @@
 from django.contrib.auth.models import Permission, Group, User
 from django.contrib.contenttypes.models import ContentType
 from rest_framework import serializers
-from river.models import Function, OnApprovedHook, State, TransitionApprovalMeta, OnTransitHook, TransitionMeta, Transition, Workflow, TransitionApproval, DONE, CANCELLED
+from river.models import Function, OnApprovedHook, State, TransitionApprovalMeta, \
+    OnTransitHook, TransitionMeta, Transition, Workflow, TransitionApproval, DONE, CANCELLED
 
 from river.models.hook import AFTER, BEFORE
 

river_admin/views/transition_approval_meta_view.py

@@ -62,4 +62,10 @@ def re_prioritize_it(request):
 @get(r'^transition-approval-meta/approval-hook/list/(?P<transition_approval_meta_id>\w+)/$')
 def list_approval_hooks(request, transition_approval_meta_id):
     transition_approval_meta = get_object_or_404(TransitionApprovalMeta.objects.all(), pk=transition_approval_meta_id)
-    return Response(ApprovalHookDto(transition_approval_meta.on_approved_hooks.filter(transition_approval__isnull=True, object_id__isnull=True), many=True).data, status=HTTP_200_OK)
+    return Response(
+        ApprovalHookDto(
+            transition_approval_meta.on_approved_hooks.filter(transition_approval__isnull=True, object_id__isnull=True),
+            many=True
+        ).data,
+        status=HTTP_200_OK
+    )

river_admin/views/transition_approval_view.py

@@ -1,5 +1,4 @@
 from rest_framework.generics import get_object_or_404
-from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.status import HTTP_200_OK
 from river.models import TransitionApproval, Transition
@@ -23,4 +22,10 @@ def get_by_transition(request, transition_id):
 @get(r'^transition-approval/approval-hook/list/(?P<transition_approval_id>\w+)/$')
 def list_approval_hooks(request, transition_approval_id):
     transition_approval = get_object_or_404(TransitionApproval.objects.all(), pk=transition_approval_id)
-    return Response(ApprovalHookDto(transition_approval.meta.on_approved_hooks.filter(Q(object_id__isnull=True) | Q(object_id=transition_approval.object_id)), many=True).data, status=HTTP_200_OK)
+    return Response(
+        ApprovalHookDto(
+            transition_approval.meta.on_approved_hooks.filter(Q(object_id__isnull=True) | Q(object_id=transition_approval.object_id)),
+            many=True
+        ).data,
+        status=HTTP_200_OK
+    )

river_admin/views/transition_meta_view.py

@@ -1,7 +1,7 @@
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.status import HTTP_200_OK, HTTP_400_BAD_REQUEST
-from river.models import TransitionMeta, Workflow
+from river.models import TransitionMeta
 
 from river_admin.views import get, post
 from river_admin.views.serializers import TransitionMetaDto, CreateTransitionMetaDto, TransitionHookDto, TransitionApprovalMetaDto
@@ -32,10 +32,22 @@ def create_it(request):
 def list_transition_approval_meta(request, transition_meta_id):
     transition_meta = get_object_or_404(TransitionMeta.objects.all(), pk=transition_meta_id)
 
-    return Response(TransitionApprovalMetaDto(transition_meta.transition_approval_meta.all().order_by("transition_meta", "priority"), many=True).data, status=HTTP_200_OK)
+    return Response(
+        TransitionApprovalMetaDto(
+            transition_meta.transition_approval_meta.all().order_by("transition_meta", "priority"),
+            many=True
+        ).data,
+        status=HTTP_200_OK
+    )
 
 
 @get(r'^transition-meta/transition-hook/list/(?P<transition_meta_id>\w+)/$')
 def list_transition_hooks(request, transition_meta_id):
     transition_meta = get_object_or_404(TransitionMeta.objects.all(), pk=transition_meta_id)
-    return Response(TransitionHookDto(transition_meta.on_transit_hooks.filter(transition__isnull=True, object_id__isnull=True), many=True).data, status=HTTP_200_OK)
+    return Response(
+        TransitionHookDto(
+            transition_meta.on_transit_hooks.filter(transition__isnull=True, object_id__isnull=True),
+            many=True
+        ).data,
+        status=HTTP_200_OK
+    )

river_admin/views/transition_view.py

@@ -24,4 +24,10 @@ def list_transition_approvals(request, transition_id):
 @get(r'^transition/transition-hook/list/(?P<transition_id>\w+)/$')
 def list_transition_hooks(request, transition_id):
     transition = get_object_or_404(Transition.objects.all(), pk=transition_id)
-    return Response(TransitionHookDto(transition.meta.on_transit_hooks.filter(Q(object_id__isnull=True) | Q(object_id=transition.object_id)), many=True).data, status=HTTP_200_OK)
+    return Response(
+        TransitionHookDto(
+            transition.meta.on_transit_hooks.filter(Q(object_id__isnull=True) | Q(object_id=transition.object_id)),
+            many=True
+        ).data,
+        status=HTTP_200_OK
+    )

river_admin/views/workflow_object_view.py

@@ -33,7 +33,13 @@ def get_current_iteration(request, workflow_pk, object_id):
     workflow_object = get_object_or_404(model_class.objects.all(), pk=object_id)
 
     current_state = getattr(workflow_object, workflow.field_name)
-    iterations = workflow.transitions.filter(workflow=workflow, object_id=workflow_object.pk, destination_state=current_state, status=DONE).values_list("iteration", flat=True)
+    iterations = workflow.transitions.filter(
+        workflow=workflow,
+        object_id=workflow_object.pk,
+        destination_state=current_state,
+        status=DONE
+    ).values_list("iteration", flat=True)
+
     last_iteration = max(iterations) + 1 if iterations else 0
     return Response(last_iteration, status=status.HTTP_200_OK)
 

river_admin/views/workflow_view.py

@@ -7,7 +7,8 @@
 
 import river_admin
 from river_admin.views import get, post, delete, StateDto
-from river_admin.views.serializers import WorkflowStateFieldDto, CreateWorkflowDto, WorkflowDto, TransitionMetaDto, TransitionApprovalMetaDto, TransitionDto, TransitionApprovalDto, WorkflowMetadataDto
+from river_admin.views.serializers import WorkflowStateFieldDto, CreateWorkflowDto, WorkflowDto, \
+    TransitionMetaDto, TransitionDto, WorkflowMetadataDto
 
 
 @get(r'^workflow/get/(?P<pk>\w+)/$')

ui/src/helpers/http.js

@@ -9,7 +9,7 @@ class Http {
     _request(options, callback) {
         return axios(options).then(callback).catch(error => {
             if (error.response) {
-                if (error.response.status == 401 || error.response.status == 403) {
+                if (error.response.status === 401 || error.response.status === 403) {
                     emit_logout()
                 } else {
                     this.handle_error(error.response)
@@ -36,8 +36,7 @@ class Http {
     }
 
     handle_error(error) {
-        var that = this;
-        if (error.status == 400) {
+        if (error.status === 400) {
             error.data.forEach(err => {
                 switch (err.error_code) {
                     case CAN_NOT_DELETE_DUE_TO_PROTECTION:

ui/src/helpers/python-hint.js

@@ -30,7 +30,8 @@ export default function initializePythonHints(recognized_functions) {
         function arrayContains(arr, item) {
             if (!Array.prototype.indexOf) {
                 var i = arr.length;
-                while (i--) {
+                while (i) {
+                    i--;
                     if (arr[i] === item) {
                         return true;
                     }
@@ -43,7 +44,7 @@ export default function initializePythonHints(recognized_functions) {
         function getCompletions(token, context) {
             var found = [], start = token.string;
             function maybeAdd(str) {
-                if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+                if (str.indexOf(start) === 0 && !arrayContains(found, str)) found.push(str);
             }
 
             function gatherCompletions(_obj) {
@@ -88,7 +89,7 @@ export default function initializePythonHints(recognized_functions) {
             var completionList = getCompletions(token, context);
             completionList = completionList.sort();
             //prevent autocomplete for last word, instead show dropdown with one word
-            if (completionList.length == 1) {
+            if (completionList.length === 1) {
                 completionList.push(" ");
             }