Merge branch 'master' into tests/is-graph-acyclic

project-orion · Dec 4, 2017 · e54a878 · e54a878
2 parents 1106e07 + 5c9b60e
commit e54a878
Show file tree

Hide file tree

Showing 13 changed files with 597 additions and 9 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -8,6 +8,7 @@
     "dependencies": {
         "@blueprintjs/core": "^1.25.0",
         "@types/chart.js": "^2.6.2",
+        "@types/csv-parse": "^1.1.11",
         "@types/d3": "^4.10.0",
         "@types/lodash": "^4.14.71",
         "@types/node": "^8.0.16",
@@ -26,6 +27,7 @@
         "chart.js": "^2.6.0",
         "classnames": "^2.2.5",
         "css-loader": "^0.28.4",
+        "csv-parse": "^2.0.0",
         "d3": "^4.10.2",
         "express": "^4.15.3",
         "extract-text-webpack-plugin": "^3.0.0",

diff --git a/app/src/application/actions.tsx b/app/src/application/actions.tsx
@@ -27,6 +27,39 @@ export function removeConcept(container: string, index: number): action {
     }
 }
 
+export function testFetch(fileNames: string[], container: string, url: string): action {
+    return {
+        type: 'FETCH_TEST',
+        promise: (dispatch, getState) => {
+            dispatch(loading(container))
+
+            return Promise.all(fileNames.map((fileName: string) => {
+                return fetch(url + fileName)
+                    .then((response: any) => {
+                        return response.text()
+                    })
+                    .then((response: any) => {
+                        dispatch(receivedTest(response, container, fileName))
+                    }).catch((err: any) => {
+                        dispatch(fetchFailed(err, container))
+                    })
+            }))
+        },
+        container: container,
+    }
+}
+
+export function receivedTest(response: concept, container: string, fileName: string): action {
+    return {
+        type: 'FETCH_TEST_SUCCESS',
+        value: {
+            fileName,
+            response,
+        },
+        container: container,
+    }
+}
+
 export function fetchConcept(url: string, container: string, index: number=null): action {
     return {
         type: 'FETCH_CONCEPT',
@@ -38,7 +71,7 @@ export function fetchConcept(url: string, container: string, index: number=null)
             }).then( (json: concept) => {
                 dispatch(receivedSlug(json, container, index))
             }).catch( (err: any) => {
-                console.log(err);
+                console.log(err)
                 dispatch(fetchFailed(err, container))
             })
         },

diff --git a/...cation/components/d3Blocks/ConceptNav.tsx → ...cation/components/d3Blocks/conceptNav.tsx b/...cation/components/d3Blocks/ConceptNav.tsx → ...cation/components/d3Blocks/conceptNav.tsx
diff --git a/app/src/application/components/d3Blocks/sunburst.less b/app/src/application/components/d3Blocks/sunburst.less
@@ -0,0 +1,29 @@
+@import '~@blueprintjs/core/dist/variables.less';
+
+path {
+    stroke: @dark-gray4;
+    stroke-width: 2px;
+    stroke-opacity: 1;
+}
+
+#breadcrumb {
+    height: 18px;
+    font-size: 15px;
+}
+#info {
+    text-anchor: middle;
+
+    text {
+        fill: #e7e7e7;
+    }
+
+    #header {
+        alignment-baseline: baseline;
+        font-size: 18px;
+    }
+
+    #sub {
+        alignment-baseline: hanging;
+        font-size: 13px;
+    }
+}