Skip to content
Snippets Groups Projects
Commit 406d2b93 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'f-170' into 'dev'

BUG: fix for [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)

See merge request !70
parents 0455ea7f 57b6eed9
No related branches found
No related tags found
1 merge request!70BUG: fix for [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)
Pipeline #22597 passed
...@@ -18,6 +18,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -18,6 +18,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
* [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)
Autocompletion for "IS REFERENCED BY" leads to query syntax error
### Security ### Security
### Documentation ### Documentation
......
...@@ -159,7 +159,7 @@ var ext_autocomplete = new function () { ...@@ -159,7 +159,7 @@ var ext_autocomplete = new function () {
var end = origJQElement[0].value.slice(cursorpos); var end = origJQElement[0].value.slice(cursorpos);
var result = resultsFromServer.map(x => { var result = resultsFromServer.map(x => {
var x_quoted = x; var x_quoted = x;
if (x.indexOf(" ") > -1) { if (ext_autocomplete.CQL_WORDS.indexOf(x) == -1 && x.indexOf(" ") > -1) {
if(x.indexOf("\"") > -1) { if(x.indexOf("\"") > -1) {
x_quoted = `'${x}'`; x_quoted = `'${x}'`;
} else { } else {
......
...@@ -88,6 +88,26 @@ QUnit.test("searchPost", async function(assert) { ...@@ -88,6 +88,26 @@ QUnit.test("searchPost", async function(assert) {
assert.propEqual(result, expected); assert.propEqual(result, expected);
}); });
QUnit.test("searchPost webui#170", async function(assert) {
// https://gitlab.com/caosdb/caosdb-webui/-/issues/170
// Autocompletion for "IS REFERENCED BY" leads to query syntax error
const resultsFromServer = ["REFERENCED BY"];
const origJQElement = [{
selectionEnd: 24,
value: "FIND Event WHICH IS REFE",
}];
const expected = [
{
"html": "REFERENCED BY",
"text": "FIND Event WHICH IS REFERENCED BY"
},
];
const result = ext_autocomplete.searchPost(resultsFromServer, origJQElement);
assert.propEqual(result, expected);
});
QUnit.test("class", function(assert) { QUnit.test("class", function(assert) {
assert.ok(ext_autocomplete.switch_on_completion , "toggle available"); assert.ok(ext_autocomplete.switch_on_completion , "toggle available");
assert.ok(ext_autocomplete.switch_on_completion() , "toggle runs"); assert.ok(ext_autocomplete.switch_on_completion() , "toggle runs");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment