From 259929bbe9acb040ba6ab6492abaf1a2a82e438c Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Fri, 10 Jan 2020 19:47:48 -0500
Subject: [PATCH] add stop/delete network support in ui

---
 .../resources/account/AccountOwnedResource.java   | 15 +++++++++++----
 .../resources/bill/AccountPlansResource.java      |  7 +++++++
 .../bubble/resources/cloud/NetworksResource.java  |  5 +++++
 .../server/post_auth/ResourceMessages.properties  |  3 +--
 bubble-web                                        |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/resources/account/AccountOwnedResource.java b/bubble-server/src/main/java/bubble/resources/account/AccountOwnedResource.java
index 5c1bf05d..744e13cb 100644
--- a/bubble-server/src/main/java/bubble/resources/account/AccountOwnedResource.java
+++ b/bubble-server/src/main/java/bubble/resources/account/AccountOwnedResource.java
@@ -131,6 +131,7 @@ public class AccountOwnedResource<E extends HasAccount, DAO extends AccountOwned
     }
 
     protected E findAlternate(ContainerRequest ctx, E request) { return null; }
+    protected E findAlternate(ContainerRequest ctx, String id) { return null; }
 
     protected Object daoCreate(E toCreate) { return getDao().create(toCreate); }
 
@@ -141,8 +142,11 @@ public class AccountOwnedResource<E extends HasAccount, DAO extends AccountOwned
                            @PathParam("id") String id,
                            E request) {
         final Account caller = checkEditable(ctx);
-        final E found = find(ctx, id);
-        if (found == null) return notFound(id);
+        E found = find(ctx, id);
+        if (found == null) {
+            found = findAlternate(ctx, id);
+            if (found == null) return notFound(id);
+        }
         if (!(found instanceof HasAccountNoName) && !canChangeName() && request.hasName() && !found.getName().equals(request.getName())) {
             return notFound(id+"/"+request.getName());
         }
@@ -158,8 +162,11 @@ public class AccountOwnedResource<E extends HasAccount, DAO extends AccountOwned
     public Response delete(@Context ContainerRequest ctx,
                            @PathParam("id") String id) {
         final Account caller = checkEditable(ctx);
-        final E found = find(ctx, id);
-        if (found == null) return notFound(id);
+        E found = find(ctx, id);
+        if (found == null) {
+            found = findAlternate(ctx, id);
+            if (found == null) return notFound(id);
+        }
 
         if (!canDelete(ctx, caller, found)) return forbidden();
 
diff --git a/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java b/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
index 79044b1d..980d81bf 100644
--- a/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
+++ b/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
@@ -56,6 +56,13 @@ public class AccountPlansResource extends AccountOwnedResource<AccountPlan, Acco
         return getDao().findByAccountAndNotDeleted(account.getUuid());
     }
 
+    @Override protected AccountPlan findAlternate(ContainerRequest ctx, String id) {
+        // id might be a network uuid
+        final String accountUuid = getAccountUuid(ctx);
+        final BubbleNetwork network = networkDAO.findByAccountAndId(accountUuid, id);
+        return network == null ? null : getDao().findByAccountAndNetwork(accountUuid, network.getUuid());
+    }
+
     @Override protected boolean canCreate(Request req, ContainerRequest ctx, Account caller, AccountPlan request) {
         // ensure caller is not from a disallowed country
         if (configuration.hasDisallowedCountries()) {
diff --git a/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java b/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
index f5f63ea2..bb546d3d 100644
--- a/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
+++ b/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
@@ -99,6 +99,11 @@ public class NetworksResource extends AccountOwnedResource<BubbleNetwork, Bubble
         return false;
     }
 
+    @Override protected boolean canDelete(ContainerRequest ctx, Account caller, BubbleNetwork found) {
+        // delete networks through plans
+        return false;
+    }
+
     @GET @Path("/{id}"+EP_CLOSEST)
     public Response findClosest(@Context Request req,
                                 @Context ContainerRequest ctx,
diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
index 16d06fb2..b78d390d 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
+++ b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
@@ -167,10 +167,9 @@ label_field_networks_locale=Locale
 label_field_networks_timezone=Time Zone
 label_field_networks_object_state=State
 label_field_networks_action_view=View
-label_field_networks_action_start_stop=Start/Stop
+label_field_networks_action_stop=Stop
 label_field_networks_action_delete=Delete
 table_row_networks_action_view=View
-table_row_networks_action_start=Start
 table_row_networks_action_stop=Stop
 table_row_networks_action_delete=Delete
 button_label_new_network=Create Bubble
diff --git a/bubble-web b/bubble-web
index 0f3b3816..e8c5f6c8 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit 0f3b38169089cad36ce86a0b468293d1ca6c2169
+Subproject commit e8c5f6c80992169184d4a17c1c65bfc5424a0686