From 2e2292e9ca8b6ea5096e3d5e59f440e0e415f8e3 Mon Sep 17 00:00:00 2001
From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Tue, 19 Nov 2019 12:29:51 -0700
Subject: [PATCH] destination dropdown is namespace specific

---
 .../rio.cattle.io.v1.router/Destination.vue   | 51 +++++++++++--------
 .../cru/rio.cattle.io.v1.router/Rule.vue      |  5 ++
 .../cru/rio.cattle.io.v1.router/index.vue     |  1 +
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/components/cru/rio.cattle.io.v1.router/Destination.vue b/components/cru/rio.cattle.io.v1.router/Destination.vue
index 349c2b93ce..dddb06dec7 100644
--- a/components/cru/rio.cattle.io.v1.router/Destination.vue
+++ b/components/cru/rio.cattle.io.v1.router/Destination.vue
@@ -11,6 +11,10 @@ export default {
         return {};
       }
     },
+    namespace: {
+      type:    String,
+      default: 'default'
+    },
     isWeighted: {
       type:    Boolean,
       default: false
@@ -32,17 +36,15 @@ export default {
       default: () => ['App', 'Version', 'Port', 'Weight']
     }
   },
-
   data() {
     const {
-      namespace = 'default', port = '', app = '', uuid, version = ''
+      port = '', app = '', uuid, version = ''
     } = this.spec;
 
     return {
+      services: [],
       version,
       uuid,
-      apps:     [],
-      namespace,
       port,
       app,
       weight:     '',
@@ -60,30 +62,25 @@ export default {
       };
     },
     versions() {
-      if (this.app && !isEmpty(this.apps)) {
-        return this.apps[this.app].map(service => service.version);
+      if (this.app && !isEmpty(this.appsInNS)) {
+        return this.appsInNS[this.app].map(service => service.version);
       } else {
         return [];
       }
     },
-  },
-  mounted() {
-    this.getServices();
-  },
-  methods: {
-    async getServices() {
-      const services = await this.$store.dispatch('cluster/findAll', { type: RIO.SERVICE });
-      const servicesinNS = [];
+    servicesInNS() {
+      if (!this.services) {
+        return [];
+      }
 
-      services.forEach((service) => {
-        if ( get(service, 'metadata.namespace') === this.namespace) {
-          servicesinNS.push(service);
-        }
+      return this.services.filter((service) => {
+        return service.metadata.namespace === this.namespace;
       });
-
+    },
+    appsInNS() {
       const apps = {};
 
-      servicesinNS.forEach((service) => {
+      this.servicesInNS.forEach((service) => {
         if (!apps[service.app]) {
           apps[service.app] = [service];
         } else {
@@ -91,7 +88,17 @@ export default {
         }
       });
 
-      this.apps = apps;
+      return apps;
+    }
+  },
+  mounted() {
+    this.getServices();
+  },
+  methods: {
+    async getServices() {
+      const services = await this.$store.dispatch('cluster/findAll', { type: RIO.SERVICE });
+
+      this.services = services;
     },
     setApp(app) {
       this.app = app;
@@ -112,7 +119,7 @@ export default {
         class="inline"
         :clearable="false"
         :value="app"
-        :options="Object.keys(apps)"
+        :options="Object.keys(appsInNS)"
         :placeholder="showPlaceholders ? placeholders[0] : null"
         @input="setApp"
       ></v-select>
diff --git a/components/cru/rio.cattle.io.v1.router/Rule.vue b/components/cru/rio.cattle.io.v1.router/Rule.vue
index 14be764e94..38c0620589 100644
--- a/components/cru/rio.cattle.io.v1.router/Rule.vue
+++ b/components/cru/rio.cattle.io.v1.router/Rule.vue
@@ -23,6 +23,10 @@ export default {
       default: () => {
         return {};
       }
+    },
+    namespace: {
+      type:    String,
+      default: null
     }
   },
   data() {
@@ -167,6 +171,7 @@ export default {
             <Destination
               v-for="(destination, i) in to"
               :key="destination.uuid"
+              :namespace="namespace"
               :is-weighted="to.length>1"
               :spec="destination"
               :can-remove="to.length>1"
diff --git a/components/cru/rio.cattle.io.v1.router/index.vue b/components/cru/rio.cattle.io.v1.router/index.vue
index 23693a4559..bb05ea9fb9 100644
--- a/components/cru/rio.cattle.io.v1.router/index.vue
+++ b/components/cru/rio.cattle.io.v1.router/index.vue
@@ -81,6 +81,7 @@ export default {
         <Rule
           v-for="(route, i) in routes"
           :key="route.uuid"
+          :namespace="value.metadata.namespace"
           :position="i"
           class="col span-12"
           :spec="route"