Merge pull request #28 from aclowes/readonly-mode

readonly mode

frontend/src/App.js

@@ -9,7 +9,7 @@ import {YawnNavBar, YawnNavItem} from './utilities';
 export default class App extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {user: null, error: null, reload: false};
+    this.state = {user: {}, error: null, reload: false};
   }
 
   componentDidMount() {
@@ -36,7 +36,7 @@ export default class App extends React.Component {
   logout = (event) => {
     event.preventDefault();
     API.delete(`/api/users/logout/`, {}, (payload, error) => {
-      this.setState({user: null, error});
+      this.setState({user: {}, error});
       this.props.router.push('/login');
     });
   };
@@ -48,7 +48,7 @@ export default class App extends React.Component {
   };
 
   renderToolbar() {
-    const user = this.state.user && `(${this.state.user.username})`;
+    const userAction = this.state.user.id ? `Logout (${this.state.user.username})` : 'Login';
     return (
       <div>
         <Nav>
@@ -62,7 +62,7 @@ export default class App extends React.Component {
           <NavItem onClick={this.refresh}>
             <Glyphicon glyph="refresh"/>
           </NavItem>
-          <NavItem onClick={this.logout}>Logout {user}</NavItem>
+          <NavItem onClick={this.logout}>{userAction}</NavItem>
         </Nav>
       </div>
     )

frontend/src/WorkflowDetailForm.js

@@ -73,7 +73,9 @@ export default class WorkflowDetailForm extends React.Component {
   handleSubmit = (event) => {
     const update = formValues(this.state);
     API.patch(`/api/workflows/${this.props.workflow.id}/`, update, (payload, error) => {
-      this.setState({...formValues(payload), error, editable: false});
+      // if there is an error, don't parse the payload
+      const form = error ? {} : formValues(payload);
+      this.setState({...form, error, editable: false});
     });
     event.preventDefault();
   };
@@ -131,4 +133,4 @@ export default class WorkflowDetailForm extends React.Component {
       )
     }
   }
-}
+}

frontend/src/tests/__snapshots__/App.test.js.snap

@@ -112,8 +112,7 @@ exports[`homepage renders 1`] = `
               onClick={[Function]}
               role="button"
             >
-              Logout 
-              (test user)
+              Login
             </a>
           </li>
         </ul>

setup.py

@@ -22,7 +22,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.1.6',
+    version='0.1.7',
 
     description='Yet Another Workflow Engine, a subprocess-based DAG execution system',
     long_description=long_description,

yawn/user/views.py

@@ -4,7 +4,9 @@
 from rest_framework.decorators import list_route
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
+from rest_framework.settings import api_settings
 
+from yawn.user.permissions import ModelPermissions
 from .serializers import UserSerializer, LoginSerializer
 
 
@@ -15,12 +17,17 @@ class UserViewSet(viewsets.GenericViewSet,
                   viewsets.mixins.UpdateModelMixin):
     """
     User endpoint, GET(list, detail), PATCH to change
+
+    This ViewSet has `permission_classes` set and `/me/` has the default permissions
+    so that the default permission class can be set to IsAuthenticatedOrReadOnly
+    without leaking user API tokens.
     """
     queryset = User.objects.all().order_by('id')
 
     serializer_class = UserSerializer
+    permission_classes = (ModelPermissions,)
 
-    @list_route(methods=['get'])
+    @list_route(methods=['get'], permission_classes=api_settings.DEFAULT_PERMISSION_CLASSES)
     def me(self, request):
         serializer = self.get_serializer(request.user)
         return Response(serializer.data)

yawn/worker/main.py

@@ -3,6 +3,7 @@
 import typing  # NOQA
 import collections
 
+import time
 from django.db import transaction
 from django.db.models import functions
 
@@ -43,14 +44,16 @@ def run(self):
         Main event loop.
 
         Why not threads/gevent/asyncio?
-            Because this is simple and maybe even more efficient!
+            Because this is simple and maybe more efficient
         """
         self.handle_signals()
         self.executor = Manager()
         self.state = State.running
+        loop_start = time.time()
         logger.warning('Starting YAWN worker with concurrency=%s', self.concurrency)
 
         while True:
+
             if self.state == State.running:
 
                 # update own status and check for lost workers
@@ -72,6 +75,11 @@ def run(self):
             self.results.extend(self.executor.read_output())
             self.save_results()
 
+            # don't run the loop more than once per second
+            loop_duration = time.time() - loop_start
+            time.sleep(max(1 - loop_duration, 0))
+            loop_start += loop_duration
+
         logger.warning('Exiting')
         self.worker.status = Worker.EXITED
         self.worker.save()