From afa8e05f80c26c6c9a24bca4ad708090f75ee0d6 Mon Sep 17 00:00:00 2001
From: Ezequiel-Vega <vegaezequiel51@gmail.com>
Date: Tue, 22 Mar 2022 12:34:27 -0300
Subject: [PATCH] fix set id in nodes

---
 packages/mindplot/src/components/import/FreemindImporter.ts | 3 +--
 packages/mindplot/test/unit/import/Helper.ts                | 6 +-----
 .../mindplot/test/unit/import/TextImporterTestSuite.test.ts | 4 +++-
 packages/mindplot/test/unit/import/expected/emptyNodes.wxml | 2 +-
 packages/mindplot/test/unit/import/expected/i18n.wxml       | 2 +-
 packages/mindplot/test/unit/import/expected/i18n2.wxml      | 2 +-
 packages/mindplot/test/unit/import/expected/process.wxml    | 2 +-
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/mindplot/src/components/import/FreemindImporter.ts b/packages/mindplot/src/components/import/FreemindImporter.ts
index d76255c2..b984d752 100644
--- a/packages/mindplot/src/components/import/FreemindImporter.ts
+++ b/packages/mindplot/src/components/import/FreemindImporter.ts
@@ -42,7 +42,6 @@ export default class FreemindImporter extends Importer {
     this.mindmap = new Mindmap(nameMap);
     this.nodesmap = new Map<string, NodeModel>();
     this.relationship = new Array<RelationshipModel>();
-    let wiseTopicId = 0;
 
     const parser = new DOMParser();
     const freemindDoc = parser.parseFromString(this.freemindInput, 'application/xml');
@@ -62,7 +61,7 @@ export default class FreemindImporter extends Importer {
     const freeNode: FreemindNode = this.freemindMap.getNode();
     this.mindmap.setVersion(FreemindConstant.CODE_VERSION);
 
-    wiseTopicId++;
+    const wiseTopicId = parseInt(this.freemindMap.getNode().getId().split('_')[1], 10);
     const wiseTopic = this.mindmap.createNode('CentralTopic');
     wiseTopic.setPosition(0, 0);
     wiseTopic.setId(wiseTopicId);
diff --git a/packages/mindplot/test/unit/import/Helper.ts b/packages/mindplot/test/unit/import/Helper.ts
index a78553a9..3e9d513e 100644
--- a/packages/mindplot/test/unit/import/Helper.ts
+++ b/packages/mindplot/test/unit/import/Helper.ts
@@ -27,11 +27,7 @@ export const parseXMLString = (xmlStr: string, mimeType: DOMParserSupportedType)
 export const parseXMLFile = (filePath: fs.PathOrFileDescriptor, mimeType: DOMParserSupportedType) => {
   const stream = fs.readFileSync(filePath, { encoding: 'utf-8' });
 
-  let content = stream.toString();
-  // Hack for SVG exported from the browser ...
-  if (mimeType === 'image/svg+xml') {
-    content = content.replace('<svg ', '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ');
-  }
+  const content = stream.toString();
 
   return parseXMLString(content, mimeType);
 };
diff --git a/packages/mindplot/test/unit/import/TextImporterTestSuite.test.ts b/packages/mindplot/test/unit/import/TextImporterTestSuite.test.ts
index 5d764680..12446a6f 100644
--- a/packages/mindplot/test/unit/import/TextImporterTestSuite.test.ts
+++ b/packages/mindplot/test/unit/import/TextImporterTestSuite.test.ts
@@ -17,8 +17,10 @@ describe('MM import test execution', () => {
     const mapDocument = parseXMLFile(freemapPath, 'text/xml');
 
     const freemap: FreemindMap = new FreemindMap().loadFromDom(mapDocument);
+    const freemapXml = freemap.toXml();
+    const freemapStr = new XMLSerializer().serializeToString(freemapXml);
 
-    const importer = TextImporterFactory.create('mm', freemap);
+    const importer = TextImporterFactory.create('mm', freemapStr);
 
     await exporterAssert(testName, importer);
   });
diff --git a/packages/mindplot/test/unit/import/expected/emptyNodes.wxml b/packages/mindplot/test/unit/import/expected/emptyNodes.wxml
index 47288b6b..50803a15 100644
--- a/packages/mindplot/test/unit/import/expected/emptyNodes.wxml
+++ b/packages/mindplot/test/unit/import/expected/emptyNodes.wxml
@@ -1,5 +1,5 @@
 <map name="emptyNodes" version="tango">
-    <topic central="true" id="1" fontStyle=";;;;;;#0000cc;;;" bgColor="#ffcc33">
+    <topic central="true" id="0" fontStyle=";;;;;;#0000cc;;;" bgColor="#ffcc33">
         <topic position="200,-50" order="0" text="objectifs journée" shape="rounded rectagle" id="1" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
             <topic position="200,-100" order="0" text="&quot;business plan&quot; associatif ?" shape="rounded rectagle" id="2" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
             <topic position="-290,-87" order="0" text="modèle / activités responsabilités" shape="rounded rectagle" id="3" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
diff --git a/packages/mindplot/test/unit/import/expected/i18n.wxml b/packages/mindplot/test/unit/import/expected/i18n.wxml
index 302aa541..91ed0e2b 100644
--- a/packages/mindplot/test/unit/import/expected/i18n.wxml
+++ b/packages/mindplot/test/unit/import/expected/i18n.wxml
@@ -1,5 +1,5 @@
 <map name="i18n" version="tango">
-    <topic central="true" text="i18n" id="1">
+    <topic central="true" text="i18n" id="0">
         <topic position="200,-50" order="0" text="Este es un é con acento" shape="line" id="1"/>
         <topic position="-290,-12" order="0" text="Este es una ñ" shape="line" id="2"/>
         <topic position="-380,0" order="1" text="這是一個樣本 Japanise。" shape="line" id="3"/>
diff --git a/packages/mindplot/test/unit/import/expected/i18n2.wxml b/packages/mindplot/test/unit/import/expected/i18n2.wxml
index dd5b32e8..dc52227e 100644
--- a/packages/mindplot/test/unit/import/expected/i18n2.wxml
+++ b/packages/mindplot/test/unit/import/expected/i18n2.wxml
@@ -1,5 +1,5 @@
 <map name="i18n2" version="tango">
-    <topic central="true" text="أَبْجَدِيَّة عَرَبِيَّة" id="1">
+    <topic central="true" text="أَبْجَدِيَّة عَرَبِيَّة" id="0">
         <topic position="200,0" order="0" text="أَبْجَدِيَّة عَرَبِ" shape="line" id="1">
             <note><![CDATA[[]]></note>
         </topic>
diff --git a/packages/mindplot/test/unit/import/expected/process.wxml b/packages/mindplot/test/unit/import/expected/process.wxml
index 5a38fa1c..21972ee1 100644
--- a/packages/mindplot/test/unit/import/expected/process.wxml
+++ b/packages/mindplot/test/unit/import/expected/process.wxml
@@ -1,5 +1,5 @@
 <map name="process" version="tango">
-    <topic central="true" text="California" id="1">
+    <topic central="true" text="California" id="0">
         <topic position="-200,-200" order="1" text="Northern California" shape="line" id="1">
             <topic position="-200,-250" order="1" text="Oakland/Berkeley" shape="line" id="2"/>
             <topic position="290,-275" order="0" text="San Mateo" shape="line" id="3"/>