From 1a6ba3ab1483a27deff54ac7b0631191115b9dce Mon Sep 17 00:00:00 2001
From: Joshua Melville
Date: Thu, 19 Sep 2019 10:51:09 +0100
Subject: [PATCH 1/5] bump version to 4.1.2
---
package-lock.json | 2 +-
package.json | 2 +-
public/package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 0c58cf21c..f147c6197 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "network-canvas-architect",
- "version": "4.1.1",
+ "version": "4.1.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index b48b6f9b0..92031f0bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "network-canvas-architect",
- "version": "4.1.1",
+ "version": "4.1.2",
"productName": "Network Canvas Architect",
"description": "A tool for creating Network Canvas interviews.",
"author": "Complex Data Collective",
diff --git a/public/package.json b/public/package.json
index 4007b5bf5..0ba776b5e 100644
--- a/public/package.json
+++ b/public/package.json
@@ -1,6 +1,6 @@
{
"name": "network-canvas-architect",
- "version": "4.1.1",
+ "version": "4.1.2",
"productName": "Network Canvas Architect",
"description": "A tool for creating Network Canvas interviews.",
"author": "Complex Data Collective",
From 99be7b91e6d08ed370f717a2852b0623bbee6c10 Mon Sep 17 00:00:00 2001
From: Joshua Melville
Date: Thu, 19 Sep 2019 11:19:24 +0100
Subject: [PATCH 2/5] update NC ref
---
network-canvas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/network-canvas b/network-canvas
index 000c2b707..7097a5e82 160000
--- a/network-canvas
+++ b/network-canvas
@@ -1 +1 @@
-Subproject commit 000c2b707d094b0f920c93f1f86cdf0d3cae09c5
+Subproject commit 7097a5e82dd418b1f993f44afd9bd839afb874c2
From 0a0ce1bfc4117287ba7212c2e544d28a938c193e Mon Sep 17 00:00:00 2001
From: Joshua Melville
Date: Thu, 19 Sep 2019 11:31:47 +0100
Subject: [PATCH 3/5] add guidance on node labelling
---
src/components/sections/NodeType/NodeType.js | 7 +++++++
src/components/sections/QuickAdd/QuickAdd.js | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/components/sections/NodeType/NodeType.js b/src/components/sections/NodeType/NodeType.js
index 2196b98f8..df62cbc40 100644
--- a/src/components/sections/NodeType/NodeType.js
+++ b/src/components/sections/NodeType/NodeType.js
@@ -79,6 +79,13 @@ class NodeType extends Component {
>
Create new node type
+ { nodeTypes.length !== 0 &&
+
+ Tip: ensure you create and assign a variable called "name" for this node type,
+ unless you have a good reason not to. Network Canvas automatically use this
+ variable as the visual label for the node in the interview.
+
+ }
diff --git a/src/components/sections/QuickAdd/QuickAdd.js b/src/components/sections/QuickAdd/QuickAdd.js
index f67a33b29..96f80ee01 100644
--- a/src/components/sections/QuickAdd/QuickAdd.js
+++ b/src/components/sections/QuickAdd/QuickAdd.js
@@ -27,8 +27,8 @@ const QuickAdd = ({
- Tip: create or assign a variable called "name" and network
- canvas will automatically use it as the visual label for the node.
+ Tip: use a variable called "name" unless you have a good reason not to.
+ Network Canvas will then automatically use this variable as the visual label for the node.
From 3bdd8c5e0ee53c7b2a83da78adf4e0ba15f35e58 Mon Sep 17 00:00:00 2001
From: Joshua Melville
Date: Thu, 19 Sep 2019 12:27:02 +0100
Subject: [PATCH 4/5] update guidance text on node labelling
---
src/components/sections/NodeType/NodeType.js | 12 +++++++-----
src/components/sections/QuickAdd/QuickAdd.js | 3 ++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/sections/NodeType/NodeType.js b/src/components/sections/NodeType/NodeType.js
index df62cbc40..55e0f6671 100644
--- a/src/components/sections/NodeType/NodeType.js
+++ b/src/components/sections/NodeType/NodeType.js
@@ -80,11 +80,13 @@ class NodeType extends Component {
Create new node type
{ nodeTypes.length !== 0 &&
-
- Tip: ensure you create and assign a variable called "name" for this node type,
- unless you have a good reason not to. Network Canvas automatically use this
- variable as the visual label for the node in the interview.
-
+
+
+ Tip: ensure you create and assign a variable called "name" for this
+ node type, unless you have a good reason not to. Network Canvas will then
+ automatically use this variable as the label for the node in the interview.
+
+
}
diff --git a/src/components/sections/QuickAdd/QuickAdd.js b/src/components/sections/QuickAdd/QuickAdd.js
index 96f80ee01..6fc5d7cfc 100644
--- a/src/components/sections/QuickAdd/QuickAdd.js
+++ b/src/components/sections/QuickAdd/QuickAdd.js
@@ -28,7 +28,8 @@ const QuickAdd = ({
Tip: use a variable called "name" unless you have a good reason not to.
- Network Canvas will then automatically use this variable as the visual label for the node.
+ Network Canvas will then automatically use this variable as the label for the node in
+ the interview.
From 17d72809b2c4213fdd8c9a124dbbbce817c7b4d9 Mon Sep 17 00:00:00 2001
From: Joshua Melville
Date: Thu, 19 Sep 2019 12:27:51 +0100
Subject: [PATCH 5/5] update NC ref
---
network-canvas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/network-canvas b/network-canvas
index 7097a5e82..4d84ab620 160000
--- a/network-canvas
+++ b/network-canvas
@@ -1 +1 @@
-Subproject commit 7097a5e82dd418b1f993f44afd9bd839afb874c2
+Subproject commit 4d84ab6204946530a7380fde257fc374d5234fb9