From 6a7589599efd232e077703e25557d4e0656276f4 Mon Sep 17 00:00:00 2001 From: Wlad <9556979+gosticks@users.noreply.github.com> Date: Thu, 4 Jan 2024 16:48:44 +0100 Subject: [PATCH] wip: cleanup and refactor --- src/lib/components/CodeEditor.svelte | 2 +- src/lib/components/Input.svelte | 11 + src/lib/components/MiniEditor.svelte | 39 +++ src/lib/components/graph/AxisRenderer.svelte | 6 +- src/lib/components/graph/Grid.svelte | 6 +- src/lib/components/graph/Minimap.svelte | 10 +- src/lib/components/graph/PlaneGraph.svelte | 2 +- src/lib/components/graph/Selection3D.svelte | 6 +- src/lib/components/graph/SliceGraph.svelte | 31 +-- .../components/graph/SliceSelection.svelte | 25 +- src/lib/components/graph/Stats.svelte | 8 +- src/lib/rendering/Minimap.ts | 2 +- src/lib/store/dataStore/DataStore.ts | 13 +- src/lib/store/dataStore/loadActions.ts | 235 +++++----------- src/lib/store/dataStore/postProcessing.ts | 261 ++++++++++++++++++ src/lib/store/dataStore/types.ts | 34 ++- src/lib/store/filterStore/restore.ts | 2 +- .../CoreGraph.svelte} | 9 +- .../FilterSidebar.svelte | 37 +-- .../{components => views}/QueryEditor.svelte | 14 +- src/lib/views/SchemaMatter.svelte | 131 +++++++++ src/lib/views/TransformerEditor.svelte | 74 +++++ .../tableSelection/TableSelection.svelte | 18 +- src/routes/graph/[slug]/+page.svelte | 31 +-- 24 files changed, 726 insertions(+), 281 deletions(-) create mode 100644 src/lib/components/Input.svelte create mode 100644 src/lib/components/MiniEditor.svelte create mode 100644 src/lib/store/dataStore/postProcessing.ts rename src/lib/{components/BasicGraph.svelte => views/CoreGraph.svelte} (97%) rename src/lib/{components => views}/FilterSidebar.svelte (87%) rename src/lib/{components => views}/QueryEditor.svelte (92%) create mode 100644 src/lib/views/SchemaMatter.svelte create mode 100644 src/lib/views/TransformerEditor.svelte rename src/lib/{components => views}/tableSelection/TableSelection.svelte (85%) diff --git a/src/lib/components/CodeEditor.svelte b/src/lib/components/CodeEditor.svelte index ebb0476..70f0348 100644 --- a/src/lib/components/CodeEditor.svelte +++ b/src/lib/components/CodeEditor.svelte @@ -22,7 +22,7 @@ if (!browser) return; self.MonacoEnvironment = { - getWorker: async function (workerId, label) { + getWorker: async function (_, label) { // We only support SQL for now let worker: any; switch (label) { diff --git a/src/lib/components/Input.svelte b/src/lib/components/Input.svelte new file mode 100644 index 0000000..0425852 --- /dev/null +++ b/src/lib/components/Input.svelte @@ -0,0 +1,11 @@ + + + diff --git a/src/lib/components/MiniEditor.svelte b/src/lib/components/MiniEditor.svelte new file mode 100644 index 0000000..5a0c405 --- /dev/null +++ b/src/lib/components/MiniEditor.svelte @@ -0,0 +1,39 @@ + + + + + diff --git a/src/lib/components/graph/AxisRenderer.svelte b/src/lib/components/graph/AxisRenderer.svelte index a02a725..57701a6 100644 --- a/src/lib/components/graph/AxisRenderer.svelte +++ b/src/lib/components/graph/AxisRenderer.svelte @@ -1,7 +1,11 @@
+ +
+

Schema Mapper

+
+
+
+
+

Transformations

+ + + + +
+
+ {#each table.transformations as transformation} +

+ {transformation.name} + {#if transformation.required} + required + {/if} +

+ +

{transformation.description}

+
+ +
+
+ {/each} +
+
+
+

Input Schema

+
+ {#each Object.entries(table.sourceSchema) as [key, value]} + {key}:{value} + {/each} +
+
+
+

Output Schema

+
+ {#each Object.entries(table.schema) as [key, value]} + {key}:{value} + {/each} +
+
+
diff --git a/src/lib/views/TransformerEditor.svelte b/src/lib/views/TransformerEditor.svelte new file mode 100644 index 0000000..4475585 --- /dev/null +++ b/src/lib/views/TransformerEditor.svelte @@ -0,0 +1,74 @@ + + + + + + +

Create custom transformer

+ + {transformerName} +

+ Use DuckDB/SQL syntax, instead of table name use ${tableName} +

+ (query = evt.detail.content)} + class="min-h-[50vh]" + /> +
+
+ + +
+
diff --git a/src/lib/components/tableSelection/TableSelection.svelte b/src/lib/views/tableSelection/TableSelection.svelte similarity index 85% rename from src/lib/components/tableSelection/TableSelection.svelte rename to src/lib/views/tableSelection/TableSelection.svelte index 8ed4dc2..572f1e9 100644 --- a/src/lib/components/tableSelection/TableSelection.svelte +++ b/src/lib/views/tableSelection/TableSelection.svelte @@ -16,16 +16,17 @@ -
- + {#if $filterStore.graphOptions} {#if $filterStore.graphOptions instanceof PlaneGraphModel} @@ -68,7 +65,7 @@ {/if} - +