provide the ability to disable features (#4839)

* provide the ability to disable features part of: kiali/kiali#4737 * changing feature name to logs-tab * if things are disabled, add message at login * UI notification of disabled features * fix the INFO notification color and icon. fixes: kiali/kiali#4871 * hide the popup notification * fail fast if the feature name is invalid.
yzzeee · Mar 31, 2022 · 1aca4d4 · 1aca4d4
1 parent 3540825
commit 1aca4d4
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 20 deletions.
diff --git a/frontend/src/app/AuthenticationController.tsx b/frontend/src/app/AuthenticationController.tsx
@@ -29,7 +29,7 @@ import { config } from 'config';
 import { store } from 'store/ConfigStore';
 import { toGrpcRate, toHttpRate, toTcpRate, TrafficRate } from 'types/Graph';
 import { GraphToolbarActions } from 'actions/GraphToolbarActions';
-import { StatusState } from 'types/StatusState';
+import { StatusState, StatusKey } from 'types/StatusState';
 import { PromisesRegistry } from '../utils/CancelablePromises';
 
 interface AuthenticationControllerReduxProps {
@@ -342,6 +342,10 @@ export class AuthenticationController extends React.Component<
     status.warningMessages.forEach(wMsg => {
       this.props.addMessage(wMsg, '', 'systemErrors', MessageType.WARNING);
     });
+
+    if (status.status[StatusKey.DISABLED_FEATURES]) {
+      this.props.addMessage("The following features are disabled: " + status.status[StatusKey.DISABLED_FEATURES], '', 'default', MessageType.INFO, false)
+    }
   };
 }
 

diff --git a/frontend/src/components/MessageCenter/NotificationList.tsx b/frontend/src/components/MessageCenter/NotificationList.tsx
@@ -21,6 +21,9 @@ export default class NotificationList extends React.PureComponent<NotificationLi
             case MessageType.WARNING:
               variant = AlertVariant.warning;
               break;
+            case MessageType.INFO:
+              variant = AlertVariant.info;
+              break;
             default:
               variant = AlertVariant.danger;
           }

diff --git a/frontend/src/config/ServerConfig.ts b/frontend/src/config/ServerConfig.ts
@@ -77,6 +77,7 @@ const defaultServerConfig: ComputedServerConfig = {
     certificatesInformationIndicators: {
       enabled: true
     },
+    disabledFeatures: [],
     istioInjectionAction: true,
     istioUpgradeAction: false,
     uiDefaults: {

diff --git a/frontend/src/pages/WorkloadDetails/WorkloadDetailsPage.tsx b/frontend/src/pages/WorkloadDetails/WorkloadDetailsPage.tsx
@@ -130,25 +130,27 @@ class WorkloadDetails extends React.Component<WorkloadDetailsPageProps, Workload
     );
     tabsArray.push(trafficTab);
 
-    const logTab = (
-      <Tab title="Logs" eventKey={2} key={'Logs'}>
-        {hasPods ? (
-          <WorkloadPodLogs
-            namespace={this.props.match.params.namespace}
-            workload={this.props.match.params.workload}
-            pods={this.state.workload!.pods}
-          />
-        ) : (
-          <EmptyState variant={EmptyStateVariant.full}>
-            <Title headingLevel="h5" size="lg">
-              No logs for Workload {this.props.match.params.workload}
-            </Title>
-            <EmptyStateBody>There are no logs to display because the workload has no pods.</EmptyStateBody>
-          </EmptyState>
-        )}
-      </Tab>
-    );
-    tabsArray.push(logTab);
+    if (!serverConfig.kialiFeatureFlags.disabledFeatures || !serverConfig.kialiFeatureFlags.disabledFeatures.includes('logs-tab')) {
+      const logTab = (
+        <Tab title="Logs" eventKey={2} key={'Logs'}>
+          {hasPods ? (
+            <WorkloadPodLogs
+              namespace={this.props.match.params.namespace}
+              workload={this.props.match.params.workload}
+              pods={this.state.workload!.pods}
+            />
+          ) : (
+            <EmptyState variant={EmptyStateVariant.full}>
+              <Title headingLevel="h5" size="lg">
+                No logs for Workload {this.props.match.params.workload}
+              </Title>
+              <EmptyStateBody>There are no logs to display because the workload has no pods.</EmptyStateBody>
+            </EmptyState>
+          )}
+        </Tab>
+      );
+      tabsArray.push(logTab);
+    }
 
     const inTab = (
       <Tab title="Inbound Metrics" eventKey={3} key={'Inbound Metrics'}>

diff --git a/frontend/src/types/ErrorRate/__testData__/ErrorRateConfig.ts b/frontend/src/types/ErrorRate/__testData__/ErrorRateConfig.ts
@@ -72,6 +72,7 @@ export const serverRateConfig = {
     certificatesInformationIndicators: {
       enabled: true
     },
+    disabledFeatures: [],
     istioInjectionAction: true,
     istioUpgradeAction: false,
     uiDefaults: {

diff --git a/frontend/src/types/ServerConfig.ts b/frontend/src/types/ServerConfig.ts
@@ -54,6 +54,7 @@ interface CertificatesInformationIndicators {
 
 interface KialiFeatureFlags {
   certificatesInformationIndicators: CertificatesInformationIndicators;
+  disabledFeatures: string[];
   istioInjectionAction: boolean;
   istioUpgradeAction: boolean;
   uiDefaults: UIDefaults;

diff --git a/frontend/src/types/StatusState.ts b/frontend/src/types/StatusState.ts
@@ -1,4 +1,5 @@
 export enum StatusKey {
+  DISABLED_FEATURES = 'Disabled features',
   KIALI_CORE_COMMIT_HASH = 'Kiali core commit hash',
   KIALI_CORE_VERSION = 'Kiali core version',
   KIALI_CONSOLE_VERSION = 'Kiali console version',

diff --git a/frontend/src/types/__testData__/HealthConfig.ts b/frontend/src/types/__testData__/HealthConfig.ts
@@ -6,6 +6,7 @@ export const healthConfig = {
     certificatesInformationIndicators: {
       enabled: true
     },
+    disabledFeatures: [],
     istioInjectionAction: true,
     istioUpgradeAction: false,
     uiDefaults: {