Skip to content

Commit c9d9fca

Browse files
committed
Fixed small frontend related things
1 parent 619c599 commit c9d9fca

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

api/query_database.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ def _get_client():
1212
_client = _new_connection()
1313
return _client
1414

15-
def query_database(query: (str, list), qid: str) -> None:
16-
threading.Thread(target=_query_database, args=(query, qid), name=f"Database query {qid}", daemon=True)
17-
def _query_database(query: (str, list), qid: str) -> None:
15+
def query_database(query: tuple[str, list], qid: str) -> None:
16+
threading.Thread(target=_query_database, args=(query + "\nLIMIT 100", qid), name=f"Database query {qid}", daemon=True)
17+
def _query_database(query: tuple[str, list], qid: str) -> None:
1818
global glob_return_dict
1919
cur = _get_client().cursor()
2020
cur.execute(*query)

frontend/js/ui.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ function getRulesByCategory(category) {
22
return Object.entries(RULE_METADATA)
33
.filter(([_, meta]) => {
44
if (meta.category === category) return true;
5-
if (meta.categories && meta.categories.includes(category)) return true;
6-
return false;
5+
return !!(meta.categories && meta.categories.includes(category));
6+
77
})
88
.map(([type, _]) => type);
99
}
@@ -244,11 +244,19 @@ function compileRuleset() {
244244
try {
245245
const rootRule = instantiateRule(window.ruleset);
246246
const result = rootRule.toSql();
247-
document.getElementById('sql-output').textContent = result.sql;
247+
document.getElementById('sql-output').textContent = dedent(result.sql);
248248
document.getElementById('params-output').textContent = JSON.stringify(result.params, null, 2);
249249
} catch (e) {
250250
console.error(e);
251251
document.getElementById('sql-output').textContent = "Compilation Error: " + e.message;
252252
document.getElementById('params-output').textContent = "";
253253
}
254254
}
255+
function dedent(sql) {
256+
return sql
257+
.toString()
258+
.split("\n")
259+
.map(function(line){ return line.trim(); }, undefined)
260+
.filter(function(line) { return line.length !== 0; })
261+
.join("\n")
262+
}

0 commit comments

Comments
 (0)