From ed1ea6373f2953091fd9ba77d89c579bacbe878c Mon Sep 17 00:00:00 2001
From: Cody Jackson <sxenog@gmail.com>
Date: Wed, 13 May 2020 17:44:20 -0700
Subject: [PATCH] Remove custom VueRouter.resolve

replace and push both work  as intended. You can
specify a a full url  if you don't want to have the baseUrl
prepended. Better yet, if you're navigating within
the app it's better to specify a location.

The custom resolve was actually breakinging a huge
amount of links in the app which was caused 404s if a
user attempted to open a link in a new tab. Most things appeared to work presumably because vue-router
was handling the page switches instead of the browser.

rancher/dashboard#643
---
 components/formatter/IngressTarget.vue     |  2 +-
 components/formatter/LinkDetail.vue        |  6 +-
 components/formatter/LinkDetailImage.vue   |  2 +-
 components/formatter/SecretType.vue        |  2 +-
 models/app.js                              | 13 ++--
 models/apps/rancher-gatekeeper-operator.js | 30 +++++----
 models/rio.cattle.io.service.js            | 12 ++--
 plugins/extend-router.js                   | 14 -----
 plugins/steve/resource-instance.js         | 72 ++++++++++------------
 9 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/components/formatter/IngressTarget.vue b/components/formatter/IngressTarget.vue
index 963f9a12d0..9d3495b603 100644
--- a/components/formatter/IngressTarget.vue
+++ b/components/formatter/IngressTarget.vue
@@ -84,7 +84,7 @@ export default {
       const id = `${ this.namespace }/${ serviceName }`;
 
       return isTargetsWorkload
-        ? this.findWorkload(id)?.detailUrl || ''
+        ? this.findWorkload(id)?.detailLocation || ''
         : {
           resource:  SERVICE,
           id:        serviceName,
diff --git a/components/formatter/LinkDetail.vue b/components/formatter/LinkDetail.vue
index 5c4329c100..c26d8b573e 100644
--- a/components/formatter/LinkDetail.vue
+++ b/components/formatter/LinkDetail.vue
@@ -27,7 +27,7 @@ export default {
         return get(this.row, this.opts.reference);
       }
 
-      return this.row?.detailUrl;
+      return this.row?.detailLocation;
     },
   }
 };
@@ -35,8 +35,8 @@ export default {
 
 <template>
   <span>
-    <nuxt-link :to="to">
+    <n-link :to="to">
       {{ value }}
-    </nuxt-link>
+    </n-link>
   </span>
 </template>
diff --git a/components/formatter/LinkDetailImage.vue b/components/formatter/LinkDetailImage.vue
index 891f5b5187..1c0eb0e909 100644
--- a/components/formatter/LinkDetailImage.vue
+++ b/components/formatter/LinkDetailImage.vue
@@ -20,7 +20,7 @@ export default {
 
 <template>
   <span>
-    <nuxt-link :to="row.detailUrl">
+    <nuxt-link :to="row.detailLocation">
       {{ value }}
     </nuxt-link>
     <br />
diff --git a/components/formatter/SecretType.vue b/components/formatter/SecretType.vue
index 882ff67178..ab5b13abd9 100644
--- a/components/formatter/SecretType.vue
+++ b/components/formatter/SecretType.vue
@@ -21,7 +21,7 @@ export default {
       const serviceAccount = await this.$store.dispatch('cluster/find', { type: SERVICE_ACCOUNT, id: this.value.serviceAccountID });
 
       if (serviceAccount) {
-        this.serviceAccountLink = serviceAccount.detailUrl;
+        this.serviceAccountLink = serviceAccount.detailLocation;
       }
     }
   }
diff --git a/models/app.js b/models/app.js
index cffcb48918..4bb5789500 100644
--- a/models/app.js
+++ b/models/app.js
@@ -1,16 +1,21 @@
-import { addParams } from '@/utils/url';
 import { MODE, _EDIT } from '@/config/query-params';
 
 export default {
   appEditUrl() {
-    return this.detailUrl();
+    return this.detailLocation;
   },
 
   goToEdit() {
     return (moreQuery = {}) => {
-      const url = addParams(this.appEditUrl, { [MODE]: _EDIT, ...moreQuery });
+      const location = this.appEditUrl;
 
-      this.currentRouter().push({ path: url });
+      location.query = {
+        ...location.query,
+        [MODE]: _EDIT,
+        ...moreQuery
+      };
+
+      this.currentRouter().push(location);
     };
   },
 };
diff --git a/models/apps/rancher-gatekeeper-operator.js b/models/apps/rancher-gatekeeper-operator.js
index 19265557a1..6478a4d445 100644
--- a/models/apps/rancher-gatekeeper-operator.js
+++ b/models/apps/rancher-gatekeeper-operator.js
@@ -1,5 +1,4 @@
 import { MODE, _CREATE } from '@/config/query-params';
-import { addParams } from '@/utils/url';
 import { GATEKEEPER_CONSTRAINT_TEMPLATE } from '@/config/types';
 import { downloadFile } from '@/utils/download';
 
@@ -45,25 +44,30 @@ export default {
 
   goToAddConstraint() {
     return (moreQuery = {}) => {
-      const constraintUrl = this.currentRouter().resolve({ name: 'c-cluster-gatekeeper-constraints-create' }).href;
-      const url = addParams(constraintUrl, {
-        [MODE]:   _CREATE,
-        ...moreQuery
-      });
+      const location = {
+        name:  'c-cluster-gatekeeper-constraints-create',
+        query: {
+          [MODE]:   _CREATE,
+          ...moreQuery
+        }
+      };
 
-      this.currentRouter().push({ path: url });
+      this.currentRouter().push(location);
     };
   },
 
   goToAddTemplate() {
     return (moreQuery = {}) => {
-      const constraintUrl = this.currentRouter().resolve({ name: 'c-cluster-resource-create', params: { resource: GATEKEEPER_CONSTRAINT_TEMPLATE } }).href;
-      const url = addParams(constraintUrl, {
-        [MODE]:   _CREATE,
-        ...moreQuery
-      });
+      const location = {
+        name:   'c-cluster-resource-create',
+        params: { resource: GATEKEEPER_CONSTRAINT_TEMPLATE },
+        query:  {
+          [MODE]:   _CREATE,
+          ...moreQuery
+        }
+      };
 
-      this.currentRouter().push({ path: url });
+      this.currentRouter().push(location);
     };
   },
 
diff --git a/models/rio.cattle.io.service.js b/models/rio.cattle.io.service.js
index c9e4708486..59acf228eb 100644
--- a/models/rio.cattle.io.service.js
+++ b/models/rio.cattle.io.service.js
@@ -5,7 +5,6 @@ import {
 } from '@/config/query-params';
 import { escapeHtml } from '@/utils/string';
 import { DATE_FORMAT, TIME_FORMAT } from '@/store/prefs';
-import { addParams } from '@/utils/url';
 import { PRIVATE } from '@/plugins/steve/resource-proxy';
 import { RIO } from '@/config/types';
 import { formatSi } from '@/utils/units';
@@ -411,15 +410,16 @@ export default {
   },
 
   goToStage() {
-    const router = this.currentRouter();
-
     return (moreQuery = {}) => {
-      const url = addParams(this.detailUrl, {
+      const location = this.detailLocation;
+
+      location.query = {
+        ...location.query,
         [MODE]:  _STAGE,
         ...moreQuery
-      });
+      };
 
-      router.push({ path: url });
+      this.currentRouter().push(location);
     };
   },
 
diff --git a/plugins/extend-router.js b/plugins/extend-router.js
index 0e0541d7a1..2118ccd20a 100644
--- a/plugins/extend-router.js
+++ b/plugins/extend-router.js
@@ -1,20 +1,6 @@
 import VueRouter from 'vue-router';
 import { isEqual } from 'lodash';
 
-const _resolve = VueRouter.prototype.resolve;
-
-// Resolve returns URLs that include the base URL, which then gets added again
-// by router.replace or router.push.  So don't do that.
-VueRouter.prototype.resolve = function() {
-  const out = _resolve.apply(this, arguments);
-
-  if ( this.options.base ) {
-    out.href = out.href.substr(this.options.base.length).replace(/^\/*/, '/');
-  }
-
-  return out;
-};
-
 VueRouter.prototype.applyQuery = function(qp, defaults = {}) {
   const query = queryParamsFor(this.currentRoute.query, qp, defaults);
 
diff --git a/plugins/steve/resource-instance.js b/plugins/steve/resource-instance.js
index 7b33485579..eb74084956 100644
--- a/plugins/steve/resource-instance.js
+++ b/plugins/steve/resource-instance.js
@@ -9,7 +9,6 @@ import {
 } from '@/config/query-params';
 import { findBy } from '@/utils/array';
 import { DEV } from '@/store/prefs';
-import { addParams } from '@/utils/url';
 import { DESCRIPTION } from '@/config/labels-annotations';
 
 const REMAP_STATE = { disabled: 'inactive' };
@@ -657,76 +656,73 @@ export default {
     };
   },
 
-  detailUrl() {
-    const router = this.currentRouter();
+  detailLocation() {
     const schema = this.$getters['schemaFor'](this.type);
 
-    const route = `c-cluster-resource${ schema?.attributes?.namespaced ? '-namespace' : '' }-id`;
-
-    const params = {
-      resource:  this.type,
-      namespace: this.metadata && this.metadata.namespace,
-      id:        this.metadata.name
-    };
-
-    const url = router.resolve({
-      name:   route,
-      params,
-    }).href;
-
-    return url;
-  },
-
-  goToClone() {
-    return (moreQuery = {}) => {
-      const url = addParams(this.detailUrl, {
-        [MODE]:  _CLONE,
-        ...moreQuery
-      });
-
-      this.currentRouter().push({ path: url });
+    return {
+      name:   `c-cluster-resource${ schema?.attributes?.namespaced ? '-namespace' : '' }-id`,
+      params: {
+        resource:  this.type,
+        namespace: this.metadata && this.metadata.namespace,
+        id:        this.metadata.name
+      }
     };
   },
 
   goToEdit() {
     return (moreQuery = {}) => {
-      const url = addParams(this.detailUrl, { [MODE]: _EDIT, ...moreQuery });
+      const location = this.detailLocation;
 
-      this.currentRouter().push({ path: url });
+      location.query = {
+        ...location.query,
+        [MODE]: _EDIT,
+        ...moreQuery
+      };
+
+      this.currentRouter().push(location);
     };
   },
 
   goToEditYaml() {
     return () => {
-      const url = addParams(this.detailUrl, {
+      const location = this.detailLocation;
+
+      location.query = {
+        ...location.query,
         [MODE]:      _EDIT,
         [AS_YAML]: _FLAGGED
-      });
+      };
 
-      this.currentRouter().push({ path: url });
+      this.currentRouter().push(location);
     };
   },
 
   goToViewYaml() {
     return () => {
-      const url = addParams(this.detailUrl, {
+      const location = this.detailLocation;
+
+      location.query = {
+        ...location.query,
         [MODE]:      _VIEW,
         [AS_YAML]: _FLAGGED
-      });
+      };
 
-      this.currentRouter().push({ path: url });
+      this.currentRouter().push(location);
     };
   },
 
   cloneYaml() {
     return (moreQuery = {}) => {
-      const url = addParams(this.detailUrl, {
+      const location = this.detailLocation;
+
+      location.query = {
+        ...location.query,
         [MODE]:      _CLONE,
         [AS_YAML]: _FLAGGED,
         ...moreQuery
-      });
+      };
 
-      this.currentRouter().push({ path: url });
+      this.currentRouter().push(location);
     };
   },