From 6ec98fbb6379d70eb69663ede4d019b740ef61a6 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Thu, 15 Feb 2024 16:04:03 +0100 Subject: [PATCH] change(ui): edition msaas check --- frontend/app/components/Assist/Assist.tsx | 6 ------ .../components/DashboardOptions/DashboardOptions.tsx | 2 +- .../Dashboard/components/MetricTypeList/MetricTypeList.tsx | 2 +- .../components/Session_/ScreenRecorder/ScreenRecorder.tsx | 3 ++- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frontend/app/components/Assist/Assist.tsx b/frontend/app/components/Assist/Assist.tsx index b6e5439f3..aa5dfa110 100644 --- a/frontend/app/components/Assist/Assist.tsx +++ b/frontend/app/components/Assist/Assist.tsx @@ -3,10 +3,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom'; import withPageTitle from 'HOCs/withPageTitle'; import withPermissions from 'HOCs/withPermissions'; import AssistRouter from './AssistRouter'; -import { SideMenuitem } from 'UI'; -import { withSiteId, assist, recordings } from 'App/routes'; import { connect } from 'react-redux'; -import { ENTERPRISE_REQUEIRED } from 'App/constants'; interface Props extends RouteComponentProps { siteId: string; @@ -15,9 +12,6 @@ interface Props extends RouteComponentProps { } function Assist(props: Props) { - - - return ( ); diff --git a/frontend/app/components/Dashboard/components/DashboardOptions/DashboardOptions.tsx b/frontend/app/components/Dashboard/components/DashboardOptions/DashboardOptions.tsx index 63b1c3f35..0c170a9f8 100644 --- a/frontend/app/components/Dashboard/components/DashboardOptions/DashboardOptions.tsx +++ b/frontend/app/components/Dashboard/components/DashboardOptions/DashboardOptions.tsx @@ -30,5 +30,5 @@ function DashboardOptions(props: Props) { } export default connect(state => ({ - isEnterprise: state.getIn([ 'user', 'account', 'edition' ]) === 'ee', + isEnterprise: state.getIn([ 'user', 'account', 'edition' ]) === 'ee' || state.getIn([ 'user', 'account', 'edition' ]) === 'msaas', }))(DashboardOptions); diff --git a/frontend/app/components/Dashboard/components/MetricTypeList/MetricTypeList.tsx b/frontend/app/components/Dashboard/components/MetricTypeList/MetricTypeList.tsx index b516c6cdb..caeb5242d 100644 --- a/frontend/app/components/Dashboard/components/MetricTypeList/MetricTypeList.tsx +++ b/frontend/app/components/Dashboard/components/MetricTypeList/MetricTypeList.tsx @@ -68,5 +68,5 @@ function MetricTypeList(props: Props) { } export default connect((state: any) => ({ - isEnterprise: state.getIn(['user', 'account', 'edition']) === 'ee' + isEnterprise: state.getIn(['user', 'account', 'edition']) === 'ee' || state.getIn(['user', 'account', 'edition']) === 'msaas' }))(withRouter(MetricTypeList)); diff --git a/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx b/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx index 707d1d1ed..1146637cf 100644 --- a/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx +++ b/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx @@ -142,7 +142,8 @@ function ScreenRecorder({ } export default connect((state: any) => ({ - isEnterprise: state.getIn(['user', 'account', 'edition']) === 'ee', + isEnterprise: state.getIn(['user', 'account', 'edition']) === 'ee' || + state.getIn(['user', 'account', 'edition']) === 'msaas', siteId: state.getIn(['site', 'siteId']), sessionId: state.getIn(['sessions', 'current']).sessionId, agentId: state.getIn(['user', 'account', 'id']),