fix setState to reset page on workflow change (#46)

* handle anonymous user toolbar login * bump version
aclowes · Jul 28, 2018 · ef697df · ef697df
1 parent 4efee7c
commit ef697df
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -63,7 +63,9 @@ export default class App extends React.Component {
   };
 
   renderToolbar() {
-    const userAction = this.state.user ? `Logout (${this.state.user.username})` : 'Login';
+    const userName = this.state.user && this.state.user.username;
+    // anonymous user has empty string username, so show Login for them too
+    const userAction = userName ? `Logout (${userName})` : 'Login';
     return (
       <div>
         <Nav>

diff --git a/frontend/src/WorkflowDetailHistory.js b/frontend/src/WorkflowDetailHistory.js
@@ -37,8 +37,11 @@ export default class WorkflowDetailHistory extends React.Component {
   componentWillReceiveProps(nextProps) {
     // the version changed...
     if (nextProps.workflow !== this.props.workflow) {
-      this.setState({runs: null, error: null, pagination: {page: 'last'}});
-      this.loadRuns(nextProps.workflow.id);
+      this.setState({runs: null, error: null, pagination: {page: 'last'}},
+        () => {
+          this.loadRuns(nextProps.workflow.id);
+        }
+      );
     }
   }
 
@@ -56,7 +59,9 @@ export default class WorkflowDetailHistory extends React.Component {
 
   selectPage = (pageNumber) => {
     this.setState({pagination: {...this.state.pagination, page: pageNumber}},
-      () => {this.loadRuns(this.props.workflow.id)});
+      () => {
+        this.loadRuns(this.props.workflow.id)
+      });
   };
 
   renderRunHeaders() {
@@ -156,15 +161,15 @@ export default class WorkflowDetailHistory extends React.Component {
           </Table>
           <ButtonToolbar>
             <ButtonGroup>
-            <Pagination
-              ellipsis
-              items={this.state.pagination.page_count}
-              maxButtons={10}
-              activePage={this.state.pagination.page}
-              onSelect={this.selectPage}/>
+              <Pagination
+                ellipsis
+                items={this.state.pagination.page_count}
+                maxButtons={10}
+                activePage={this.state.pagination.page}
+                onSelect={this.selectPage}/>
             </ButtonGroup>
             <ButtonGroup>
-            <Button onClick={this.submitRun}>Start new run</Button>
+              <Button onClick={this.submitRun}>Start new run</Button>
             </ButtonGroup>
           </ButtonToolbar>
         </div>

diff --git a/setup.py b/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.2.4',
+    version='0.2.5',
 
     description='Yet Another Workflow Engine, a subprocess-based DAG execution system',
     long_description=long_description,

diff --git a/yawn/settings/debug.py b/yawn/settings/debug.py
@@ -7,3 +7,8 @@
 CSRF_COOKIE_SECURE = False
 SECURE_PROXY_SSL_HEADER = None
 SECURE_SSL_REDIRECT = False
+
+# anonymous read-only allowed
+REST_FRAMEWORK['DEFAULT_PERMISSION_CLASSES'] = [  # noqa
+    'rest_framework.permissions.IsAuthenticatedOrReadOnly',
+]