fix: Fix cluster filter in eventSearch and auditingSearch

src/components/Modals/AuditingSearch/Auditing/Detail/index.jsx

@@ -344,6 +344,8 @@ export default class Detail extends React.PureComponent {
     })
   }
 
+  clusterRenderer = option => `${t('Cluster')}: ${option.label}`
+
   renderSearchBar() {
     const { searchInputState, clustersOpts } = this.props
     return (
@@ -353,10 +355,10 @@ export default class Detail extends React.PureComponent {
             value={searchInputState.cluster}
             onChange={this.changeClusterChange}
             className={styles.queryModeOptions}
+            valueRenderer={this.clusterRenderer}
             options={clustersOpts}
           />
         </span>
-
         <SearchInput
           className={styles.searchInput}
           placeholder={t('search condition')}

src/components/Modals/AuditingSearch/Auditing/Home/index.jsx

@@ -1,3 +1,21 @@
+/*
+ * This file is part of KubeSphere Console.
+ * Copyright (C) 2019 The KubeSphere Console Authors.
+ *
+ * KubeSphere Console is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KubeSphere Console is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import React from 'react'
 import { action, toJS } from 'mobx'
 import { observer } from 'mobx-react'
@@ -108,6 +126,8 @@ export default class Home extends React.Component {
     )
   }
 
+  clusterRenderer = option => `${t('Cluster')}: ${option.label}`
+
   renderSearchBar() {
     const { searchInputState, clustersOpts } = this.props
     return (
@@ -116,6 +136,7 @@ export default class Home extends React.Component {
           className={styles.clusterSelector}
           value={searchInputState.cluster}
           options={clustersOpts}
+          valueRenderer={this.clusterRenderer}
           onChange={this.onClusterChange}
         />
         <SearchInput

src/components/Modals/AuditingSearch/index.jsx

@@ -37,11 +37,8 @@ export default class AuditingOperating extends React.Component {
   @computed
   get clustersOpts() {
     return this.clusters.list.data
-      .filter(item => get(item, 'configz.logging'))
-      .map(({ name }) => ({
-        value: name,
-        label: `${t('Cluster')}: ${name}`,
-      }))
+      .filter(item => get(item, 'configz.auditing'))
+      .map(({ name }) => ({ value: name, label: name }))
   }
 
   initStepState() {

src/components/Modals/EventSearch/Event/Detail/index.jsx

@@ -363,6 +363,8 @@ export default class Detail extends React.PureComponent {
     })
   }
 
+  clusterRenderer = option => `${t('Cluster')}: ${option.label}`
+
   renderSearchBar() {
     const { searchInputState, clustersOpts } = this.props
     return (
@@ -372,10 +374,10 @@ export default class Detail extends React.PureComponent {
             value={searchInputState.cluster}
             onChange={this.changeClusterChange}
             className={styles.queryModeOptions}
+            valueRenderer={this.clusterRenderer}
             options={clustersOpts}
           />
         </span>
-
         <SearchInput
           className={styles.searchInput}
           placeholder={t('search condition')}

src/components/Modals/EventSearch/Event/Home/index.jsx

@@ -1,3 +1,21 @@
+/*
+ * This file is part of KubeSphere Console.
+ * Copyright (C) 2019 The KubeSphere Console Authors.
+ *
+ * KubeSphere Console is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KubeSphere Console is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import React from 'react'
 import { action, toJS } from 'mobx'
 import { observer } from 'mobx-react'
@@ -105,6 +123,8 @@ export default class HomeModal extends React.Component {
     )
   }
 
+  clusterRenderer = option => `${t('Cluster')}: ${option.label}`
+
   renderSearchBar() {
     const { searchInputState, clustersOpts } = this.props
     return (
@@ -113,6 +133,7 @@ export default class HomeModal extends React.Component {
           className={styles.clusterSelector}
           value={searchInputState.cluster}
           options={clustersOpts}
+          valueRenderer={this.clusterRenderer}
           onChange={this.onClusterChange}
         />
         <SearchInput

src/components/Modals/EventSearch/Event/Home/index.scss

@@ -129,6 +129,10 @@
         border: none;
         border-radius: 0;
       }
+      .select-menu-outer {
+        width: auto !important;
+        min-width: 130px;
+      }
     }
   }
 }

src/components/Modals/EventSearch/index.jsx

@@ -37,11 +37,8 @@ export default class EventSearch extends React.Component {
   @computed
   get clustersOpts() {
     return this.clusters.list.data
-      .filter(item => get(item, 'configz.logging'))
-      .map(({ name }) => ({
-        value: name,
-        label: `${t('Cluster')}: ${name}`,
-      }))
+      .filter(item => get(item, 'configz.events'))
+      .map(({ name }) => ({ value: name, label: name }))
   }
 
   initStepState() {

src/components/Modals/LogSearch/Logging/Home/index.jsx

@@ -165,6 +165,8 @@ export default class HomeModal extends React.Component {
     )
   }
 
+  clusterRenderer = option => `${t('Cluster')}: ${option.label}`
+
   renderSearchBar() {
     const { searchInputState, clustersOpts } = this.props
     return (
@@ -173,6 +175,7 @@ export default class HomeModal extends React.Component {
           className={styles.clusterSelector}
           value={searchInputState.cluster}
           options={clustersOpts}
+          valueRenderer={this.clusterRenderer}
           onChange={this.onClusterChange}
         />
         <SearchInput

src/components/Modals/LogSearch/Logging/Search/index.jsx

@@ -380,6 +380,8 @@ export default class LogSearchModal extends React.Component {
     )
   }
 
+  clusterRenderer = option => `${t('Cluster')}: ${option.label}`
+
   renderSearchBar() {
     return (
       <div className={styles.searchBar}>
@@ -388,6 +390,7 @@ export default class LogSearchModal extends React.Component {
             value={this.props.searchInputState.cluster}
             onChange={this.changeClusterChange}
             className={styles.queryModeOptions}
+            valueRenderer={this.clusterRenderer}
             options={this.props.clustersOpts}
           />
         </span>

src/components/Modals/LogSearch/index.jsx

@@ -43,10 +43,7 @@ export default class LogSearchModal extends React.Component {
   get clustersOpts() {
     return this.clusters.list.data
       .filter(item => get(item, 'configz.logging'))
-      .map(({ name }) => ({
-        value: name,
-        label: `${t('Cluster')}: ${name}`,
-      }))
+      .map(({ name }) => ({ value: name, label: name }))
   }
 
   initStepState() {