Merge branch 'develop' of https://bitbucket.org/wisemapping/wisemapping-frontend into develop

packages/editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisemapping/editor",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "main": "dist/editor.bundle.js",
   "scripts": {
     "build": "webpack --config webpack.prod.js",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@types/styled-components": "^5.1.4",
-    "@wisemapping/mindplot": "^0.4.15",
+    "@wisemapping/mindplot": "^5.0.1",
     "styled-components": "^5.2.1"
   },
   "peerDependencies": {

packages/mindplot/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wisemapping/mindplot",
-    "version": "5.0.1",
+    "version": "5.0.2",
     "description": "WiseMapping - Mindplot Canvas Library",
     "homepage": "http://www.wisemapping.org/",
     "main": "dist/mindplot.js",

packages/mindplot/src/components/export/MDExporter.ts

@@ -24,7 +24,7 @@ import Exporter from './Exporter';
 class MDExporter implements Exporter {
   private mindmap: Mindmap;
 
-  private footNotes = [];
+  private footNotes: string[] = [];
 
   constructor(mindmap: Mindmap) {
     this.mindmap = mindmap;
@@ -63,7 +63,9 @@ class MDExporter implements Exporter {
 
   private traverseBranch(prefix: string, branches: Array<INodeModel>) {
     let result = '';
-    branches.forEach((node) => {
+    branches
+      .filter((n) => n.getText() !== undefined)
+      .forEach((node) => {
         result = `${result}${prefix}- ${node.getText()}`;
         node.getFeatures().forEach((f) => {
           const type = f.getType();
@@ -85,7 +87,7 @@ class MDExporter implements Exporter {
         });
         result = `${result}\n`;
 
-      if (node.getChildren().length > 0) {
+        if (node.getChildren().filter((n) => n.getText() !== undefined).length > 0) {
           result += this.traverseBranch(`${prefix}\t`, node.getChildren());
         }
       });

packages/mindplot/src/components/export/TxtExporter.ts

@@ -39,9 +39,11 @@ class TxtExporter implements Exporter {
     return Promise.resolve(retult);
   }
 
-  private traverseBranch(prefix: string, branches: Array<INodeModel>) {
+  private traverseBranch(prefix: string, branches: INodeModel[]) {
     let result = '';
-    branches.forEach((node, index) => {
+    branches
+      .filter((n) => n.getText() !== undefined)
+      .forEach((node, index) => {
         result = `${result}${prefix}${index + 1} ${node.getText()}`;
         node.getFeatures().forEach((f) => {
           const type = f.getType();
@@ -51,7 +53,7 @@ class TxtExporter implements Exporter {
         });
         result = `${result}\n`;
 
-      if (node.getChildren().length > 0) {
+        if (node.getChildren().filter((n) => n.getText() !== undefined).length > 0) {
           result += this.traverseBranch(`\t${prefix}${index + 1}.`, node.getChildren());
         }
       });

packages/mindplot/src/components/model/INodeModel.ts

@@ -68,7 +68,7 @@ abstract class INodeModel {
     this.putProperty('text', text);
   }
 
-  getText(): string {
+  getText(): string | undefined {
     return this.getProperty('text') as string;
   }
 
@@ -89,7 +89,7 @@ abstract class INodeModel {
     this.putProperty('imageSize', `{width:${width},height:${height}}`);
   }
 
-  getImageSize(): {width: number, height: number} {
+  getImageSize(): { width: number, height: number } {
     const value = this.getProperty('imageSize') as string;
     let result;
     if (value != null) {
@@ -260,7 +260,7 @@ abstract class INodeModel {
     const tmindmap = target.getMindmap();
 
     children.forEach((snode) => {
-      const tnode:INodeModel = tmindmap.createNode(snode.getType(), snode.getId());
+      const tnode: INodeModel = tmindmap.createNode(snode.getType(), snode.getId());
       snode.copyTo(tnode);
       target.append(tnode);
     });
@@ -289,7 +289,7 @@ abstract class INodeModel {
 
   abstract getProperty(key: string): number | string | boolean;
 
-  abstract putProperty(key: string, value: number | string| boolean): void;
+  abstract putProperty(key: string, value: number | string | boolean): void;
 
   abstract setParent(parent: INodeModel): void;
 

packages/mindplot/src/components/model/NoteModel.ts

@@ -26,12 +26,12 @@ class NoteModel extends FeatureModel {
   }
 
   /** */
-  getText():string {
+  getText(): string {
     return this.getAttribute('text') as string;
   }
 
   /** */
-  setText(text:string) {
+  setText(text: string) {
     $assert(text, 'text can not be null');
     this.setAttribute('text', text);
   }

packages/mindplot/test/unit/export/Helper.ts

@@ -35,18 +35,6 @@ export const setupBlob = () => {
   }
 };
 
-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" ');
-  }
-
-  return parseXMLString(content, mimeType);
-};
-
 export const parseXMLString = (xmlStr: string, mimeType: DOMParserSupportedType) => {
   const parser = new DOMParser();
   const xmlDoc = parser.parseFromString(xmlStr, mimeType);
@@ -61,6 +49,18 @@ export const parseXMLString = (xmlStr: string, mimeType: DOMParserSupportedType)
   return xmlDoc;
 };
 
+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" ');
+  }
+
+  return parseXMLString(content, mimeType);
+};
+
 export const exporterAssert = async (testName: string, exporter: Exporter) => {
   const actualStr = await exporter.export();
 

packages/mindplot/test/unit/export/expected/complex.md

@@ -14,7 +14,6 @@
 	- Goals
 	- Formulize
 - Probono
-	- null
 
 
 

packages/mindplot/test/unit/export/expected/complex.txt

@@ -13,7 +13,6 @@
 		1.11.1 Goals
 		1.11.2 Formulize
 	1.12 Probono
-		1.12.1 null
 2 Strategy 2: Talent Development
 	2.1 Strategic Priority 2a: Personal Plans
 	2.2 Strategic Priority 2b: External learning matches organ. goals
@@ -23,8 +22,7 @@
 	3.1 Strategic Priority 4a:Feedback
 	3.2 Strategic Priority 4b: Anti Harassment
 	3.3 Strategic Priority 4c: Diversity
-	3.4 null
+	3.4 So That...
-	3.5 So That...
 4 Strategy 1: Recruit & Retain
 	4.1 So that...
 	4.2 Strategic Priority 1a: Recruitment
@@ -44,22 +42,14 @@
 	5.1 Goals
 		5.1.1 Increase new clients
 			5.1.1.1 Academic Research
-			5.1.1.2 null
 		5.1.2 Support New Products
 			5.1.2.1 Formulize
-			5.1.2.2 null
-			5.1.2.3 null
 		5.1.3 Support CiviCRM
 		5.1.4 Identify Opportunites
-			5.1.4.1 null
-			5.1.4.2 null
-			5.1.4.3 null
-			5.1.4.4 null
 6 Hosting NG Plan
 7 Freeform IT Plan
 	7.1 Fragile
 	7.2 Tools
-	7.3 null
 8 Project Teams
 	8.1 Projects 1-3
 	8.2 Projects 4-6
@@ -78,7 +68,6 @@
 	10.5 Business Plan
 11 Strategy 3: Safety and Wellness
 	11.1 Strategic Priority 3a: H&S Policies & Practices
-		11.1.1 null
 	11.2 Strategic Priority 3b: Health Promotion
 		11.2.1 Health and Wellness Committee
 		11.2.2 Work-life Balance Initiative [link: http://hrcouncil.ca/hr-toolkit/workplaces-health-safety.cfm]
@@ -101,54 +90,45 @@
 14 Backlog Plan [link: https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit]
 	14.1 Go To Backlog Plan  [link: https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit]
 15 Strategy Prospecting
-	15.1 null
-	15.2 null
-	15.3 null
 16 Stategies:  Forecasting
-	16.1 null
-	16.2 null
-	16.3 null
 17 Strategies Marketing
-18 null
+18 Exit Interviews
-19 Exit Interviews
+	18.1 As Freeform
-	19.1 As Freeform
+	18.2 Responsiblity: HZ, KS
-	19.2 Responsiblity: HZ, KS
+	18.3 Release
-	19.3 Release
+	18.4 Have Heather write procedures for exit interview process
-	19.4 Have Heather write procedures for exit interview process
+	18.5 So that
-	19.5 So that
+19 3 Month Onboarding Process
-20 3 Month Onboarding Process
+20 Human Resources Plan
-21 Human Resources Plan
+	20.1 Related Org Objectives
-	21.1 Related Org Objectives
+		20.1.1 1
-		21.1.1 1
+		20.1.2 2
-		21.1.2 2
+		20.1.3 3
-		21.1.3 3
+		20.1.4 4
-		21.1.4 4
+	20.2 Related Documents
-	21.2 Related Documents
+	20.3 Goals
-	21.3 Goals
+		20.3.1 Goal:Staff=Optimal Bus. Growth
-		21.3.1 Goal:Staff=Optimal Bus. Growth
+			20.3.1.1 So that...
-			21.3.1.1 So that...
+			20.3.1.2 Related Strategic Priorities: 
-			21.3.1.2 Related Strategic Priorities: 
+			20.3.1.3 KPI: HR Level equals Planned Growth
-			21.3.1.3 KPI: HR Level equals Planned Growth
+			20.3.1.4 Methodology
-			21.3.1.4 Methodology
+				20.3.1.4.1 Target
-				21.3.1.4.1 Target
+		20.3.2 Goal: Increase Job Satisfaction
-		21.3.2 Goal: Increase Job Satisfaction
+			20.3.2.1 So That
-			21.3.2.1 So That
+			20.3.2.2 Related Strategic Priorities
-			21.3.2.2 Related Strategic Priorities
+			20.3.2.3 KPI: Employee Satisfaction
-				21.3.2.2.1 null
+			20.3.2.4 Methodology
-			21.3.2.3 KPI: Employee Satisfaction
+				20.3.2.4.1 Target
-				21.3.2.3.1 null
+		20.3.3 Goal: Improve Performance
-			21.3.2.4 Methodology
+			20.3.3.1 So That
-				21.3.2.4.1 Target
+			20.3.3.2 Related Strategic Priorities
-		21.3.3 Goal: Improve Performance
+			20.3.3.3 KPI: Employee Performance
-			21.3.3.1 So That
+			20.3.3.4 Methodology
-			21.3.3.2 Related Strategic Priorities
+				20.3.3.4.1 Target
-			21.3.3.3 KPI: Employee Performance
+		20.3.4 Goal: Reduce Turnover
-			21.3.3.4 Methodology
+			20.3.4.1 So That
-				21.3.3.4.1 Target
+			20.3.4.2 Related Strategic Priorities
-		21.3.4 Goal: Reduce Turnover
+			20.3.4.3 KPI: Retention Rate
-			21.3.4.1 So That
+			20.3.4.4 Methodology
-			21.3.4.2 Related Strategic Priorities
+				20.3.4.4.1 Target
-			21.3.4.3 KPI: Retention Rate
+		20.3.5 Risk & Compliance
-			21.3.4.4 Methodology
-				21.3.4.4.1 Target
-		21.3.5 Risk & Compliance

packages/webapp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wisemapping/webapp",
-    "version": "5.0.1",
+    "version": "5.0.2",
     "main": "app.jsx",
     "scripts": {
         "start": "webpack serve --config webpack.dev.js ",

packages/webapp/src/components/maps-page/maps-list/index.tsx

@@ -236,7 +236,7 @@ const mapsFilter = (filter: Filter, search: string): ((mapInfo: MapInfo) => bool
 
 export const MapsList = (props: MapsListProps): React.ReactElement => {
     const classes = useStyles();
-    const [order, setOrder] = React.useState<Order>('asc');
+    const [order, setOrder] = React.useState<Order>('desc');
     const [filter, setFilter] = React.useState<Filter>({ type: 'all' });
 
     const [orderBy, setOrderBy] = React.useState<keyof MapInfo>('lastModificationTime');