Merge pull request #1226 from leoendless/hotfix/logQueryExport

fix: Fix log query export url
kubesphere · Aug 28, 2020 · 1117d54 · 1117d54
2 parents ed2fe1c + 92e2162
commit 1117d54
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/components/Cards/LogQuery/index.jsx b/src/components/Cards/LogQuery/index.jsx
@@ -227,10 +227,11 @@ class LogCollectionDetailContainers extends Component {
       : this.state
 
     const { containers: container, pods: pod } = this.store
-    const { namespaces: namespace } = this.store.pathParams
+    const { cluster, namespaces: namespace } = this.store.pathParams
 
     const link = this.store.exportLinkFactory({
       pod,
+      cluster,
       namespace,
       container,
       start_time,

diff --git a/src/components/Modals/LogSearch/Logging/Detail/index.jsx b/src/components/Modals/LogSearch/Logging/Detail/index.jsx
@@ -270,8 +270,10 @@ export default class DetailModal extends React.Component {
       endTime: end_time,
       namespaces,
     } = this.logStore
+    const { cluster } = this.props.searchInputState
 
     const link = this.logStore.exportLinkFactory({
+      cluster,
       namespaces,
       pods: pod,
       containers: container,

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

diff --git a/src/stores/logging/query.js b/src/stores/logging/query.js
@@ -20,6 +20,7 @@ import { observable, action, computed } from 'mobx'
 import { assign, get } from 'lodash'
 import { stringify } from 'qs'
 import stripAnsi from 'strip-ansi'
+import { getClusterUrl } from 'utils'
 
 import LoggingStore from './index'
 
@@ -119,8 +120,8 @@ export default class LoggingQuery extends LoggingStore {
     }))
   }
 
-  exportLinkFactory({ start_time, end_time, ...rest }) {
-    const api = this.clusterLogAPI
+  exportLinkFactory({ cluster, start_time, end_time, ...rest }) {
+    const api = getClusterUrl(this.getApiPath(cluster))
 
     return `/${api}?${stringify({
       sort: 'asc',