Merge branch 'wip/store-data'

sruti · Feb 13, 2019 · 06ec320 · 06ec320
2 parents 5c98e78 + e6a7024
commit 06ec320
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 21 deletions.
diff --git a/backend-aws/handler.py b/backend-aws/handler.py
@@ -18,14 +18,11 @@ def format_response(status_code, body):
 
 def get_data(event, context):   
     response = table.get_item(Key={"dataId": "1"})
-    print(response)
     data = response.get("Item")
-    print(data)
     return format_response(200, data)
 
 def store_data(event, context):
-    print(event)  
     item = json.loads(event.get('body'))
-    item["dataId"] = "2"
+    item["dataId"] = "1"
     response = table.put_item(Item=item)
     return format_response(200, "Stored the data")
diff --git a/backend-aws/serverless.yml b/backend-aws/serverless.yml
@@ -23,12 +23,19 @@ functions:
       - http:
           path: data
           method: get
+          cors: true
   store_data:
     handler: handler.store_data
     events:
       - http:
           path: data
           method: post
+          cors:
+            origin: '*'
+            headers:
+              - Content-Type
+              - Access-Control-Allow-Origin
+              - Access-Control-Allow-Credentials
 
 resources:
  Resources:

diff --git a/frontend/api.js b/frontend/api.js
@@ -9,4 +9,23 @@ function getData() {
             } throw new Error(response.statusText)
         })
         .catch(error => { throw new Error(error.message) });
+}
+
+function storeData(data) {
+    return fetch(`${BACKEND_URL}${DATA_ENDPOINT}`,
+        {
+            method: 'POST',
+            body: JSON.stringify(data),
+            headers: {
+                'Content-Type': 'application/json',
+                "Access-Control-Allow-Origin": "*",
+                "Access-Control-Allow-Credentials": true
+            }
+        })
+        .then(response => {
+            if (response.ok) {
+                return response.json()
+            } throw new Error(response.statusText)
+        })
+        .catch(error => { throw new Error(error.message) });
 }
diff --git a/frontend/graph.js b/frontend/graph.js
@@ -1,5 +1,6 @@
 const graphElem = document.getElementById("idea-graph");
 const Graph = ForceGraph3D()(graphElem)
+var dataState = {}
 displayGraph();
 
 window.onclick = function (event) {
@@ -9,11 +10,9 @@ window.onclick = function (event) {
 }
 
 async function displayGraph() {
-    let newData
     try {
-        newData = await getData();
-        newData.nodes = newData.nodes.map(node => ({...node, tags: new Set(node.tags)}));
-        Graph.graphData(newData)
+        dataState = await getData();
+        Graph.graphData(JSON.parse(JSON.stringify(dataState)))
             .nodeLabel("name")
             .onNodeHover(node => graphElem.style.cursor = node ? "pointer" : null)
             .onNodeClick(node => {
@@ -30,7 +29,7 @@ async function displayGraph() {
             });
     }
     catch (error) {
-        console.log(error)
+        console.log(error);
     }
 }
 
@@ -42,7 +41,7 @@ function displayDetail(node) {
     const detailDescription = document.getElementById("detail-description");
 
     detailName.textContent = node.name;
-    detailTags.textContent = [...node.tags].join(', ');
+    detailTags.textContent = node.tags.filter(Boolean).toString();
     detailCreator.textContent = node.creator;
     detailDescription.textContent = node.description;
 
@@ -66,24 +65,30 @@ function onModalSubmitClick(event, form) {
     const ideaDescription = form["description"];
     const creatorName = form["creator-name"];
 
-    const { nodes, links } = Graph.graphData();
-    const id = nodes.length;
+    const id = dataState.nodes.length;
+    const newTags = new Set(ideaTags.value.split(",").map(tag => tag.trim().toLowerCase()));
 
     const newIdea = {
-        id: id,
+        id: id.toString(),
         name: ideaName.value,
-        tags: new Set(ideaTags.value.split(",").map(tag => tag.trim().toLowerCase())),
+        tags: Array.from(newTags),
         creator: creatorName.value,
         description: ideaDescription.value,
     };
-    const newLinks = matchTags(newIdea, nodes)
+    const newLinks = matchTags(newIdea, dataState.nodes)
 
-    Graph.graphData({
-        nodes: [...nodes, { ...newIdea }],
-        links: [...links, ...newLinks]
-    });
+    dataState.nodes = [...dataState.nodes, {...newIdea}]
+    dataState.links = [...dataState.links, ...newLinks]
 
+    Graph.graphData(JSON.parse(JSON.stringify(dataState)))
     form.reset();
+
+    try {
+        storeData(dataState);
+    }
+    catch (error) {
+        console.log(error);
+    }
 }
 
 function onModalCloseClick(modal) {
@@ -93,8 +98,8 @@ function onModalCloseClick(modal) {
 function matchTags(newIdea, nodes) {
     var newLinks = [];
     for (idea of nodes) {
-        var intersection = new Set([...idea.tags].filter(x => newIdea.tags.has(x)));
-        if (intersection.size != 0) {
+        var intersection = idea.tags.filter(x => newIdea.tags.includes(x));
+        if (intersection.length != 0) {
             newLinks = [...newLinks, { source: newIdea.id, target: idea.id }]
         }
     }