From 00239f6cc193d2542e063ff0865eea5f3b4c3324 Mon Sep 17 00:00:00 2001
From: Leonardo <leomilho@gmail.com>
Date: Tue, 14 May 2024 14:54:59 +0200
Subject: [PATCH] fix: eslintignore uncompleted merge

---
 apps/web/.eslintignore                                    | 6 ------
 .../visualizations/nodelinkvis/components/query2NL.tsx    | 1 +
 .../semanticsubstratesvis/components/types.ts             | 8 ++++----
 .../semanticsubstratesvis/components/utils.ts             | 4 ++--
 .../semanticsubstratesvis/semanticsubstratesvis.tsx       | 4 ++--
 .../lib/vis/visualizations/semanticsubstratesvis/utils.ts | 4 ++--
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/apps/web/.eslintignore b/apps/web/.eslintignore
index 423e34b20..32f674e84 100644
--- a/apps/web/.eslintignore
+++ b/apps/web/.eslintignore
@@ -9,10 +9,4 @@ vite.setup.ts
 *.png
 *.ico
 *.css
-<<<<<<< HEAD
 *.scss
-*.mdx
-*.md
-=======
-*.scss
->>>>>>> a680bf1 (feat: adds pagination)
diff --git a/libs/shared/lib/vis/visualizations/nodelinkvis/components/query2NL.tsx b/libs/shared/lib/vis/visualizations/nodelinkvis/components/query2NL.tsx
index f5b7381b4..990719dc6 100644
--- a/libs/shared/lib/vis/visualizations/nodelinkvis/components/query2NL.tsx
+++ b/libs/shared/lib/vis/visualizations/nodelinkvis/components/query2NL.tsx
@@ -179,6 +179,7 @@ export function parseQueryResult(queryResult: GraphQueryResult, ml: ML, options:
     let radius = options.defaultRadius || 5;
     let data: NodeType = {
       _id: queryResult.nodes[i]._id,
+      label: queryResult.nodes[i].label,
       attributes: queryResult.nodes[i].attributes,
       type: typeNumber,
       displayInfo: preferredText,
diff --git a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/types.ts b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/types.ts
index da7bd4e4b..07c8ecc37 100644
--- a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/types.ts
+++ b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/types.ts
@@ -48,7 +48,7 @@ export interface ConnectionFromTo {
 }
 
 export interface EdgeVisibility {
-  id: string;
+  _id: string;
   to: boolean;
   from: boolean;
   visibility: boolean;
@@ -77,7 +77,7 @@ export interface Node {
 }
 
 export interface AugmentedNodeAttributes {
-  id: string;
+  _id: string;
   attributes: NodeAttributes;
   label: string;
 }
@@ -86,7 +86,7 @@ export interface AugmentedEdgeAttributes {
   attributes: NodeAttributes;
   from: string;
   to: string;
-  id: string;
+  _id: string;
   label: string;
 }
 
@@ -101,7 +101,7 @@ export interface DataConfig {
 
 export interface Edge {
   from: string;
-  id: string;
+  _id: string;
   attributes: object[];
   label: string;
   _key: string;
diff --git a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/utils.ts b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/utils.ts
index 68e0d466c..639634aca 100644
--- a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/utils.ts
+++ b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/components/utils.ts
@@ -72,7 +72,7 @@ export function getRegionData(nodes: AugmentedNodeAttributes[], regionUserSelect
   });
   if (filteredData.length === 0) filteredData = [];
 
-  const idData: string[] = filteredData.map((item) => item.id);
+  const idData: string[] = filteredData.map((item) => item._id);
   let xAxis: any[] = [];
   if (regionUserSelection.placement.xAxis != '') {
     xAxis = filteredData.map((item) => {
@@ -156,7 +156,7 @@ export function wrapperEdgeVisibility(data: ConnectionFromTo[]): EdgeVisibility[
     const from_stringModified = item.from.replace('/', '_');
     const to_stringModified = item.to.replace('/', '_');
     const elementString = `${from_stringModified}_fromto_${to_stringModified}`;
-    return { id: elementString, from: true, to: true, visibility: true };
+    return { _id: elementString, from: true, to: true, visibility: true };
   });
 
   return transformedArray;
diff --git a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx
index 1508e4c4c..cddb8a206 100644
--- a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx
+++ b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx
@@ -63,7 +63,7 @@ export const VisSemanticSubstrates = ({ data, configuration }: VisualizationProp
 
   const augmentedNodes: AugmentedNodeAttributes[] = useMemo(() => {
     return nodes.map((node: Node) => ({
-      id: node._id,
+      _id: node._id,
       attributes: node.attributes,
       label: node.label,
     }));
@@ -71,7 +71,7 @@ export const VisSemanticSubstrates = ({ data, configuration }: VisualizationProp
 
   const augmentedEdges: AugmentedEdgeAttributes[] = useMemo(() => {
     return edges.map((edge: any) => ({
-      id: edge.id,
+      _id: edge.id,
       to: edge.to,
       from: edge.from,
       attributes: edge.attributes,
diff --git a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/utils.ts b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/utils.ts
index 173658013..3c224437d 100644
--- a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/utils.ts
+++ b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/utils.ts
@@ -8,11 +8,11 @@ const buildGraphology = (data: GraphData): MultiGraph => {
 
   const nodeMap = new Map<string, Node>();
   data.nodes.forEach((node) => {
-    nodeMap.set(node.id, node);
+    nodeMap.set(node._id, node);
   });
 
   const nodeEntries = data.nodes.map((node) => ({
-    key: node.id,
+    key: node._id,
     attributes: {
       ...node.attributes,
       label: node.label,
-- 
GitLab