fix: Fix api for single cluster

kubesphere · Jun 4, 2020 · 765edd6 · 765edd6
1 parent fab97d0
commit 765edd6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/src/components/Terminal/index.jsx b/src/components/Terminal/index.jsx
@@ -18,7 +18,7 @@
 
 import React, { lazy, Suspense, Component } from 'react'
 import { observer } from 'mobx-react'
-import { getWebSocketProtocol } from 'utils'
+import { getWebSocketProtocol, getClusterUrl } from 'utils'
 
 const ContainerTerminal = lazy(() =>
   import(/* webpackChunkName: "terminal" */ './terminal')
@@ -31,7 +31,7 @@ export default class SessionTerminal extends Component {
   get url() {
     return `${getWebSocketProtocol(window.location.protocol)}://${
       window.location.host
-    }/${this.props.url}`
+    }${getClusterUrl(`/${this.props.url}`)}`
   }
 
   resizeTerminal = () => {

diff --git a/src/pages/workspaces/components/Modals/WorkspaceCreate/index.jsx b/src/pages/workspaces/components/Modals/WorkspaceCreate/index.jsx
@@ -60,6 +60,17 @@ export default class WorkspaceCreateModal extends React.Component {
   }
 
   get steps() {
+    if (!globals.app.isMultiCluster) {
+      return [
+        {
+          title: 'Basic Info',
+          component: BaseInfo,
+          required: true,
+          isForm: true,
+        },
+      ]
+    }
+
     return [
       {
         title: 'Basic Info',

diff --git a/src/stores/logging/index.js b/src/stores/logging/index.js
@@ -48,7 +48,7 @@ export default class LoggingStore {
 
   getApiPath(cluster) {
     return cluster
-      ? `kapis/clusters/${cluster}/tenant.kubesphere.io/v1alpha2/logs`
+      ? `kapis/klusters/${cluster}/tenant.kubesphere.io/v1alpha2/logs`
       : 'kapis/tenant.kubesphere.io/v1alpha2/logs'
   }
 

diff --git a/src/stores/terminal.js b/src/stores/terminal.js
@@ -25,9 +25,9 @@ export default class TerminalStore {
   @computed
   get kubeWebsocketUrl() {
     const { cluster, namespace, pod, container, shell = 'sh' } = this.kubectl
-    return `kapis${this.getClusterPath({
+    return `kapis/terminal.kubesphere.io/v1alpha2${this.getClusterPath({
       cluster,
-    })}/terminal.kubesphere.io/v1alpha2/namespaces/${namespace}/pods/${pod}?container=${container}&shell=${shell}`
+    })}/namespaces/${namespace}/pods/${pod}?container=${container}&shell=${shell}`
   }
 
   @observable
@@ -51,16 +51,16 @@ export default class TerminalStore {
   }
 
   getClusterPath({ cluster } = {}) {
-    return cluster ? `/clusters/${cluster}` : ''
+    return cluster ? `/klusters/${cluster}` : ''
   }
 
   @action
   async fetchKubeCtl({ cluster }) {
     this.kubectl.isLoading = true
     const result = await request.get(
-      `kapis${this.getClusterPath({
+      `kapis/resources.kubesphere.io/v1alpha2${this.getClusterPath({
         cluster,
-      })}/resources.kubesphere.io/v1alpha2/users/${this.username}/kubectl`,
+      })}/users/${this.username}/kubectl`,
       null,
       null,
       this.reject
@@ -75,9 +75,9 @@ export default class TerminalStore {
   @action
   async fetchKubeConfig(params) {
     const result = await request.get(
-      `kapis${this.getClusterPath(
+      `kapis/resources.kubesphere.io/v1alpha2${this.getClusterPath(
         params
-      )}/resources.kubesphere.io/v1alpha2/users/${this.username}/kubeconfig`
+      )}/users/${this.username}/kubeconfig`
     )
     this.kubeconfig = result
   }