removed experimental banner (opensearch-project#303) (opensearch-proj…

…ect#313) Signed-off-by: Amardeepsingh Siglani <[email protected]> Signed-off-by: Amardeepsingh Siglani <[email protected]> (cherry picked from commit 3ca8e97) Co-authored-by: Amardeepsingh Siglani <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt · Feb 22, 2023 · 71aded1 · 71aded1
1 parent 4c01ef9
commit 71aded1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 49 deletions.
diff --git a/public/pages/Alerts/containers/Alerts/Alerts.tsx b/public/pages/Alerts/containers/Alerts/Alerts.tsx
@@ -54,11 +54,11 @@ import {
   successNotificationToast,
 } from '../../../../utils/helpers';
 import { NotificationsStart } from 'opensearch-dashboards/public';
-import { match, withRouter } from 'react-router-dom';
+import { match, RouteComponentProps, withRouter } from 'react-router-dom';
 import { DateTimeFilter } from '../../../Overview/models/interfaces';
 import { ChartContainer } from '../../../../components/Charts/ChartContainer';
 
-export interface AlertsProps {
+export interface AlertsProps extends RouteComponentProps {
   alertService: AlertsService;
   detectorService: DetectorService;
   findingService: FindingsService;
@@ -542,4 +542,4 @@ class Alerts extends Component<AlertsProps, AlertsState> {
   }
 }
 
-export default withRouter(Alerts);
+export default withRouter<AlertsProps, React.ComponentType<AlertsProps>>(Alerts);
diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
@@ -11,13 +11,8 @@ import {
   EuiPageBody,
   EuiPageSideBar,
   EuiSideNavItemType,
-  EuiBetaBadge,
   EuiTitle,
-  EuiFlexItem,
-  EuiFlexGroup,
   EuiSpacer,
-  EuiCallOut,
-  EuiLink,
 } from '@elastic/eui';
 import { CoreStart } from 'opensearch-dashboards/public';
 import { ServicesConsumer } from '../../services';
@@ -118,8 +113,8 @@ export default class Main extends Component<MainProps, MainState> {
    * Returns current component route index
    * @return {number}
    */
-  getCurrentRouteIndex = (): number => {
-    let index: number;
+  getCurrentRouteIndex = (): number | undefined => {
+    let index: number | undefined;
     const pathname = this.props.location.pathname;
     for (const [route, routeIndex] of Object.entries(navItemIndexByRoute)) {
       if (pathname.match(new RegExp(`^${route}`))) {
@@ -159,21 +154,9 @@ export default class Main extends Component<MainProps, MainState> {
         renderItem: () => {
           return (
             <>
-              <EuiFlexGroup alignItems="center" gutterSize="s">
-                <EuiFlexItem grow={false}>
-                  <EuiTitle size="xs">
-                    <h3>{Navigation.SecurityAnalytics}</h3>
-                  </EuiTitle>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiBetaBadge
-                    label="Experimental"
-                    iconType="beaker"
-                    tooltipContent="Experimental feature"
-                    tooltipPosition="bottom"
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
+              <EuiTitle size="xs">
+                <h3>{Navigation.SecurityAnalytics}</h3>
+              </EuiTitle>
               <EuiSpacer />
             </>
           );
@@ -243,30 +226,6 @@ export default class Main extends Component<MainProps, MainState> {
                       </EuiPageSideBar>
                     )}
                     <EuiPageBody>
-                      <EuiCallOut title="Experimental feature" iconType="beaker">
-                        <p>
-                          The feature is experimental and should not be used in a production
-                          environment. While we are working on the finishing touches, share your
-                          ideas and feedback on{' '}
-                          <EuiLink
-                            target={'_blank'}
-                            href={
-                              'https://forum.opensearch.org/t/feedback-experimental-feature-security-analytics/11418'
-                            }
-                          >
-                            forum.opensearch.org
-                          </EuiLink>
-                          . For more information see{' '}
-                          <EuiLink
-                            target={'_blank'}
-                            href={'https://opensearch.org/docs/latest/security-analytics/index/'}
-                          >
-                            Security Analytics Documentation
-                          </EuiLink>
-                          .
-                        </p>
-                      </EuiCallOut>
-                      <EuiSpacer />
                       <Switch>
                         <Route
                           path={`${ROUTES.FINDINGS}/:detectorId?`}