Fix epinio#361

richard-cox · Nov 13, 2023 · 1bea25a · 1bea25a
1 parent c3bef11
commit 1bea25a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/dashboard/pkg/epinio/models/cluster.ts b/dashboard/pkg/epinio/models/cluster.ts
@@ -2,6 +2,8 @@ import Resource from '@shell/plugins/dashboard-store/resource-class';
 import { EPINIO_TYPES } from '../types';
 import epinioAuth, { EpinioAuthConfig, EpinioAuthLocalConfig, EpinioAuthTypes } from '../utils/auth';
 
+export const EpinioInfoPath = `/api/v1/info`;
+
 export default class EpinioCluster extends Resource {
   type = EPINIO_TYPES.CLUSTER;
 
@@ -41,6 +43,10 @@ export default class EpinioCluster extends Resource {
     ];
   }
 
+  get infoUrl() {
+    return this.api + EpinioInfoPath;
+  }
+
   async logOut() {
     try {
       await epinioAuth.logout(this.createAuthConfig(EpinioAuthTypes.AGNOSTIC));

diff --git a/dashboard/pkg/epinio/pages/index.vue b/dashboard/pkg/epinio/pages/index.vue
@@ -9,15 +9,13 @@ import { EPINIO_MGMT_STORE, EPINIO_TYPES } from '../types';
 import AsyncButton from '@shell/components/AsyncButton.vue';
 import { _MERGE } from '@shell/plugins/dashboard-store/actions';
 import epinioAuth, { EpinioAuthTypes } from '../utils/auth';
-import EpinioCluster from '../models/cluster';
+import EpinioCluster, { EpinioInfoPath } from '../models/cluster';
 import PromptModal from '@shell/components/PromptModal.vue';
 
 interface Data {
   clustersSchema: any;
 }
 
-const infoUrl = `/api/v1/info`;
-
 // Data, Methods, Computed, Props
 export default Vue.extend<Data, any, any, any>({
   components: {
@@ -36,7 +34,7 @@ export default Vue.extend<Data, any, any, any>({
     return {
       clustersSchema: this.$store.getters[`${ EPINIO_MGMT_STORE }/schemaFor`](EPINIO_TYPES.CLUSTER),
       version:        null,
-      infoUrl
+      infoUrl:        EpinioInfoPath
     };
   },
 
@@ -93,7 +91,7 @@ export default Vue.extend<Data, any, any, any>({
         }
       });
 
-      this.$store.dispatch(`epinio/request`, { opt: { url: infoUrl, redirectUnauthorized: false }, clusterId: c.id })
+      this.$store.dispatch(`epinio/request`, { opt: { url: this.infoUrl, redirectUnauthorized: false }, clusterId: c.id })
         .then((res: any) => {
           Vue.set(c, 'version', res?.version);
           Vue.set(c, 'oidcEnabled', res?.oidc_enabled);
@@ -187,7 +185,7 @@ export default Vue.extend<Data, any, any, any>({
             <Link
               v-if="row.state !== 'available'"
               :row="row"
-              :value="{ text: row.api, url: infoUrl }"
+              :value="{ text: row.api, url: row.infoUrl }"
             />
             <template v-else>
               {{ row.api }}