Skip to content

Commit

Permalink
Merge 496a8e7 into c112944
Browse files Browse the repository at this point in the history
  • Loading branch information
xgaia committed Oct 29, 2019
2 parents c112944 + 496a8e7 commit 6992850
Show file tree
Hide file tree
Showing 6 changed files with 188 additions and 91 deletions.
267 changes: 179 additions & 88 deletions askomics/libaskomics/SparqlQueryBuilder.py

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions askomics/libaskomics/Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ def unique(a):
"""return the list with duplicate elements removed"""
return list(set(a))

@staticmethod
def unique_list_of_dict(l):
"""return the list of dict with duplicate elements removed"""
return [i for n, i in enumerate(l) if i not in l[n + 1:]]

@staticmethod
def intersect(a, b):
"""return the intersection of two lists"""
Expand Down
2 changes: 1 addition & 1 deletion askomics/react/src/routes/results/resultsfilestable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ export default class ResultsFilesTable extends Component {
<Button disabled={row.status == "success" ? false : true} id={row.id} size="sm" outline color="secondary" onClick={this.handlePreview}>Preview</Button>
<Button disabled={row.status == "success" ? false : true} id={row.id} size="sm" outline color="secondary" onClick={this.handleDownload}>Download</Button>
<Button disabled={row.sparqlQuery != null ? true : false} id={row.id} size="sm" outline color="secondary" onClick={this.handleRedo}>Redo</Button>
<Button disabled={row.status == "success" ? false : true} id={row.id} size="sm" outline color="secondary" onClick={this.handleEditQuery}>Sparql</Button>
<Button id={row.id} size="sm" outline color="secondary" onClick={this.handleEditQuery}>Sparql</Button>
{this.props.config.user.galaxy ? <Button disabled={row.status == "success" ? false : true} name="result" id={row.id} size="sm" outline color="secondary" onClick={this.handleSendToGalaxy}>Send result to Galaxy</Button> : null}
{this.props.config.user.galaxy ? <Button disabled={row.sparqlQuery != null ? true : false} name="query" id={row.id} size="sm" outline color="secondary" onClick={this.handleSendToGalaxy}>Send query to Galaxy</Button> : null}
</ButtonGroup>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"ontology"
],
"name": "AskOmics",
"version": "3.1.2",
"version": "3.1.3",
"description": "Visual SPARQL query builder",
"author": "Xavier Garnier",
"license": "AGPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name='askomics',
version='3.1.2',
version='3.1.3',
description='''
AskOmics is a visual SPARQL query interface supporting both intuitive
data integration and querying while shielding the user from most of the
Expand Down
1 change: 1 addition & 0 deletions tests/results/query.sparql
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

SELECT DISTINCT ?Gene1_Label
WHERE {

?Gene1_uri rdf:type <http://www.semanticweb.org/user/ontologies/2018/1#Gene> .
?Gene1_uri rdfs:label ?Gene1_Label .

Expand Down

0 comments on commit 6992850

Please sign in to comment.