fix: Fix log search api

kubesphere · Jun 8, 2020 · 4ecfb6d · 4ecfb6d
1 parent 0f3c8da
commit 4ecfb6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/components/Modals/LogSearch/index.jsx b/src/components/Modals/LogSearch/index.jsx
@@ -40,10 +40,12 @@ export default class LogSearchModal extends React.Component {
 
   @computed
   get clustersOpts() {
-    return this.clusters.list.data.map(({ name }) => ({
-      value: name,
-      label: `${t('Cluster')}: ${name}`,
-    }))
+    return this.clusters.list.data
+      .filter(item => item.configz.logging)
+      .map(({ name }) => ({
+        value: name,
+        label: `${t('Cluster')}: ${name}`,
+      }))
   }
 
   initStepState() {
@@ -125,9 +127,10 @@ export default class LogSearchModal extends React.Component {
   async componentDidMount() {
     await this.clusters.fetchList({
       limit: -1,
+      ascending: true,
     })
 
-    this.searchInputState.setCluster(this.clusters.list.data[0].name)
+    this.searchInputState.setCluster(this.clustersOpts[0].value)
   }
 
   render() {

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -463,7 +463,7 @@ export const isAppsPage = (path = location.pathname) =>
 export const getClusterUrl = url => {
   let requestURL = url
 
-  const reg = new RegExp(/\/(api|apis|kapis)\/(.*)\/(klusters\/[^/]*)\/(.*)/)
+  const reg = new RegExp(/\/(api|apis|kapis)\/(.*)\/?(klusters\/[^/]*)\/(.*)/)
   const match = requestURL.match(reg)
 
   if (match && match.length === 5) {

diff --git a/src/utils/object.mapper.js b/src/utils/object.mapper.js
@@ -942,6 +942,7 @@ const ClusterMapper = item => {
   return {
     ...getBaseInfo(item),
     conditions,
+    configz: get(item, 'status.configz', {}),
     provider: get(item, 'spec.provider'),
     isHost:
       get(