Merge pull request #15 from aMarcireau/known

Known
aMarcireau · Nov 28, 2017 · 01f006b · 01f006b
2 parents 89248e5 + 0e536d4
commit 01f006b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 4 deletions.
diff --git a/source/actions/manageMenu.js b/source/actions/manageMenu.js
@@ -100,6 +100,7 @@ export function stateToJson(state, expand) {
     return `${JSON.stringify({
         appVersion: state.appVersion,
         display: state.menu.display,
+        knownDois: Array.from(state.knownDois),
         publicationRequests: Array.from(state.publicationRequests.entries()).map(
             ([id, publicationRequest]) => {
                 const savableDoiRequest = {...publicationRequest};
@@ -135,6 +136,7 @@ export function jsonToState(json, saveFilename, previousState) {
         state.appVersion = previousState ? previousState.appVersion : undefined;
         state.colors = previousState ? previousState.colors : undefined;
         state.connected = previousState ? previousState.connected : undefined;
+        state.knownDois = new Set(state.knownDois);
         state.publicationRequests = new Map(state.publicationRequests.map(
             ([id, publicationRequest]) => [id, {
                 ...publicationRequest,

diff --git a/source/containers/Graph.js b/source/containers/Graph.js
@@ -103,10 +103,16 @@ class Graph extends React.Component {
                 if (publication.doi === node.doi) {
                     node.keep = true;
                     found = true;
-                    if (publication.status !== node.status || publication.selected !== node.selected || publication.locked !== node.locked) {
+                    if (
+                        publication.status !== node.status
+                        || publication.selected !== node.selected
+                        || nextProps.knownDois.has(publication.doi) !== node.known
+                        || publication.locked !== node.locked
+                    ) {
                         updateRequired = true;
                         node.status = publication.status;
                         node.selected = publication.selected;
+                        node.known = nextProps.knownDois.has(node.doi);
                         if (node.locked && !publication.locked) {
                             node.fx = null;
                             node.fy = null;
@@ -164,6 +170,7 @@ class Graph extends React.Component {
                     }
                 }
                 publication.keep = true;
+                publication.known = nextProps.knownDois.has(publication.doi);
                 this.nodes.push(publication);
             }
         }
@@ -230,7 +237,6 @@ class Graph extends React.Component {
             .attr('stroke', this.props.colors.secondaryContent)
         ;
         d3NodeGroup.append('circle')
-            .attr('r', 20)
             .attr('class', 'publication')
         ;
         d3NodeGroup.append('text')
@@ -287,6 +293,9 @@ class Graph extends React.Component {
                     )
                 )
             ))
+            .attr('r', node => node.known ? '20' : '19')
+            .attr('stroke', this.props.colors.active)
+            .attr('stroke-width', node => node.known ? '0' : '2')
             .on('mouseover', function(node) {
                 d3.select(this).attr('fill', colors.active);
             })
@@ -451,6 +460,7 @@ export default connect(
                 : []
             ),
             recommandedDois,
+            knownDois: state.knownDois,
             display: state.menu.display,
             sticky: state.graph.sticky,
             colors: state.colors,

diff --git a/source/containers/PublicationsList.js b/source/containers/PublicationsList.js
@@ -50,7 +50,10 @@ class PublicationsList extends React.Component {
                                 style={{
                                     width: '100%',
                                     height: '50px',
-                                    padding: '6px',
+                                    paddingTop: '6px',
+                                    paddingRight: '6px',
+                                    paddingBottom: '6px',
+                                    paddingLeft: element.isKnown ? '6px' : '4px',
                                     backgroundColor: (element.selected ?
                                         this.props.colors.active
                                         : (element.isCiting ?
@@ -65,6 +68,7 @@ class PublicationsList extends React.Component {
                                         )
                                     ),
                                     borderBottom: `1px solid ${this.props.colors.sideSeparator}`,
+                                    borderLeft: element.isKnown ? 'none': `2px solid ${this.props.colors.active}`,
                                     cursor: 'pointer',
                                     ':hover': {
                                         backgroundColor: this.props.colors.active,
@@ -176,6 +180,7 @@ export default connect(
                 doi,
                 isCiting: doisCitingSelected.has(doi),
                 isCited: doisCitedBySelected.has(doi),
+                isKnown: state.knownDois.has(doi),
             }}
         ).sort(
             (firstPublication, secondPublication) => {

diff --git a/source/package.json b/source/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Origami",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "main": "main.js",
     "private": true,
     "devDependencies": {

diff --git a/source/reducers/knownDois.js b/source/reducers/knownDois.js
@@ -0,0 +1,17 @@
+import {
+    SELECT_PUBLICATION,
+} from '../constants/actionTypes'
+
+export default function knownDois(state = new Set(), action) {
+    switch (action.type) {
+        case SELECT_PUBLICATION:
+            if (state.has(action.doi)) {
+                return state;
+            }
+            const newState = new Set(state);
+            newState.add(action.doi);
+            return newState;
+        default:
+            return state;
+    }
+}
diff --git a/source/reducers/origami.js b/source/reducers/origami.js
@@ -1,6 +1,7 @@
 import {combineReducers} from 'redux'
 import bibtexRequests from './bibtexRequests'
 import connected from './connected'
+import knownDois from './knownDois'
 import publicationRequests from './publicationRequests'
 import graph from './graph'
 import menu from './menu'
@@ -83,6 +84,7 @@ export default function(state, action) {
             bibtexRequests: (state = new Map()) => state,
             colors: (state = {}) => state,
             connected,
+            knownDois,
             publicationRequests: (state = new Map()) => state,
             graph,
             menu,