@@ -88,7 +98,7 @@
-
-
diff --git a/src/components/svg/arrow.vue b/src/components/svg/arrow.vue
deleted file mode 100644
index 22e94de..0000000
--- a/src/components/svg/arrow.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/changeDb.vue b/src/components/svg/changeDb.vue
deleted file mode 100644
index a368987..0000000
--- a/src/components/svg/changeDb.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
- Load another database, CSV, JSON or NDJSON
-
-
-
-
-
-
-
diff --git a/src/components/svg/chart.vue b/src/components/svg/chart.vue
deleted file mode 100644
index f55ccad..0000000
--- a/src/components/svg/chart.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/clear.vue b/src/components/svg/clear.vue
deleted file mode 100644
index f270373..0000000
--- a/src/components/svg/clear.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/svg/clipboard.vue b/src/components/svg/clipboard.vue
deleted file mode 100644
index f0978c5..0000000
--- a/src/components/svg/clipboard.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/close.vue b/src/components/svg/close.vue
deleted file mode 100644
index 17f383c..0000000
--- a/src/components/svg/close.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/svg/copy.vue b/src/components/svg/copy.vue
deleted file mode 100644
index 0085a3d..0000000
--- a/src/components/svg/copy.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
- Duplicate inquiry
-
-
-
-
-
-
-
diff --git a/src/components/svg/dataView.vue b/src/components/svg/dataView.vue
deleted file mode 100644
index 85cdf5c..0000000
--- a/src/components/svg/dataView.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/delete.vue b/src/components/svg/delete.vue
deleted file mode 100644
index c9bee02..0000000
--- a/src/components/svg/delete.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
- Delete inquiry
-
-
-
-
-
-
-
diff --git a/src/components/svg/dropDownChevron.vue b/src/components/svg/dropDownChevron.vue
deleted file mode 100644
index 7d502ce..0000000
--- a/src/components/svg/dropDownChevron.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/svg/edgeArrow.vue b/src/components/svg/edgeArrow.vue
deleted file mode 100644
index c6162fb..0000000
--- a/src/components/svg/edgeArrow.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/export.vue b/src/components/svg/export.vue
deleted file mode 100644
index e32fa4d..0000000
--- a/src/components/svg/export.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
- {{ tooltip }}
-
-
-
-
-
-
-
diff --git a/src/components/svg/exportToCsv.vue b/src/components/svg/exportToCsv.vue
deleted file mode 100644
index 8c8e406..0000000
--- a/src/components/svg/exportToCsv.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/exportToSvg.vue b/src/components/svg/exportToSvg.vue
deleted file mode 100644
index 002bd38..0000000
--- a/src/components/svg/exportToSvg.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/graph.vue b/src/components/svg/graph.vue
deleted file mode 100644
index 72e3f76..0000000
--- a/src/components/svg/graph.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/hint.vue b/src/components/svg/hint.vue
deleted file mode 100644
index 0deae2a..0000000
--- a/src/components/svg/hint.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
- {{ hint }}
-
-
-
-
-
-
-
diff --git a/src/components/svg/html.vue b/src/components/svg/html.vue
deleted file mode 100644
index fbe38be..0000000
--- a/src/components/svg/html.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/pause.vue b/src/components/svg/pause.vue
deleted file mode 100644
index 479721c..0000000
--- a/src/components/svg/pause.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/pivot.vue b/src/components/svg/pivot.vue
deleted file mode 100644
index 252d106..0000000
--- a/src/components/svg/pivot.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/png.vue b/src/components/svg/png.vue
deleted file mode 100644
index 25802f0..0000000
--- a/src/components/svg/png.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/rename.vue b/src/components/svg/rename.vue
deleted file mode 100644
index 1344c34..0000000
--- a/src/components/svg/rename.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
- Rename inquiry
-
-
-
-
-
-
-
diff --git a/src/components/svg/restart.vue b/src/components/svg/restart.vue
deleted file mode 100644
index 0fc9fda..0000000
--- a/src/components/svg/restart.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/row.vue b/src/components/svg/row.vue
deleted file mode 100644
index 5c9d0bf..0000000
--- a/src/components/svg/row.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/run.vue b/src/components/svg/run.vue
deleted file mode 100644
index 368bb83..0000000
--- a/src/components/svg/run.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/settings.vue b/src/components/svg/settings.vue
deleted file mode 100644
index d0ec642..0000000
--- a/src/components/svg/settings.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/sort.vue b/src/components/svg/sort.vue
deleted file mode 100644
index e6a648b..0000000
--- a/src/components/svg/sort.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/svg/sqlEditor.vue b/src/components/svg/sqlEditor.vue
deleted file mode 100644
index 7bbeec0..0000000
--- a/src/components/svg/sqlEditor.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/table.vue b/src/components/svg/table.vue
deleted file mode 100644
index bd06f52..0000000
--- a/src/components/svg/table.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
diff --git a/src/components/svg/treeChevron.vue b/src/components/svg/treeChevron.vue
deleted file mode 100644
index 819487b..0000000
--- a/src/components/svg/treeChevron.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/svg/viewCellValue.vue b/src/components/svg/viewCellValue.vue
deleted file mode 100644
index 453d963..0000000
--- a/src/components/svg/viewCellValue.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
diff --git a/src/lib/graphHelper.js b/src/lib/graphHelper.js
index ac48466..e2074ec 100644
--- a/src/lib/graphHelper.js
+++ b/src/lib/graphHelper.js
@@ -143,29 +143,52 @@ export function reduceNodes(nodeId, nodeData, interactionState, settings) {
neighborsOfSelectedNode,
neighborsOfHoveredNode,
selectedEdgeExtremities,
- hoveredEdgeExtremities
+ hoveredEdgeExtremities,
+ nodesMatchingSearchQuery,
+ focusedFoundNodeId
} = interactionState
const res = { ...nodeData }
- if (selectedNodeId || hoveredNodeId || hoveredEdgeId || selectedEdgeId) {
+ if (
+ selectedNodeId ||
+ hoveredNodeId ||
+ hoveredEdgeId ||
+ selectedEdgeId ||
+ nodesMatchingSearchQuery ||
+ focusedFoundNodeId
+ ) {
res.zIndex = 2
- res.highlighted = nodeId === selectedNodeId || nodeId === hoveredNodeId
+
+ const matchQuery =
+ nodesMatchingSearchQuery && nodesMatchingSearchQuery.includes(nodeId)
+
+ res.highlighted = [
+ selectedNodeId,
+ hoveredNodeId,
+ focusedFoundNodeId
+ ].includes(nodeId)
+
if (res.highlighted) {
res.labelColor = 'black'
}
const isInHoveredFamily =
- nodeId === hoveredNodeId ||
neighborsOfHoveredNode?.has(nodeId) ||
hoveredEdgeExtremities.includes(nodeId)
const isInSelectedFamily =
- nodeId === selectedNodeId ||
neighborsOfSelectedNode?.has(nodeId) ||
selectedEdgeExtremities.includes(nodeId)
- if (isInSelectedFamily || isInHoveredFamily) {
+
+ if (res.highlighted || isInSelectedFamily || isInHoveredFamily) {
res.forceLabel = true
- } else {
+ }
+ if (
+ !res.highlighted &&
+ !isInSelectedFamily &&
+ !isInHoveredFamily &&
+ !matchQuery
+ ) {
res.color = getDiminishedColor(
nodeData.color,
settings.style.backgroundColor
@@ -191,14 +214,25 @@ export function reduceEdges(
selectedEdgeId,
hoveredEdgeId,
neighborsOfSelectedNode,
- neighborsOfHoveredNode
+ neighborsOfHoveredNode,
+ nodesMatchingSearchQuery
} = interactionState
const res = { ...edgeData }
- if (hoveredEdgeId || selectedEdgeId || selectedNodeId || hoveredNodeId) {
+ if (
+ hoveredEdgeId ||
+ selectedEdgeId ||
+ selectedNodeId ||
+ hoveredNodeId ||
+ nodesMatchingSearchQuery
+ ) {
const extremities = graph.extremities(edgeId)
res.zIndex = 2
- const isHighlighted = hoveredEdgeId === edgeId || selectedEdgeId === edgeId
+ const isHighlighted =
+ hoveredEdgeId === edgeId ||
+ selectedEdgeId === edgeId ||
+ (nodesMatchingSearchQuery &&
+ extremities.every(nodeId => nodesMatchingSearchQuery.includes(nodeId)))
let isVisible
if (settings.style.highlightMode === 'node_alone') {
diff --git a/src/main.js b/src/main.js
index 0aedff8..66d8d7f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,7 @@ import '@/assets/styles/tooltips.css'
import '@/assets/styles/messages.css'
import 'vue-multiselect/dist/vue-multiselect.css'
import '@/assets/styles/multiselect.css'
+import '@/assets/icons.css'
import 'vue-final-modal/style.css'
if (!['localhost', '127.0.0.1'].includes(location.hostname)) {
diff --git a/src/views/Inquiries.vue b/src/views/Inquiries.vue
index e95a8af..b6304d4 100644
--- a/src/views/Inquiries.vue
+++ b/src/views/Inquiries.vue
@@ -115,18 +115,35 @@
{{ createdAtFormatted(inquiry.createdAt) }}