fix: Fix log search in single cluster mode.

kubesphere · Jul 3, 2020 · 61296e7 · 61296e7
1 parent 3296f92
commit 61296e7
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 50 deletions.
diff --git a/src/components/Modals/AuditingSearch/Auditing/Detail/index.jsx b/src/components/Modals/AuditingSearch/Auditing/Detail/index.jsx
@@ -350,15 +350,17 @@ export default class Detail extends React.PureComponent {
     const { searchInputState, clustersOpts } = this.props
     return (
       <div className={styles.searchBar}>
-        <span className={styles.clusterSelect}>
-          <Select
-            value={searchInputState.cluster}
-            onChange={this.changeClusterChange}
-            className={styles.queryModeOptions}
-            valueRenderer={this.clusterRenderer}
-            options={clustersOpts}
-          />
-        </span>
+        {globals.app.isMultiCluster && (
+          <span className={styles.clusterSelect}>
+            <Select
+              value={searchInputState.cluster}
+              onChange={this.changeClusterChange}
+              className={styles.queryModeOptions}
+              valueRenderer={this.clusterRenderer}
+              options={clustersOpts}
+            />
+          </span>
+        )}
         <SearchInput
           className={styles.searchInput}
           placeholder={t('search condition')}

diff --git a/src/components/Modals/AuditingSearch/Auditing/Home/index.jsx b/src/components/Modals/AuditingSearch/Auditing/Home/index.jsx
@@ -132,13 +132,15 @@ export default class Home extends React.Component {
     const { searchInputState, clustersOpts } = this.props
     return (
       <div className={styles.searchBarContainer}>
-        <Select
-          className={styles.clusterSelector}
-          value={searchInputState.cluster}
-          options={clustersOpts}
-          valueRenderer={this.clusterRenderer}
-          onChange={this.onClusterChange}
-        />
+        {globals.app.isMultiCluster && (
+          <Select
+            className={styles.clusterSelector}
+            value={searchInputState.cluster}
+            options={clustersOpts}
+            valueRenderer={this.clusterRenderer}
+            onChange={this.onClusterChange}
+          />
+        )}
         <SearchInput
           className={styles.searchBar}
           onChange={this.onSearchParamsChange}
@@ -162,7 +164,9 @@ export default class Home extends React.Component {
           <div className={styles.recentSummary}>
             <h2 className={styles.count}>{total || 0}</h2>
             <p>
-              {t('Trends in the total number of auditing logs in the last 12 hours')}
+              {t(
+                'Trends in the total number of auditing logs in the last 12 hours'
+              )}
             </p>
           </div>
           <div className={styles.chart}>

diff --git a/src/components/Modals/EventSearch/Event/Detail/index.jsx b/src/components/Modals/EventSearch/Event/Detail/index.jsx
@@ -369,15 +369,17 @@ export default class Detail extends React.PureComponent {
     const { searchInputState, clustersOpts } = this.props
     return (
       <div className={styles.searchBar}>
-        <span className={styles.clusterSelect}>
-          <Select
-            value={searchInputState.cluster}
-            onChange={this.changeClusterChange}
-            className={styles.queryModeOptions}
-            valueRenderer={this.clusterRenderer}
-            options={clustersOpts}
-          />
-        </span>
+        {globals.app.isMultiCluster && (
+          <span className={styles.clusterSelect}>
+            <Select
+              value={searchInputState.cluster}
+              onChange={this.changeClusterChange}
+              className={styles.queryModeOptions}
+              valueRenderer={this.clusterRenderer}
+              options={clustersOpts}
+            />
+          </span>
+        )}
         <SearchInput
           className={styles.searchInput}
           placeholder={t('search condition')}

diff --git a/src/components/Modals/EventSearch/Event/Home/index.jsx b/src/components/Modals/EventSearch/Event/Home/index.jsx
@@ -129,13 +129,15 @@ export default class HomeModal extends React.Component {
     const { searchInputState, clustersOpts } = this.props
     return (
       <div className={styles.searchBarContainer}>
-        <Select
-          className={styles.clusterSelector}
-          value={searchInputState.cluster}
-          options={clustersOpts}
-          valueRenderer={this.clusterRenderer}
-          onChange={this.onClusterChange}
-        />
+        {globals.app.isMultiCluster && (
+          <Select
+            className={styles.clusterSelector}
+            value={searchInputState.cluster}
+            options={clustersOpts}
+            valueRenderer={this.clusterRenderer}
+            onChange={this.onClusterChange}
+          />
+        )}
         <SearchInput
           className={styles.searchBar}
           onChange={this.onSearchParamsChange}

diff --git a/src/components/Modals/LogSearch/Logging/Home/index.jsx b/src/components/Modals/LogSearch/Logging/Home/index.jsx
@@ -171,13 +171,15 @@ export default class HomeModal extends React.Component {
     const { searchInputState, clustersOpts } = this.props
     return (
       <div className={styles.searchBarContainer}>
-        <Select
-          className={styles.clusterSelector}
-          value={searchInputState.cluster}
-          options={clustersOpts}
-          valueRenderer={this.clusterRenderer}
-          onChange={this.onClusterChange}
-        />
+        {globals.app.isMultiCluster && (
+          <Select
+            className={styles.clusterSelector}
+            value={searchInputState.cluster}
+            options={clustersOpts}
+            valueRenderer={this.clusterRenderer}
+            onChange={this.onClusterChange}
+          />
+        )}
         <SearchInput
           className={styles.searchBar}
           onChange={this.onSearchParamsChange}

diff --git a/src/components/Modals/LogSearch/Logging/Search/index.jsx b/src/components/Modals/LogSearch/Logging/Search/index.jsx
@@ -385,16 +385,17 @@ export default class LogSearchModal extends React.Component {
   renderSearchBar() {
     return (
       <div className={styles.searchBar}>
-        <span className={styles.clusterSelect}>
-          <Select
-            value={this.props.searchInputState.cluster}
-            onChange={this.changeClusterChange}
-            className={styles.queryModeOptions}
-            valueRenderer={this.clusterRenderer}
-            options={this.props.clustersOpts}
-          />
-        </span>
-
+        {globals.app.isMultiCluster && (
+          <span className={styles.clusterSelect}>
+            <Select
+              value={this.props.searchInputState.cluster}
+              onChange={this.changeClusterChange}
+              className={styles.queryModeOptions}
+              valueRenderer={this.clusterRenderer}
+              options={this.props.clustersOpts}
+            />
+          </span>
+        )}
         <SearchInput
           className={styles.searchInput}
           onChange={this.onSearchParamsChange}