Show alaSQL errors in the UI.

This commit is contained in:
Mario Zechner 2023-06-21 21:29:57 +02:00
parent 52748c1d70
commit 97b4b25933
4 changed files with 13 additions and 15 deletions

View File

@ -5,7 +5,7 @@
"main": "server.js",
"scripts": {
"prepare": "husky install",
"dev": "cross-env NODE_ENV=development PORT=$PORT node server.js",
"dev": "cross-env NODE_ENV=development PORT=$PORT node --trace-warnings server.js",
"start": "cross-env NODE_ENV=production PORT=$PORT node server.js",
"format": "npx prettier --write ."
},

View File

@ -116,12 +116,7 @@ exports.queryItemsAlasql = (query, items) => {
};
query = query.substring(1);
try {
return alasql("select * from ? where " + query, [items]);
} catch (e) {
console.error(e);
return [];
}
return alasql("select * from ? where " + query, [items]);
};
exports.queryItems = (query, items, exactWord) => {

View File

@ -24,6 +24,9 @@ class ItemsFilter extends View {
this.innerHTML = /*html*/ `
<input x-id="query" x-state x-input-debounce class="rounded-lg px-2 py-1 w-full" type="text" placeholder="${placeholder}" />
<div x-id="sqlError" class="hidden mt-4 p-4">
</div>
<div x-id="stores" class="flex justify-center gap-2 flex-wrap mt-4 ${hideStores}">
<custom-checkbox x-id="allStores" label="Alle" ${
Object.values(stores).every((store) => store.defaultChecked) ? "checked" : ""
@ -162,6 +165,7 @@ class ItemsFilter extends View {
const start = performance.now();
const elements = this.elements;
elements.sqlError.classList.add("hidden");
this.model.totalItems = this.model.items.length;
let filteredItems = new Array(this.model.items.length);
for (let i = 0; i < this.model.items.length; i++) {
@ -247,7 +251,13 @@ class ItemsFilter extends View {
if (query.length > 0) {
if (query.charAt(0) == "!") {
filteredItems = queryItemsAlasql(query, filteredItems);
try {
filteredItems = queryItemsAlasql(query, filteredItems);
} catch (e) {
elements.sqlError.classList.remove("hidden");
elements.sqlError.innerText = e.message;
filteredItems = [];
}
} else {
filteredItems = queryItems(query, filteredItems, elements.exact.checked);
}

View File

@ -1,6 +1,5 @@
const axios = require("axios");
const utils = require("./utils");
const { readJSON } = require("../analysis");
const units = {
grm: { unit: "g", factor: 1 },
@ -109,9 +108,3 @@ exports.mapCategory = (rawItem) => {
};
exports.urlBase = "https://www.mpreis.at/shop/p/";
if (require.main == module) {
(async () => {
await exports.initializeCategoryMapping(readJSON("data/mpreis-2023-06-21.json.br"));
})();
}