From 6503bb916411f788c5ca294fff929ef7fe692a8c Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Mon, 21 Sep 2020 10:17:12 -0500
Subject: [PATCH] interface: finish delete graph integration

---
 pkg/interface/src/logic/reducers/graph-update.js    |  3 ++-
 pkg/interface/src/views/apps/links/app.js           |  7 ++++++-
 .../src/views/apps/links/components/settings.js     | 13 +++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkg/interface/src/logic/reducers/graph-update.js b/pkg/interface/src/logic/reducers/graph-update.js
index 54047e72a..5589e220c 100644
--- a/pkg/interface/src/logic/reducers/graph-update.js
+++ b/pkg/interface/src/logic/reducers/graph-update.js
@@ -86,8 +86,9 @@ const removeGraph = (json, state) => {
     if (!('graphs' in state)) {
       state.graphs = {};
     }
-    let resource = data.resource.ship + '/' + data.resource.name;
+    let resource = data.ship + '/' + data.name;
     delete state.graphs[resource];
+    state.graphKeys.delete(resource);
   }
 };
 
diff --git a/pkg/interface/src/views/apps/links/app.js b/pkg/interface/src/views/apps/links/app.js
index 78ca2de2e..12dbbce92 100644
--- a/pkg/interface/src/views/apps/links/app.js
+++ b/pkg/interface/src/views/apps/links/app.js
@@ -99,7 +99,10 @@ export class LinksApp extends Component {
 
               const autoJoin = () => {
                 try {
-                  // TODO: graph join
+                  api.graph.joinGraph(
+                    `~${props.match.params.ship}`,
+                    props.match.params.name
+                  );
                   props.history.push(`/~link/${resource}`);
                 } catch(err) {
                   setTimeout(autoJoin, 2000);
@@ -121,6 +124,7 @@ export class LinksApp extends Component {
               const contactDetails = contacts[resource['group-path']] || {};
               const group = groups[resource['group-path']] || new Set([]);
               const amOwner = amOwnerOfGroup(resource['group-path']);
+              const hasGraph = !!graphs[resourcePath];
 
               return (
                 <Skeleton
@@ -138,6 +142,7 @@ export class LinksApp extends Component {
                     contacts={contacts}
                     contactDetails={contactDetails}
                     graphResource={graphKeys.has(resourcePath)}
+                    hasGraph={!!hasGraph}
                     group={group}
                     amOwner={amOwner}
                     resourcePath={resourcePath}
diff --git a/pkg/interface/src/views/apps/links/components/settings.js b/pkg/interface/src/views/apps/links/components/settings.js
index 572b3ab94..c133ea0de 100644
--- a/pkg/interface/src/views/apps/links/components/settings.js
+++ b/pkg/interface/src/views/apps/links/components/settings.js
@@ -26,8 +26,6 @@ export class SettingsScreen extends Component {
   componentDidUpdate() {
     const { props, state } = this;
 
-    console.log(props.resource);
-
     if (Boolean(state.isLoading) && !props.resource) {
       this.setState({
         isLoading: false
@@ -69,7 +67,6 @@ export class SettingsScreen extends Component {
       type: 'Deleting'
     });
 
-    console.log(props.match.params.name);
     props.api.graph.deleteGraph(props.match.params.name);
   }
 
@@ -117,12 +114,16 @@ export class SettingsScreen extends Component {
 
   render() {
     const { props, state } = this;
-
     const title = props.resource.metadata.title || props.resourcePath;
-    console.log(props);
 
-    if (!props.graphResource || !props.resource.metadata.color) {
+    if (
+      (!props.hasGraph || !props.resource.metadata.color)
+      && props.graphResource
+    ) {
       return <LoadingScreen />;
+    } else if (!props.graphResource) {
+      props.history.push('/~link');
+      return <div></div>;
     }
 
     return (