Fix #294 (#295)

* Fix console issue
askomics · Oct 18, 2021 · bf06552 · bf06552
1 parent 8295f28
commit bf06552
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/askomics/api/results.py b/askomics/api/results.py
@@ -166,6 +166,7 @@ def get_graph_and_sparql_query():
         # Get all graphs and endpoint, and mark as selected the used one
         query = SparqlQuery(current_app, session)
         graphs, endpoints = query.get_graphs_and_endpoints(selected_graphs=graphs, selected_endpoints=endpoints)
+        console_enabled = can_access(session['user'])
 
     except Exception as e:
         traceback.print_exc(file=sys.stdout)
@@ -186,7 +187,8 @@ def get_graph_and_sparql_query():
         'endpoints': endpoints,
         'diskSpace': disk_space,
         'error': False,
-        'errorMessage': ''
+        'errorMessage': '',
+        'console_enabled': console_enabled
     })
 
 

diff --git a/askomics/react/src/routes/ask/ask.jsx b/askomics/react/src/routes/ask/ask.jsx
@@ -29,7 +29,8 @@ export default class Ask extends Component {
       dropdownOpen: false,
       selectedEndpoint: [],
       frontMessage: "",
-      redirectFormBuilder: false
+      redirectFormBuilder: false,
+      console_enabled: false
     }
     this.utils = new Utils()
     this.cancelRequest
@@ -155,6 +156,7 @@ export default class Ask extends Component {
             graphs: response.data.graphs,
             endpoints_sparql: response.data.endpoints,
             diskSpace: response.data.diskSpace,
+            console_enabled: response.data.console_enabled
           })
         }
       })
@@ -276,7 +278,8 @@ export default class Ask extends Component {
           graphs: this.state.graphs,
           endpoints: this.state.endpoints_sparql,
           diskSpace: this.state.diskSpace,
-          config: this.props.config
+          config: this.props.config,
+          console_enabled: this.state.console_enabled
         }
       }} />
     }

diff --git a/askomics/react/src/routes/results/resultsfilestable.jsx b/askomics/react/src/routes/results/resultsfilestable.jsx
@@ -28,7 +28,8 @@ export default class ResultsFilesTable extends Component {
       status: null,
       modalTracebackTitle: "",
       modalTracebackContent: "",
-      modalTraceback: false
+      modalTraceback: false,
+      console_enabled: false
     }
     this.utils = new Utils()
     this.handleSelection = this.handleSelection.bind(this)

diff --git a/tests/results/sparql_and_graph.json b/tests/results/sparql_and_graph.json
@@ -9,6 +9,7 @@
   },
   "error": false,
   "errorMessage": "",
+  "console_enabled": true,
   "graphState": {
     "attr": [
       {
@@ -435,4 +436,4 @@
     }
   },
   "sparqlQuery": null
-}
+}