fix: Fix cluster log collection

kubesphere · Jun 29, 2020 · 30afbfe · 30afbfe
1 parent 6cebd91
commit 30afbfe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/server/config.yaml b/server/config.yaml
@@ -199,7 +199,7 @@ client:
                 name: log-collections,
                 title: Log Collections,
                 icon: file,
-                authKey: logging,
+                authKey: logging|events|auditing,
                 clusterModule: logging,
               }
 

diff --git a/src/components/Base/RadioGroup/index.jsx b/src/components/Base/RadioGroup/index.jsx
@@ -48,17 +48,19 @@ export default class RadioGroupWithOptions extends React.Component {
         size="small"
         {...rest}
       >
-        {options.map(option => (
-          <RadioButton key={option.value} value={option.value}>
-            {option.label}
-            {!isUndefined(option.count) && (
-              <Badge
-                status={option.value === value ? 'success' : 'default'}
-                count={Number(option.count)}
-              />
-            )}
-          </RadioButton>
-        ))}
+        {options
+          .filter(option => !option.hidden)
+          .map(option => (
+            <RadioButton key={option.value} value={option.value}>
+              {option.label}
+              {!isUndefined(option.count) && (
+                <Badge
+                  status={option.value === value ? 'success' : 'default'}
+                  count={Number(option.count)}
+                />
+              )}
+            </RadioButton>
+          ))}
       </RadioGroup>
     )
   }

diff --git a/src/pages/clusters/containers/LogCollections/index.jsx b/src/pages/clusters/containers/LogCollections/index.jsx
@@ -87,14 +87,17 @@ export default class LogCollection extends React.Component {
         {
           value: 'logging',
           label: t('Logging'),
+          hidden: !globals.app.hasClusterModule(this.cluster, 'logging'),
         },
         {
           value: 'events',
           label: t('Events'),
+          hidden: !globals.app.hasClusterModule(this.cluster, 'events'),
         },
         {
           value: 'auditing',
           label: t('Auditing'),
+          hidden: !globals.app.hasClusterModule(this.cluster, 'auditing'),
         },
       ],
     }