refactoring of filters

This commit is contained in:
2024-08-24 17:22:40 +03:00
parent 97ad9de3d2
commit d9e2c4954a
57 changed files with 1175 additions and 349 deletions
@@ -12,7 +12,6 @@
export let inModal;
export let modalUrl;
export let graph;
let filter = {
label: "",
operator: "",
@@ -58,9 +57,11 @@
const filterRecord = extractFilterRecord(graph, value);
function extractFilterRecord(graph, value) {
if (!filter.isReference) {
return null;
}
console.log(graph)
return graph.records.find(r => r.id === value);
}
@@ -82,7 +83,7 @@
{#if filter.isReference && filterRecord}
{filter.label} is {previewTitle(channel.schemas, filterRecord)}
{:else}
{filter.label} {operators.find((o) => o.name === filter.operator)?.symbol ?? ""} {value}
{filter.label} {operators.find((o) => o.name === filter.operator)?.symbol ?? ""} {operators.find((o) => o.name === filter.operator)?.hasValue ? value : ""}
{/if}
<button
@@ -11,7 +11,6 @@
export let inModal;
export let modalUrl;
let dropdown;
let search = "";
let systemFieldsFiltered = systemFields;
@@ -70,6 +69,13 @@
activeOperator = operators.find(o => o.name === "eq")
}
function selectOperator(e, operator) {
activeOperator = operator;
if (!operator.hasValue) {
applyFilter(e)
}
}
function applyFilter(e) {
e.preventDefault();
let filterPrefix = "";
@@ -146,7 +152,7 @@
<div class="selected-filter">field: {activeField.label}</div>
{#each activeOperators as operator}
<button class="dropdown-item button" on:click={e => activeOperator = operator }>
<button class="dropdown-item button" on:click={e => selectOperator(e,operator)}>
{operator.label}
</button>
{/each}
@@ -214,8 +220,8 @@
required
/>
<button class="button applied-filter">
Submit
<button class="button applied-filter">
Submit
</button>
</form>
+1
View File
@@ -10,6 +10,7 @@
<h2 class="mb-5">Enter Lucent</h2>
<form hx-post="/lucent/login" >
@csrf
<p>Submit your email address and you will receive a <b>login link</b> to your email</p>
<p>Don't forget to check your spam folder</p>
<div class="mt-5 mb-3">