Merge pull request #5 from NLeSC/categoricalcolors

Categoricalcolors
NLeSC · May 24, 2017 · e793a46 · e793a46
2 parents 171940e + 3833b5f
commit e793a46
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "case-law-app-js",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "private": true,
     "homepage": "https://nlesc.github.io/case-law-app",
     "devDependencies": {

diff --git a/src/App.js b/src/App.js
@@ -28,7 +28,7 @@ class App extends React.Component {
             activeNode: {},
             filterState: {
                 sizeAttributeValue: "degree",
-                colorAttributeValue: "community",
+                colorAttributeValue: "none",
                 adjustLayout: false,
                 filterSelected: false
             },
@@ -91,7 +91,7 @@ class App extends React.Component {
             filterState.creatorValue = filterState.creatorValue || "all";
             filterState.communityValue = filterState.communityValue || "all";
             filterState.sizeAttributeValue = filterState.sizeAttributeValue || "degree";
-            filterState.colorAttributeValue = filterState.colorAttributeValue || "creator";
+            filterState.colorAttributeValue = filterState.colorAttributeValue || "none";
             return {
                 filterState: filterState
             };
@@ -144,16 +144,16 @@ class App extends React.Component {
         } = this.state;
         const title = data.title || "Network";
         const version = require('./../package.json').version;
-        const version_url = "https://github.com/NLeSC/case-law-app/releases/tag/v" + version;
+        const version_url = "https://github.com/NLeSC/case-law-app/releases";
         return (
             <div className="App">
                 <div className="App-header">
                     <div className="App-title">
                       <h3>Case Law Analytics - {title}</h3>
                     </div>
                     <div className="App-info">
-                      <p><a href={version_url}>Version {version}</a></p>
-                     <p> <a href="https://github.com/NLeSC/case-law-app">Source code</a> </p>
+                      <p><a href={version_url} target="_blank">Version {version}</a></p>
+                     <p> <a href="https://github.com/NLeSC/case-law-app" target="_blank">Source code</a> </p>
                     </div>
                 </div>
 

diff --git a/src/components/ColorOnAttribute.js b/src/components/ColorOnAttribute.js
@@ -30,7 +30,17 @@ class ColorOnAttribute extends React.Component {
         const s = props.sigma;
         const att = props.attribute;
         const nodes = s.graph.nodes();
-        if (nodes.length > 0) {
+        if (att === 'none') {
+            nodes.forEach(node => {
+                node.color_selected = 'green';
+                node.color_unselected = 'black';
+                if (node.selected) {
+                    node.color = node.color_selected;
+                } else {
+                    node.color = node.color_unselected;
+                }
+            });
+        } else if (nodes.length > 0) {
             if (typeof nodes[0][att] === 'string') {
                 this.updateColorCategorical(nodes, att);
             } else {

diff --git a/src/components/FilterPane.js b/src/components/FilterPane.js
@@ -204,6 +204,7 @@ class FilterPane extends Component {
                         <div>
                           <h4>Node Color</h4>
                           <select value={colorAttributeValue} onChange={this.handleColorAttributeChange}>
+                            <option value="none">none</option>
                             {listColorAttributes}
                           </select>
                         </div>